Ticket #6974: play-to-end.patch

mythtv/libs/libmyth/audiooutput.h

@@ -33 +33 @@
 
     // do AddSamples calls block?
     virtual void SetBlocking(bool blocking) = 0;
+    virtual void SetTimedBlocking(bool blocking) = 0;
     
     // dsprate is in 100 * samples/second
     virtual void SetEffDsp(int dsprate) = 0;

mythtv/libs/libmyth/audiooutputbase.cpp

@@ -53 +53 @@
     surround_mode(FreeSurround::SurroundModePassive),
 
     blocking(false),
+    timed_blocking(false),
 
     lastaudiolen(0),            samples_buffered(0),
 
@@ -511 +512 @@
     this->blocking = blocking;
 }
 
+void AudioOutputBase::SetTimedBlocking(bool blocking)
+{
+    VERBOSE(VB_AUDIO, LOC + QString("Timed blocking: %1").arg(blocking));
+    this->timed_blocking = blocking;
+}
+
 int AudioOutputBase::audiolen(bool use_lock)
 {
     /* Thread safe, returns the number of valid bytes in the audio buffer */
@@ -671 +678 @@
         len += (pSoundStretch->numUnprocessedSamples() +
                 (int)(pSoundStretch->numSamples()/audio_stretchfactor))*abps;
 
+    if ((len > afree) && !blocking && timed_blocking && !pauseaudio)
+    {
+        int time_to_sleep = ((len - afree) * 1000000LL) / (abps * audio_samplerate);
+        VERBOSE(VB_AUDIO, LOC + QString("timed block %1 %2").arg(len - afree).arg(time_to_sleep));
+        if (time_to_sleep > 0)
+        {
+            usleep(time_to_sleep + 50000);
+            afree = audiofree(true);
+        }
+    }
+
     if ((len > afree) && !blocking)
     {
         VERBOSE(VB_AUDIO+VB_TIMESTAMP, LOC + QString(
@@ -740 +758 @@
                 (int)(pSoundStretch->numSamples()/audio_stretchfactor))*abps;
     }
 
+    if ((len > afree) && !blocking && timed_blocking && !pauseaudio)
+    {
+        int time_to_sleep = ((len - afree) * 1000000LL) / (abps * audio_samplerate);
+        VERBOSE(VB_AUDIO, LOC + QString("timed block %1 %2").arg(len - afree).arg(time_to_sleep));
+        if (time_to_sleep > 0)
+        {
+            usleep(time_to_sleep + 50000);
+            afree = audiofree(true);
+        }
+    }
+
     if ((len > afree) && !blocking)
     {
         VERBOSE(VB_AUDIO+VB_TIMESTAMP, LOC + QString(

mythtv/libs/libmyth/audiooutputbase.h

@@ -37 +37 @@
 
     // do AddSamples calls block?
     virtual void SetBlocking(bool blocking);
+    virtual void SetTimedBlocking(bool blocking);
 
     // dsprate is in 100 * samples/second
     virtual void SetEffDsp(int dsprate);
@@ -161 +162 @@
     int surround_mode;
 
     bool blocking; // do AddSamples calls block?
+    bool timed_blocking; // do AddSamples calls block?
 
     int lastaudiolen;
     long long samples_buffered;

mythtv/libs/libmythtv/NuppelVideoPlayer.cpp

@@ -162 +162 @@
       parentWidget(NULL), embedid(0),
       embx(-1), emby(-1), embw(-1), embh(-1),
       // State
-      eof(false),
+      eof(kEofStateNone),
       m_double_framerate(false),    m_double_process(false),
       m_can_double(false),          m_deint_possible(true),
       paused(false),
@@ -491 +491 @@
     QMutex mutex;
     mutex.lock();
 
-    while (!eof && !actuallypaused &&
-           !decoderThreadPaused.wait(&mutex, 100) &&
-           !eof && !actuallypaused)
+    while ((eof == kEofStateNone) && !actuallypaused &&
+           !decoderThreadPaused.wait(&mutex, 100))
     {
         VERBOSE(VB_IMPORTANT, LOC_WARN +
                 "Waited too long for decoder to pause");
@@ -590 +589 @@
     {
         videoThreadPaused.wait(&pauseUnpauseLock, 250);
 
-        if (video_actually_paused || eof)
+        if (video_actually_paused || (eof != kEofStateNone))
             break;
 
         if ((i % 10) == 9)
@@ -607 +606 @@
     {
         videoThreadUnpaused.wait(&pauseUnpauseLock, 250);
 
-        if (!video_actually_paused || eof)
+        if (!video_actually_paused || (eof != kEofStateNone))
             break;
 
         if ((i % 10) == 9)
@@ -928 +927 @@
         if (!audioOutput)
             errMsg = QObject::tr("Unable to create AudioOutput.");
         else
+        {
             errMsg = audioOutput->GetError();
+            audioOutput->SetTimedBlocking(true);
+        }
 
         if (!errMsg.isEmpty())
         {
@@ -1296 +1298 @@
     GetDecoder()->setTranscoding(transcoding);
     CheckExtraAudioDecode();
 
-    eof = false;
+    eof = kEofStateNone;
 
     // Set 'no_video_decode' to true for audio only decodeing
     bool no_video_decode = false;
@@ -3273 +3275 @@
         OpenDummy();
         ResetPlaying();
         DoPause();
-        eof = false;
+        eof = kEofStateNone;
         delete pginfo;
         return;
     }
@@ -3284 +3286 @@
     if (!player_ctx->buffer->IsOpen())
     {
         VERBOSE(VB_IMPORTANT, LOC_ERR + "SwitchToProgram's OpenFile failed.");
-        eof = true;
+        eof = kEofStateImmediate;
         SetErrored(QObject::tr("Error opening switch program buffer"));
         delete pginfo;
         return;
     }
 
-    if (eof)
+    if (eof != kEofStateNone)
     {
         discontinuity = true;
         ClearSubtitles();
@@ -3326 +3328 @@
     if (IsErrored())
     {
         VERBOSE(VB_IMPORTANT, LOC_ERR + "SwitchToProgram failed.");
-        eof = true;
+        eof = kEofStateDelayed;
         return;
     }
 
@@ -3341 +3343 @@
         GetDecoder()->SyncPositionMap();
     }
 
-    eof = false;
+    eof = kEofStateNone;
 }
 
 void NuppelVideoPlayer::FileChangedCallback(void)
@@ -3358 +3360 @@
 
     player_ctx->buffer->Unpause();
 
-    eof = false;
+    eof = kEofStateNone;
 
     player_ctx->SetNVPChangingBuffers(false);
 
@@ -3400 +3402 @@
         OpenDummy();
         ResetPlaying();
         DoPause();
-        eof = false;
+        eof = kEofStateNone;
         delete pginfo;
         return;
     }
@@ -3409 +3411 @@
     if (!player_ctx->buffer->IsOpen())
     {
         VERBOSE(VB_IMPORTANT, LOC_ERR + "JumpToProgram's OpenFile failed.");
-        eof = true;
+        eof = kEofStateImmediate;
         SetErrored(QObject::tr("Error opening jump program file buffer"));
         delete pginfo;
         return;
@@ -3463 +3465 @@
         GetDecoder()->setExactSeeks(seeks);
     }
 
-    eof = false;
+    eof = kEofStateNone;
     player_ctx->SetNVPChangingBuffers(false);
 }
 
@@ -3645 +3647 @@
             player_ctx->tvchain->JumpToNext(true, 1);
             JumpToProgram();
         }
-        else if ((!paused || eof) && player_ctx->tvchain &&
+        else if ((!paused || (eof != kEofStateNone)) && player_ctx->tvchain &&
                  !GetDecoder()->GetWaitForChange())
         {
             if (player_ctx->tvchain->NeedsToSwitch())
@@ -3697 +3699 @@
             continue;
         }
 
-        if (eof)
+        if (eof != kEofStateNone)
         {
             if (player_ctx->tvchain)
             {
@@ -3711 +3713 @@
                     VERBOSE(VB_PLAYBACK, "Ignoring livetv eof in decoder loop");
                 usleep(50000);
             }
-            else
+            else if (eof == kEofStateImmediate)
+            {
                 break;
+            }
+            else
+            {
+                VERBOSE(VB_PLAYBACK, "waiting for no video frames " << videoOutput->ValidVideoFrames());
+                if (videoOutput && videoOutput->ValidVideoFrames() < 3)
+                {
+                    eof = kEofStateImmediate;
+                    break;
+                }
+                else
+                    usleep(50000);
+            }
         }
 
         if (isDummy)
@@ -3799 +3814 @@
                 if (fftime >= 5)
                     DoFastForward();
 
-                if (eof)
+                if (eof != kEofStateNone)
                     continue;
 
                 UnpauseVideo(true);
@@ -3854 +3869 @@
                       && !player_ctx->IsPIP() &&
                       player_ctx->GetState() == kState_WatchingPreRecorded))
                 {
-                    eof = true;
+                    eof = kEofStateImmediate;
                 }
             }
             else
@@ -6150 +6165 @@
 
     if (!GetDecoder()->GetFrame(0))
         return false;
-    if (eof)
+    if (eof != kEofStateNone)
         return false;
 
     if (honorCutList && (!deleteMap.isEmpty()))
@@ -6184 +6199 @@
             }
         }
     }
