Ticket #868: 868-v3.patch

libs/libmythtv/NuppelVideoPlayer.h

@@ -210 +210 @@
         { videoOutput->ReleaseFrame(GetNextVideoFrame(false)); }
     void ReleaseCurrentFrame(VideoFrame *frame);
     void DiscardVideoFrame(VideoFrame *buffer);
-    void DiscardVideoFrames(void);
+    void DiscardVideoFrames(bool next_frame_keyframe);
     void DrawSlice(VideoFrame *frame, int x, int y, int w, int h);
 
     // Reinit

libs/libmythtv/nuppeldecoder.cpp

@@ -1170 +1170 @@
         avcodec_flush_buffers(mpa_ctx);
 
     if (discardFrames)
-        GetNVP()->DiscardVideoFrames();
+        GetNVP()->DiscardVideoFrames(doFlush);
 
     for (;(skipFrames > 0) && !ateof; skipFrames--)
     {

libs/libmythtv/NuppelVideoPlayer.cpp

@@ -804 +804 @@
        MAXTBUFFER - 1. */
 }
 
+/** \fn NuppelVideoPlayer::GetNextVideoFrame(bool)
+ *  \brief Removes a frame from the available queue for decoding onto.
+ *
+ *   This places the frame in the limbo queue, from which frames are
+ *   removed if they are added to another queue. Normally a frame is
+ *   freed from limbo either by a ReleaseNextVideoFrame() or
+ *   DiscardVideoFrame() call; but limboed frames are also freed
+ *   during a seek reset.
+ *
+ *  \param allow_unsafe if true then a frame will be taken from the queue
+ *         of frames ready for display if we can't find a frame in the
+ *         available queue.
+ */
 VideoFrame *NuppelVideoPlayer::GetNextVideoFrame(bool allow_unsafe)
 {
     return videoOutput->GetNextFreeFrame(false, allow_unsafe);
 }
 
+/** \fn NuppelVideoPlayer::ReleaseNextVideoFrame(VideoFrame*,long long)
+ *  \brief Places frame on the queue of frames ready for display.
+ */
 void NuppelVideoPlayer::ReleaseNextVideoFrame(VideoFrame *buffer,
                                               long long timecode)
 {
@@ -818 +834 @@
     videoOutput->ReleaseFrame(buffer);
 }
 
+/** \fn NuppelVideoPlayer::DiscardVideoFrame(VideoFrame*)
+ *  \brief Places frame in the available frames queue.
+ */
 void NuppelVideoPlayer::DiscardVideoFrame(VideoFrame *buffer)
 {
     if (videoOutput)
         videoOutput->DiscardFrame(buffer);
 }
 
-void NuppelVideoPlayer::DiscardVideoFrames()
+/** \fn DiscardVideoFrames(bool)
+ *  \brief Places frames in the available frames queue.
+ *
+ *   If called with 'next_frame_keyframe' set to false then all frames
+ *   not in use by the decoder are made available for decoding. Otherwise,
+ *   all frames are made available for decoding; this is only safe if
+ *   the next frame is a keyframe.
+ *
+ *  \param next_frame_keyframe if this is true all frames are placed
+ *         in the available queue.
+ */
+void NuppelVideoPlayer::DiscardVideoFrames(bool next_frame_keyframe)
 {
     if (videoOutput)
-        videoOutput->DiscardFrames();
+        videoOutput->DiscardFrames(next_frame_keyframe);
 }
 
 void NuppelVideoPlayer::DrawSlice(VideoFrame *frame, int x, int y, int w, int h)
@@ -1659 +1689 @@
                 VERBOSE(VB_IMPORTANT, LOC + "Prebuffer wait timed out, and"
                         "\n\t\t\tthere are not enough free frames. "
                         "Discarding buffered frames.");
-                DiscardVideoFrames();
+                // This call will result in some ugly frames, but allows us
+                // to recover from serious problems if frames get leaked.
+                DiscardVideoFrames(true);
             }
             prebuffer_tries = 0;
         }
@@ -3013 +3045 @@
 /** \fn NuppelVideoPlayer::ClearAfterSeek(void)
  *  \brief This is to support seeking...
  *
- *   It can be very dangerous as it removes all frames from
- *   the videoOutput, so you can't restart playback immediately.
+ *   This resets the output classes and discards all
+ *   frames no longer being used by the decoder class.
  *
  *   Note: caller should not hold any locks
  */

