Ticket #6974: playtoend-jms.patch

mythtv/libs/libmythtv/decoderbase.cpp

@@ -31 +31 @@
       lastKey(0), keyframedist(-1), indexOffset(0),
       trackTotalDuration(false),
 
-      ateof(false), exitafterdecoded(false), transcoding(false),
+      ateof(kEofStateNone), exitafterdecoded(false), transcoding(false),
 
       hasFullPositionMap(false), recordingHasPositionMap(false),
       posmapStarted(false), positionMapType(MARK_UNSET),
@@ -92 +92 @@
     if (reset_file)
     {
         waitingForChange = false;
-        SetEof(false);
+        SetEof(kEofStateNone);
     }
 }
 

mythtv/libs/libmythtv/decoderbase.h

@@ -59 +59 @@
 } AudioTrackType;
 QString toString(AudioTrackType type);
 
+// Eof States
+typedef enum
+{
+    kEofStateNone,
+    kEofStateDelayed,
+    kEofStateImmediate
+} EofState;
+
 class StreamInfo
 {
   public:
@@ -115 +123 @@
                          char testbuf[kDecoderProbeBufferSize],
                          int testbufsize = kDecoderProbeBufferSize) = 0;
 
-    virtual void SetEof(bool eof)  { ateof = eof;  }
-    bool         GetEof(void) const { return ateof; }
+    virtual void SetEof(EofState eof)  { ateof = eof;  }
+    virtual void SetEof(bool eof)  { ateof = eof?kEofStateDelayed:kEofStateNone;  }
+    EofState     GetEof(void)      { return ateof; }
 
     void SetSeekSnap(uint64_t snap)  { seeksnap = snap; }
     uint64_t GetSeekSnap(void) const { return seeksnap;  }
@@ -289 +298 @@
     // indicates whether this is the case.
     bool trackTotalDuration;
 
-    bool ateof;
+    EofState ateof;
     bool exitafterdecoded;
     bool transcoding;
 

mythtv/libs/libmythtv/mythplayer.cpp

@@ -2078 +2078 @@
         return false;
 
     if (!(min_buffers ? (videoOutput->ValidVideoFrames() >= min_buffers) :
+                        (GetEof() != kEofStateNone) ||
                         (videoOutput->hasHWAcceleration() ?
                             videoOutput->EnoughPrebufferedFrames() :
                             videoOutput->EnoughDecodedFrames())))
@@ -2490 +2491 @@
     {
         OpenDummy();
         ResetPlaying();
-        SetEof(false);
+        SetEof(kEofStateNone);
         delete pginfo;
         return;
     }
@@ -2512 +2513 @@
             QString("(card type: %1).")
             .arg(player_ctx->tvchain->GetCardType(newid)));
         LOG(VB_GENERAL, LOG_ERR, player_ctx->tvchain->toString());
-        SetEof(true);
+        SetEof(kEofStateImmediate);
         SetErrored(tr("Error opening switch program buffer"));
         delete pginfo;
         return;
     }
 
-    if (GetEof())
+    if (GetEof() != kEofStateNone)
     {
         discontinuity = true;
         ResetCaptions();
@@ -2557 +2558 @@
     if (IsErrored())
     {
         LOG(VB_GENERAL, LOG_ERR, LOC + "SwitchToProgram failed.");
-        SetEof(true);
+        SetEof(kEofStateDelayed);
         return;
     }
 
-    SetEof(false);
+    SetEof(kEofStateNone);
 
     // the bitrate is reset by player_ctx->buffer->OpenFile()...
     if (decoder)
@@ -2588 +2589 @@
         player_ctx->buffer->Reset(false, true);
     else
         player_ctx->buffer->Reset(false, true, true);
-    SetEof(false);
+    SetEof(kEofStateNone);
     Play();
 
     player_ctx->SetPlayerChangingBuffers(false);
@@ -2629 +2630 @@
     {
         OpenDummy();
         ResetPlaying();
-        SetEof(false);
+        SetEof(kEofStateNone);
         delete pginfo;
         inJumpToProgramPause = false;
         return;
@@ -2654 +2655 @@
             QString("(card type: %1).")
                 .arg(player_ctx->tvchain->GetCardType(newid)));
         LOG(VB_GENERAL, LOG_ERR, player_ctx->tvchain->toString());
-        SetEof(true);
+        SetEof(kEofStateImmediate);
         SetErrored(tr("Error opening jump program file buffer"));
         delete pginfo;
         inJumpToProgramPause = false;
@@ -2680 +2681 @@
         return;
     }
 
-    SetEof(false);
+    SetEof(kEofStateNone);
 
     // the bitrate is reset by player_ctx->buffer->OpenFile()...
     player_ctx->buffer->UpdateRawBitrate(decoder->GetRawBitrate());
@@ -2831 +2832 @@
         player_ctx->tvchain->JumpToNext(true, 1);
         JumpToProgram();
     }