-    if (eof)
+    if (eof != kEofStateNone)
       return false;
     *is_key = GetDecoder()->isLastFrameKey();
     return true;
@@ -6276 +6291 @@
         fflush( stdout );
     }
 
-    while (!eof)
+    while (eof == kEofStateNone)
     {
         looped = true;
         myFramesPlayed++;

mythtv/libs/libmythtv/NuppelVideoPlayer.h

@@ -99 +99 @@
     kDisplayTeletextMenu        = 0x40,
 };
 
+// Eof States
+typedef enum
+{
+    kEofStateNone,
+    kEofStateDelayed,
+    kEofStateImmediate
+} EofState;
+
 class MPUBLIC NuppelVideoPlayer : public CC608Reader, public CC708Reader
 {
     friend class PlayerContext;
@@ -146 +154 @@
     void SetLength(int len)                   { totalLength = len; }
     void SetVideoFilters(const QString &override);
     void SetFramesPlayed(long long played)    { framesPlayed = played; }
-    void SetEof(void)                         { eof = true; }
+    void SetEof(void)                         { eof = kEofStateDelayed; }
     void SetPIPActive(bool is_active)         { pip_active = is_active; }
     void SetPIPVisible(bool is_visible)       { pip_visible = is_visible; }
     bool AddPIPPlayer(NuppelVideoPlayer *pip, PIPLocation loc, uint timeout);
@@ -214 +222 @@
     // Bool Gets
     bool    GetRawAudioState(void) const;
     bool    GetLimitKeyRepeat(void) const     { return limitKeyRepeat; }
-    bool    GetEof(void) const                { return eof; }
+    bool    GetEof(void) const                { return eof != kEofStateNone; }
     bool    IsErrored(void) const;
     bool    IsPlaying(uint wait_ms = 0, bool wait_for = true) const;
     bool    AtNormalSpeed(void) const         { return next_normal_speed; }
@@ -569 +577 @@
     mutable QMutex pauseUnpauseLock;
     mutable QMutex internalPauseLock;
     mutable QMutex playingLock;
-    bool     eof;             ///< At end of file/ringbuffer
+    EofState eof;             ///< At end of file/ringbuffer
     bool     m_double_framerate;///< Output fps is double Video (input) rate
     bool     m_double_process;///< Output filter must processed at double rate
     bool     m_can_double;    ///< VideoOutput capable of doubling frame rate

mythtv/programs/mythtranscode/transcode.cpp

@@ -83 +83 @@
     }
 
     virtual void SetBlocking(bool block) { (void)block; }
+    virtual void SetTimedBlocking(bool block) { (void)block; }
     virtual void Reset(void)
     {
         audiobuffer_len = 0;