libs/libmythtv/avformatdecoder.cpp

@@ -169 +169 @@
                     *got_picture_ptr = 1;
                     *picture = *frm;
                     delete frm;
+#if 0
+                    QString msg("");
+                    AvFormatDecoder *nd = (AvFormatDecoder *)(avctx->opaque);
+                    if (nd && nd->GetNVP() && nd->GetNVP()->getVideoOutput())
+                        msg = nd->GetNVP()->getVideoOutput()->GetFrameStatus();
+
+                    VERBOSE(VB_IMPORTANT, "ret frame: "<<picture->opaque
+                            <<"           "<<msg);
+#endif
                 }
                 return buf_size;
             case STATE_INVALID:
@@ -316 +325 @@
     return  ((lsb - base_ts)&mask);
 }
 
-bool AvFormatDecoder::DoRewind(long long desiredFrame, bool doflush)
+bool AvFormatDecoder::DoRewind(long long desiredFrame, bool discardFrames)
 {
     VERBOSE(VB_PLAYBACK, LOC + "DoRewind("
-            <<desiredFrame<<", "<<( doflush ? "do" : "don't" )<<" flush)");
+            <<desiredFrame<<", "
+            <<( discardFrames ? "do" : "don't" )<<" discard frames)");
 
     if (recordingHasPositionMap || livetv)
-        return DecoderBase::DoRewind(desiredFrame, doflush);
+        return DecoderBase::DoRewind(desiredFrame, discardFrames);
 
     // avformat-based seeking
-    return DoFastForward(desiredFrame, doflush);
+    return DoFastForward(desiredFrame, discardFrames);
 }
 