-    else if ((!allpaused || GetEof()) && player_ctx->tvchain &&
+    else if ((!allpaused || (GetEof() != kEofStateNone)) && player_ctx->tvchain &&
              (decoder && !decoder->GetWaitForChange()))
     {
         // Switch to the next program in livetv
@@ -2891 +2892 @@
     }
 
     // Handle end of file
-    if ((GetEof() && !allpaused) ||
+    EofState _eof = GetEof();
+    if (((_eof != kEofStateNone) && !allpaused) ||
         (!GetEditMode() && framesPlayed >= deleteMap.GetLastFrame()))
     {
 #ifdef USING_MHEG
@@ -2908 +2910 @@
             return;
         }
 
-        Pause();
-        SetPlaying(false);
-        return;
+        if (_eof != kEofStateDelayed)
+        {
+            Pause();
+            SetPlaying(false);
+            return;
+        }
+        LOG(VB_PLAYBACK, LOG_INFO, QString("waiting for no video frames %1").arg(videoOutput->ValidVideoFrames()));
+        if (videoOutput && videoOutput->ValidVideoFrames() < 3)
+        {
+            Pause();
+            SetPlaying(false);
+            return;
+        }
     }
 
     // Handle rewind
@@ -2928 +2940 @@
         if (fftime > 0)
         {
             DoFastForward(fftime, kInaccuracyDefault);
-            if (GetEof())
+            if (GetEof() != kEofStateNone)
                return;
         }
     }
@@ -2993 +3005 @@
             if (!(endExitPrompt == 1 && !player_ctx->IsPIP() &&
                   player_ctx->GetState() == kState_WatchingPreRecorded))
             {
-                SetEof(true);
+                SetEof(kEofStateDelayed);
             }
         }
         else
@@ -3100 +3112 @@
 }
 
 //// FIXME - move the eof ownership back into MythPlayer
-bool MythPlayer::GetEof(void)
+EofState MythPlayer::GetEof(void)
 {
     if (is_current_thread(playerThread))
-        return decoder ? decoder->GetEof() : true;
+        return decoder ? decoder->GetEof() : kEofStateImmediate;
 
     if (!decoder_change_lock.tryLock(50))
-        return false;
+        return kEofStateNone;
 
-    bool eof = decoder ? decoder->GetEof() : true;
+    EofState eof = decoder ? decoder->GetEof() : kEofStateImmediate;
     decoder_change_lock.unlock();
     return eof;
 }
 
-void MythPlayer::SetEof(bool eof)
+void MythPlayer::SetEof(EofState eof)
 {
     if (is_current_thread(playerThread))
     {
@@ -3175 +3187 @@
             decoder_change_lock.unlock();
         }
 
-        bool obey_eof = GetEof() &&
-                        !(GetEof() && player_ctx->tvchain && !allpaused);
+        bool obey_eof = (GetEof() != kEofStateNone) &&
+                        !((GetEof() != kEofStateNone) && player_ctx->tvchain && !allpaused);
         if (isDummy || ((decoderPaused || ffrew_skip == 0 || obey_eof) &&
             !decodeOneFrame))
         {
@@ -4510 +4522 @@
     if (!decoder->GetFrame(kDecodeAV))
         return false;
 
-    if (GetEof())
+    if (GetEof() != kEofStateNone)
         return false;
 
     if (honorCutList && !deleteMap.IsEmpty())
@@ -4535 +4547 @@
             did_ff = 1;
         }
     }
-    if (GetEof())
+    if (GetEof() != kEofStateNone)
       return false;
     is_key = decoder->IsLastFrameKey();
 
@@ -4998 +5010 @@
         player_ctx->buffer->GetType() == ICRingBuffer::kRingBufferType)
     {
         // Restore livetv
-        SetEof(true);
+        SetEof(kEofStateDelayed);
         player_ctx->tvchain->JumpToNext(false, 1);
         player_ctx->tvchain->JumpToNext(true, 1);
     }
@@ -5028 +5040 @@
     if (!player_ctx->buffer->IsOpen())
     {
         LOG(VB_GENERAL, LOG_ERR, LOC + "JumpToStream buffer OpenFile failed");
-        SetEof(true);
+        SetEof(kEofStateImmediate);
         SetErrored(QObject::tr("Error opening remote stream buffer"));
         return;
     }
@@ -5041 +5053 @@
     if (OpenFile(120) < 0) // 120 retries ~= 60 seconds
     {
         LOG(VB_GENERAL, LOG_ERR, LOC + "JumpToStream OpenFile failed.");
-        SetEof(true);
+        SetEof(kEofStateImmediate);
         SetErrored(QObject::tr("Error opening remote stream"));
         return;
     }
@@ -5057 +5069 @@
         .arg(player_ctx->buffer->GetRealFileSize()).arg(decoder->GetRawBitrate())
         .arg(totalLength).arg(totalFrames).arg(decoder->GetFPS()) );
 
-    SetEof(false);
+    SetEof(kEofStateNone);
 
     // the bitrate is reset by player_ctx->buffer->OpenFile()...
     player_ctx->buffer->UpdateRawBitrate(decoder->GetRawBitrate());

mythtv/libs/libmythtv/mythplayer.h

@@ -142 +142 @@
     void SetLength(int len)                   { totalLength = len; }
     void SetFramesPlayed(uint64_t played);
     void SetVideoFilters(const QString &override);
-    void SetEof(bool eof);
+    void SetEof(EofState eof);
     void SetPIPActive(bool is_active)         { pip_active = is_active; }
     void SetPIPVisible(bool is_visible)       { pip_visible = is_visible; }
 
@@ -198 +198 @@
     bool    IsPaused(void) const              { return allpaused;      }
     bool    GetRawAudioState(void) const;
     bool    GetLimitKeyRepeat(void) const     { return limitKeyRepeat; }
-    bool    GetEof(void);
+    EofState GetEof(void);
     bool    IsErrored(void) const;
     bool    IsPlaying(uint wait_ms = 0, bool wait_for = true) const;
     bool    AtNormalSpeed(void) const         { return next_normal_speed; }