Ticket #6974: mythtv-play-to-end.20120306.patch

mythtv/libs/libmythtv/decoderbase.cpp

@@ -30 +30 @@
       framesPlayed(0), framesRead(0), totalDuration(0),
       lastKey(0), keyframedist(-1), indexOffset(0),
 
-      ateof(false), exitafterdecoded(false), transcoding(false),
+      ateof(kEofStateNone), exitafterdecoded(false), transcoding(false),
 
       hasFullPositionMap(false), recordingHasPositionMap(false),
       posmapStarted(false), positionMapType(MARK_UNSET),
@@ -90 +90 @@
     if (reset_file)
     {
         waitingForChange = false;
-        SetEof(false);
+        SetEof(kEofStateNone);
     }
 }
 

mythtv/libs/libmythtv/decoderbase.h

@@ -47 +47 @@
     kDecodeAV      = 0x03,
 } DecodeType;
 
+// Eof States
+typedef enum
+{
+    kEofStateNone,
+    kEofStateDelayed,
+    kEofStateImmediate
+} EofState;
+
 class StreamInfo
 {
   public:
@@ -97 +105 @@
                          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 setExactSeeks(bool exact) { exactseeks = exact; }
     bool getExactSeeks(void) const { return exactseeks;  }
@@ -244 +253 @@
     int keyframedist;
     long long indexOffset;
 
-    bool ateof;
+    EofState ateof;
     bool exitafterdecoded;
     bool transcoding;
 

mythtv/libs/libmythtv/mythplayer.cpp

@@ -2033 +2033 @@
         return false;
 
     if (!(min_buffers ? (videoOutput->ValidVideoFrames() >= min_buffers) :
+                        (GetEof() != kEofStateNone) ||
                         (videoOutput->hasHWAcceleration() ?
                             videoOutput->EnoughPrebufferedFrames() :
                             videoOutput->EnoughDecodedFrames())))
@@ -2413 +2414 @@
     {
         OpenDummy();
         ResetPlaying();
-        SetEof(false);
+        SetEof(kEofStateNone);
         delete pginfo;
         return;
     }
@@ -2427 +2428 @@
             QString("(card type: %1).")
                 .arg(player_ctx->tvchain->GetCardType(newid)));
         LOG(VB_GENERAL, LOG_ERR, player_ctx->tvchain->toString());
-        SetEof(true);
+        SetEof(kEofStateImmediate);
         SetErrored(QObject::tr("Error opening switch program buffer"));
         delete pginfo;
         return;
     }
 
-    if (GetEof())
+    if (GetEof() != kEofStateNone)
         ResetCaptions();
 
     LOG(VB_PLAYBACK, LOG_INFO, LOC + QString("newid: %1 decoderEof: %2")
@@ -2452 +2453 @@
     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)
@@ -2480 +2481 @@
         player_ctx->buffer->Reset(false, true);
     else
         player_ctx->buffer->Reset(false, true, true);
-    SetEof(false);
+    SetEof(kEofStateNone);
     Play();
 
     player_ctx->SetPlayerChangingBuffers(false);
@@ -2518 +2519 @@
     {
         OpenDummy();
         ResetPlaying();
-        SetEof(false);
+        SetEof(kEofStateNone);
         delete pginfo;
         return;
     }
@@ -2534 +2535 @@
             QString("(card type: %1).")
                 .arg(player_ctx->tvchain->GetCardType(newid)));
         LOG(VB_GENERAL, LOG_ERR, player_ctx->tvchain->toString());
-        SetEof(true);
+        SetEof(kEofStateImmediate);
         SetErrored(QObject::tr("Error opening jump program file buffer"));
         delete pginfo;
         return;
@@ -2552 +2553 @@
         return;
     }
 
-    SetEof(false);
+    SetEof(kEofStateNone);
 
     // the bitrate is reset by player_ctx->buffer->OpenFile()...
     player_ctx->buffer->UpdateRawBitrate(decoder->GetRawBitrate());
@@ -2703 +2704 @@
         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
@@ -2753 +2754 @@
     }
 
     // Handle end of file
-    if (GetEof())
+    EofState _eof = GetEof();
+    if (_eof != kEofStateNone)
     {
         if (player_ctx->tvchain)
         {
@@ -2766 +2768 @@
         }
         else if (!allpaused)
         {
-            SetPlaying(false);
-            return;
+            if (_eof == kEofStateImmediate)
+            {
+                SetPlaying(false);
+                return;
+            }
+            LOG(VB_PLAYBACK, LOG_INFO, QString("waiting for no video frames %1").arg(videoOutput->ValidVideoFrames()));
+            if (videoOutput && videoOutput->ValidVideoFrames() < 3)
+            {
+                SetPlaying(false);
+                return;
+            }
         }
     }
 
@@ -2786 +2797 @@
         if (fftime > 0)
         {
             DoFastForward(fftime);
-            if (GetEof())
+            if (GetEof() != kEofStateNone)
                return;
         }
     }
@@ -2847 +2858 @@
             if (!(endExitPrompt == 1 && !player_ctx->IsPIP() &&
                   player_ctx->GetState() == kState_WatchingPreRecorded))
             {
-                SetEof(true);
+                SetEof(kEofStateDelayed);
             }
         }
         else
@@ -2954 +2965 @@
 }
 
 //// 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;
-
-    bool eof = decoder ? decoder->GetEof() : true;
+        return kEofStateNone;
+        
+    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))
     {
@@ -3029 +3040 @@
             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))
         {
@@ -4374 +4385 @@
     if (!decoder->GetFrame(kDecodeAV))
         return false;
 
-    if (GetEof())
+    if (GetEof() != kEofStateNone)
         return false;
 
     if (honorCutList && !deleteMap.IsEmpty())
@@ -4400 +4411 @@
             did_ff = 1;
         }
     }
-    if (GetEof())
+    if (GetEof() != kEofStateNone)
       return false;
     is_key = decoder->IsLastFrameKey();
 

mythtv/libs/libmythtv/mythplayer.h

@@ -144 +144 @@
     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; }
 
@@ -200 +200 @@
     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; }

mythtv/programs/mythtranscode/transcode.cpp

@@ -84 +84 @@
         eff_audiorate = (dsprate / 100);
     }
 
+    virtual void SetTimedBlocking(bool block) { (void)block; }
     virtual void Reset(void)
     {
         audiobuffer_len = 0;