-bool AvFormatDecoder::DoFastForward(long long desiredFrame, bool doflush)
+bool AvFormatDecoder::DoFastForward(long long desiredFrame, bool discardFrames)
 {
-    VERBOSE(VB_PLAYBACK, LOC + "DoFastForward("
-            <<desiredFrame<<", "<<( doflush ? "do" : "don't" )<<" flush)");
+    VERBOSE(VB_PLAYBACK, LOC +
+            QString("DoFastForward(%1 (%2), %3 discard frames)")
+            .arg(desiredFrame).arg(framesPlayed)
+            .arg((discardFrames) ? "do" : "don't"));
 
     if (recordingHasPositionMap || livetv)
-        return DecoderBase::DoFastForward(desiredFrame, doflush);
+        return DecoderBase::DoFastForward(desiredFrame, discardFrames);
 
     bool oldrawstate = getrawframes;
     getrawframes = false;
@@ -395 +407 @@
 
     int normalframes = desiredFrame - framesPlayed;
 
-    SeekReset(lastKey, normalframes, doflush, doflush);
+    SeekReset(lastKey, normalframes, discardFrames, discardFrames);
 
-    if (doflush)
+    if (discardFrames)
     {
         GetNVP()->SetFramesPlayed(framesPlayed + 1);
         GetNVP()->getVideoOutput()->SetFramesPlayed(framesPlayed + 1);
@@ -450 +462 @@
 
     // Discard all the queued up decoded frames
     if (discardFrames)
-        GetNVP()->DiscardVideoFrames();
+        GetNVP()->DiscardVideoFrames(doflush);
 
     if (doflush)
     {

libs/libmythtv/decoderbase.h

@@ -94 +94 @@
   protected:
     void FileChanged(void);
 
-    bool DoRewindDVD(long long desiredFrame);
-    bool DoRewindNormal(long long desiredFrame);
+    bool DoRewindSeek(long long desiredFrame);
     void DoFastForwardSeek(long long desiredFrame, bool &needflush);
 
     long long GetLastFrameInPosMap(long long desiredFrame);

libs/libmythtv/videooutbase.cpp

@@ -422 +422 @@
     XJ_height = height;
     SetVideoAspectRatio(aspect);
     
-    DiscardFrames();
+    DiscardFrames(true);
 }
 
 /**

libs/libmythtv/videoout_xv.h

@@ -103 +103 @@
 
     VideoFrame *GetNextFreeFrame(bool allow_unsafe);
     void DiscardFrame(VideoFrame*);
-    void DiscardFrames(void);
+    void DiscardFrames(bool kf);
     void DoneDisplayingFrame(void);
 
     void ProcessFrameXvMC(VideoFrame *frame, OSD *osd);

libs/libmythtv/videoout_xv.cpp

@@ -1642 +1642 @@
 void VideoOutputXv::DeleteBuffers(VOSType subtype, bool delete_pause_frame)
 {
     (void) subtype;
-    DiscardFrames();
+    DiscardFrames(true);
 
 #ifdef USING_XVMC
     // XvMC buffers
@@ -1651 +1651 @@
         xvmc_vo_surf_t *surf = (xvmc_vo_surf_t*) xvmc_surfs[i];
         X11S(XvMCHideSurface(XJ_disp, &(surf->surface)));
     }
-    DiscardFrames();
+    DiscardFrames(true);
     for (uint i=0; i<xvmc_surfs.size(); i++)
     {
         xvmc_vo_surf_t *surf = (xvmc_vo_surf_t*) xvmc_surfs[i];
@@ -1824 +1824 @@
 void VideoOutputXv::ClearAfterSeek(void)
 {
     VERBOSE(VB_PLAYBACK, LOC + "ClearAfterSeek()");
-    DiscardFrames();
+    DiscardFrames(false);
 #ifdef USING_XVMC
     if (VideoOutputSubType() > XVideo)
     {
@@ -1833 +1833 @@
             xvmc_vo_surf_t *surf = (xvmc_vo_surf_t*) xvmc_surfs[i];
             X11S(XvMCHideSurface(XJ_disp, &(surf->surface)));
         }
-        DiscardFrames();
+        DiscardFrames(true);
     }
 #endif
 }
@@ -1844 +1844 @@
         vbuffers.end_lock(); \
     } while (0)
 
-void VideoOutputXv::DiscardFrames(void)
+void VideoOutputXv::DiscardFrames(bool next_frame_keyframe)
 { 
     if (VideoOutputSubType() <= XVideo)
     {
-        vbuffers.DiscardFrames();
+        vbuffers.DiscardFrames(next_frame_keyframe);
         return;
     }
 
@@ -2010 +2010 @@
 void VideoOutputXv::PrepareFrameXv(VideoFrame *frame)
 {
     if (!frame)
+    {
         frame = vbuffers.GetScratchFrame();
+        vbuffers.GetScratchFrame()->frameNumber = framesPlayed - 1LL;
+    }
 
     XvImage *image = NULL;
     {
@@ -2049 +2052 @@
 void VideoOutputXv::PrepareFrameMem(VideoFrame *buffer, FrameScanType /*scan*/)
 {
     if (!buffer)
+    {
         buffer = vbuffers.GetScratchFrame();
+        vbuffers.GetScratchFrame()->frameNumber = framesPlayed - 1LL;
+    }
 
     vbuffers.LockFrame(buffer, "PrepareFrameMem");
 
@@ -2532 +2538 @@
             vbuffers.TryLockFrame(vbuffers.GetScratchFrame(),
                                   "UpdatePauseFrame -- scratch"))
         {
+            vbuffers.GetScratchFrame()->frameNumber = framesPlayed - 1;
             CopyFrame(&av_pause_frame, vbuffers.GetScratchFrame());
             vbuffers.UnlockFrame(vbuffers.GetScratchFrame(),
                                  "UpdatePauseFrame -- scratch");
@@ -2789 +2796 @@
     if (!frame)
     {
         frame = vbuffers.GetScratchFrame();
+        frame->frameNumber = framesPlayed - 1LL;
         vector<const VideoFrame*> locks;
         locks.push_back(frame);
         locks.push_back(&av_pause_frame);
@@ -2948 +2956 @@
             frame_queue_t children = vbuffers.Children(pframe);
             if (!children.empty())
             {
+#if 0
                 VERBOSE(VB_PLAYBACK, LOC + QString(
                             "Frame %1 w/children: %2 is being held for later "
                             "discarding.")
                         .arg(DebugString(pframe, true))
                         .arg(DebugString(children)));
-
+#endif
                 frame_queue_t::iterator cit;
                 for (cit = children.begin(); cit != children.end(); ++cit)
                 {

libs/libmythtv/decoderbase.cpp

@@ -408 +408 @@
     }
 }
 
-bool DecoderBase::DoRewind(long long desiredFrame, bool doflush)
+bool DecoderBase::DoRewind(long long desiredFrame, bool discardFrames)
 {
-    VERBOSE(VB_PLAYBACK, LOC + "DoRewind("
-            <<desiredFrame<<", "<<( doflush ? "do" : "don't" )<<" flush)");
+    VERBOSE(VB_PLAYBACK, LOC +
+            QString("DoRewind(%1 (%2), %3 discard frames)")
+            .arg(desiredFrame).arg(framesPlayed)
+            .arg((discardFrames) ? "do" : "don't"));
 
     if (m_positionMap.empty())
         return false;
 
-    {
-        bool ok = true;
-        if (ringBuffer->isDVD())
-            ok = DoRewindDVD(desiredFrame);
-        else
-            ok = DoRewindNormal(desiredFrame);
+    if (!DoRewindSeek(desiredFrame))
+        return false;
 
-        if (!ok)
-            return false;
-    }
-
     framesPlayed = lastKey;
     framesRead = lastKey;
 
     // Do any Extra frame-by-frame seeking for exactseeks mode
     // And flush pre-seek frame if we are allowed to and need to..
     int normalframes = (exactseeks) ? desiredFrame - framesPlayed : 0;
+    normalframes = max(normalframes, 0);
+    SeekReset(lastKey, normalframes, true, discardFrames);
 
-    // This shouldn't happen, but it's nasty if it does so prevent it
-    if (normalframes < 0)
-        normalframes = 0;
-
-    SeekReset(lastKey, normalframes, true, doflush);
-
-    // ???
-    if (doflush)
+    if (discardFrames)
     {
+        // We need to tell the NVP and VideoOutput what frame we're on.
         GetNVP()->SetFramesPlayed(framesPlayed+1);
         GetNVP()->getVideoOutput()->SetFramesPlayed(framesPlayed+1);
     }
@@ -456 +446 @@
     return (hasKeyFrameAdjustTable) ? e.adjFrame :(e.index - indexOffset) * kf;
 }
 
-bool DecoderBase::DoRewindDVD(long long desiredFrame)
+bool DecoderBase::DoRewindSeek(long long desiredFrame)
 {
-    long long pos = DVDFindPosition(desiredFrame);
-    ringBuffer->Seek(pos, SEEK_SET);
-    lastKey = desiredFrame + 1;
-    return true;
-}
+    if (ringBuffer->isDVD())
+    {
+        long long pos = DVDFindPosition(desiredFrame);
+        ringBuffer->Seek(pos, SEEK_SET);
+        lastKey = desiredFrame + 1;
+        return true;
+    }
 
-bool DecoderBase::DoRewindNormal(long long desiredFrame)
-{
     // Find keyframe <= desiredFrame, store in lastKey (frames)
     int pre_idx, post_idx;
     FindPosition(desiredFrame, hasKeyFrameAdjustTable, pre_idx, post_idx);
@@ -538 +528 @@
             .arg(desiredFrame).arg(framesPlayed)
             .arg((discardFrames) ? "do" : "don't"));
 
-    // Rewind if we have already played the desiredFrame.
-    if (desiredFrame < framesPlayed)
+    // Rewind if we have already played the desiredFrame. The +1 is for
+    // MPEG4 NUV files, which need to decode an extra frame sometimes.
+    // This shouldn't effect how this works in general because this is
+    // only triggered on the first keyframe/frame skip when paused. At
+    // that point the decoding is more than one frame ahead of display.
+    if (desiredFrame+1 < framesPlayed)
         return DoRewind(desiredFrame, discardFrames);
+    desiredFrame = max(desiredFrame, framesPlayed);
 
     // Save rawframe state, for later restoration...
     bool oldrawstate = getrawframes;

libs/libmythtv/ivtvdecoder.cpp

@@ -20 +20 @@
 #include "videoout_ivtv.h"
 #include "videodev_myth.h"
 
+#define LOC QString("IVD: ")
+#define LOC_ERR QString("IVD Error: ")
+
 bool IvtvDecoder::ntsc = true;
 
 IvtvDecoder::IvtvDecoder(NuppelVideoPlayer *parent, ProgramInfo *pginfo)
@@ -53 +56 @@
 void IvtvDecoder::SeekReset(long long newkey, uint skipframes,
                             bool needFlush, bool discardFrames)
 {
+    VERBOSE(VB_PLAYBACK, LOC + QString("SeekReset(%1, %2 flush, %3 discard)")
+            .arg(skipframes).arg((needFlush) ? "do" : "don't")
+            .arg((discardFrames) ? "do" : "don't"));
+
     DecoderBase::SeekReset(newkey, skipframes, needFlush, discardFrames);
 
     if (!exactseeks)
@@ -77 +84 @@
         vidframes = 0;
         queuedlist.clear();
 
-        videoout->Stop(false);
+        videoout->Stop(false /* hide */);
         videoout->Flush();
 
         videoout->Start(0, skipframes+5);

libs/libmythtv/videooutbase.h

@@ -253 +253 @@
     virtual void DiscardFrame(VideoFrame *frame) { vbuffers.DiscardFrame(frame); }
     /// \brief Releases all frames not being actively displayed from any queue
     ///        onto the queue of frames ready for decoding onto.
-    virtual void DiscardFrames(void) { vbuffers.DiscardFrames(); }
+    virtual void DiscardFrames(bool kf) { vbuffers.DiscardFrames(kf); }
 
     /// \bug not implemented correctly. vpos is not updated.
     VideoFrame *GetLastDecodedFrame(void) { return vbuffers.GetLastDecodedFrame(); }

libs/libmythtv/videobuffers.h

@@ -59 +59 @@
     void DeleteBuffers(void);
 
     void Reset(void);
-    void DiscardFrames(void);
+    void DiscardFrames(bool next_frame_keyframe);
     void ClearAfterSeek(void);
 
     void SetPrebuffering(bool normal);

libs/libmythtv/videobuffers.cpp

@@ -288 +288 @@
                         QString("GetNextFreeFrame() unable to "
                         "lock frame %1 times. Discarding Frames.")
                         .arg(TRY_LOCK_SPINS));
-                DiscardFrames();
+                DiscardFrames(true);
             }
         }
     }
@@ -597 +597 @@
 }
 
 /**
- * \fn VideoBuffers::DiscardFrames(void)
+ * \fn VideoBuffers::DiscardFrames(bool)
  *  Mark all used frames as ready to be reused, this is for seek.
  */
-void VideoBuffers::DiscardFrames(void)
+void VideoBuffers::DiscardFrames(bool next_frame_keyframe)
 {
-    global_lock.lock();
-    VERBOSE(VB_PLAYBACK, QString("VideoBuffers::DiscardFrames(): %1")
-            .arg(GetStatus()));
+    QMutexLocker locker(&global_lock);
+    VERBOSE(VB_PLAYBACK, QString("VideoBuffers::DiscardFrames(%1): %2")
+            .arg(next_frame_keyframe).arg(GetStatus()));
 
+    if (!next_frame_keyframe)
+    {
+        for (bool change = true; change;)
+        {
+            change = false;
+            frame_queue_t ula(used);
+            frame_queue_t::iterator it = ula.begin();
+            for (; it != ula.end(); ++it)
+            {
+                if (!HasChildren(*it))
+                {
+                    RemoveInheritence(*it);
+                    DiscardFrame(*it);
+                    change = true;
+                }
+            }
+        }
+        VERBOSE(VB_PLAYBACK,
+                QString("VideoBuffers::DiscardFrames(%1): %2 -- done")
+                .arg(next_frame_keyframe).arg(GetStatus()));
+        return;
+    }
+
     // Remove inheritence of all frames not in displayed or pause
     frame_queue_t ula(used);
     ula.insert(ula.end(), limbo.begin(), limbo.end());
@@ -650 +673 @@
     VERBOSE(VB_PLAYBACK, QString("VideoBuffers::DiscardFrames(): %1 -- done()")
             .arg(GetStatus()));
 
-    global_lock.unlock();
+    VERBOSE(VB_PLAYBACK,
+            QString("VideoBuffers::DiscardFrames(%1): %2 -- done")
+            .arg(next_frame_keyframe).arg(GetStatus()));
 }
 
 void VideoBuffers::ClearAfterSeek(void)