Ticket #11579: 0004-Handle-seeking-within-slideshows.patch

mythtv/libs/libmythdvdnav/dvdnav/searching.c

@@ -696 +696 @@
       for (i = 0; i < 19; i++) {
         if (stime[i]/2.0 <= length/2.0) {
           offset = dsi->vobu_sri.fwda[i];
-          if (offset >> 31) {
+          if (offset != 0x3fffffff) {
             new_vobu = cur_vobu + (offset & 0xffff);
           } else {
             if (cell_nr == last_cell_nr) {
@@ -715 +715 @@
         if (stime[18 - i]/2.0 >= abs(length)/2.0)
         {
           offset = dsi->vobu_sri.bwda[i];
-          if (offset >> 31) {
+          if (offset != 0x3fffffff) {
             new_vobu = cur_vobu - (offset & 0xffff);
           } else {
             if (cell_nr == first_cell_nr) {

mythtv/libs/libmythtv/DVD/avformatdecoderdvd.cpp

@@ -7 +7 @@
 }
 
 #define LOC QString("AFD_DVD: ")
+#define INVALID_LBA 0xbfffffff
 
 AvFormatDecoderDVD::AvFormatDecoderDVD(
     MythPlayer *parent, const ProgramInfo &pginfo, PlayerFlags flags)
   : AvFormatDecoder(parent, pginfo, flags)
   , m_curContext(NULL)
   , m_lastVideoPkt(NULL)
+  , m_lbaLastVideoPkt(INVALID_LBA)
   , m_framesReq(0)
+  , m_returnContext(NULL)
 {
 }
 
 AvFormatDecoderDVD::~AvFormatDecoderDVD()
 {
-    if (m_curContext)
-        m_curContext->DecrRef();
+    ReleaseContext(m_curContext);
+    ReleaseContext(m_returnContext);
 
     while (m_contextList.size() > 0)
         m_contextList.takeFirst()->DecrRef();
 
+    ReleaseLastVideoPkt();
+}
+
+void AvFormatDecoderDVD::ReleaseLastVideoPkt()
+{
     if (m_lastVideoPkt)
     {
         av_free_packet(m_lastVideoPkt);
         delete m_lastVideoPkt;
+        m_lastVideoPkt = NULL;
+        m_lbaLastVideoPkt = INVALID_LBA;
+    }
+}
+
+void AvFormatDecoderDVD::ReleaseContext(MythDVDContext *&context)
+{
+    if (context)
+    {
+        context->DecrRef();
+        context = NULL;
     }
 }
 
@@ -61 +80 @@
     if (m_framesReq > 0)
     {
         m_framesReq--;
-        av_copy_packet(pkt, m_lastVideoPkt);
 
-        if (m_lastVideoPkt->pts != AV_NOPTS_VALUE)
-            m_lastVideoPkt->pts += pkt->duration;
+        if (m_lastVideoPkt)
+        {
+            av_copy_packet(pkt, m_lastVideoPkt);
+
+            if (m_lastVideoPkt->pts != AV_NOPTS_VALUE)
+                m_lastVideoPkt->pts += pkt->duration;
 
-        if (m_lastVideoPkt->dts != AV_NOPTS_VALUE)
-            m_lastVideoPkt->dts += pkt->duration;
+            if (m_lastVideoPkt->dts != AV_NOPTS_VALUE)
+                m_lastVideoPkt->dts += pkt->duration;
+        }
+        else
+        {
+            LOG(VB_GENERAL, LOG_ERR, LOC + QString( "Need to generate frame @ %1 - %2 but no frame available!")
+                .arg(pkt->pts)
+                .arg(m_framesReq));
+        }
     }
     else
     {
-        result = av_read_frame(ctx, pkt);
+        bool gotPacket;
 
-        while (result == AVERROR_EOF && errno == EAGAIN)
+        do
         {
-            if (ringBuffer->DVD()->IsReadingBlocked())
+            gotPacket = true;
+
+            result = av_read_frame(ctx, pkt);
+
+            while (result == AVERROR_EOF && errno == EAGAIN)
             {
-                ringBuffer->DVD()->UnblockReading();
-                result = av_read_frame(ctx, pkt);
+                if (ringBuffer->DVD()->IsReadingBlocked())
+                {
+                    if (ringBuffer->DVD()->GetLastEvent() == DVDNAV_HOP_CHANNEL)
+                    {
+                        // Non-seamless jump - clear all buffers
+                        m_framesReq = 0;
+                        ReleaseContext(m_curContext);
+
+                        while (m_contextList.size() > 0)
+                            m_contextList.takeFirst()->DecrRef();
+
+                        Reset(true, false, false);
+                        m_audio->Reset();
+                        m_parent->DiscardVideoFrames(false);
+                    }
+                    ringBuffer->DVD()->UnblockReading();
+                    result = av_read_frame(ctx, pkt);
+                }
+                else
+                {
+                    break;
+                }
             }
-            else
+
+            if (result >= 0)
             {
-                break;
-            }
-        }
+                pkt->dts = ringBuffer->DVD()->AdjustTimestamp(pkt->dts);
+                pkt->pts = ringBuffer->DVD()->AdjustTimestamp(pkt->pts);
 
-        if (result >= 0)
-        {
-            pkt->dts = ringBuffer->DVD()->AdjustTimestamp(pkt->dts);
-            pkt->pts = ringBuffer->DVD()->AdjustTimestamp(pkt->pts);
-        }
+                if (m_returnContext)
+                {
+                    // We've jumped in a slideshow and have had to jump again
+                    // to find the right video packet to show so only allow
+                    // the packets through that let us find it.
+                    gotPacket = false;
 
-        AVStream *curstream = ic->streams[pkt->stream_index];
-        if(curstream->codec->codec_type == AVMEDIA_TYPE_DATA)
-        {
-            LOG(VB_PLAYBACK, LOG_DEBUG, LOC + QString( "Read DVD context @ %1 - curcontext %2 lastVideo %3 reqFrames %4")
-                .arg(pkt->pts)
-                .arg((uint64_t)m_curContext, 0, 16)
-                .arg((uint64_t)m_lastVideoPkt, 0, 16)
-                .arg(m_framesReq));
-        }
+                    AVStream *curstream = ic->streams[pkt->stream_index];
+
+                    if ((curstream->codec->codec_type == AVMEDIA_TYPE_VIDEO) ||
+                        (curstream->codec->codec_id == AV_CODEC_ID_DVD_NAV))
+                    {
+                        // Allow video or NAV packets through
+                        gotPacket = true;
+                    }
+                }
+            }
+        }while(!gotPacket);
     }
 
     return result;
@@ -110 +166 @@
 {
     if (pts != AV_NOPTS_VALUE)
     {
+        // Remove any contexts we should have
+        // already processed.(but have somehow jumped past)
         while (m_contextList.size() > 0 &&
                pts >= m_contextList.first()->GetEndPTS())
         {
-            if (m_curContext)
-                m_curContext->DecrRef();
-
+            ReleaseContext(m_curContext);
             m_curContext = m_contextList.takeFirst();
 
             LOG(VB_GENERAL, LOG_ERR, LOC +
@@ -125 +181 @@
                 .arg(m_curContext->GetEndPTS()));
         }
 
+        // See whether we can take the next context from the list
         if (m_contextList.size() > 0 &&
             pts >= m_contextList.first()->GetStartPTS())
         {
-            if (m_curContext)
-                m_curContext->DecrRef();
-
+            ReleaseContext(m_curContext);
             m_curContext = m_contextList.takeFirst();
 
-            LOG(VB_PLAYBACK, LOG_DEBUG, LOC + QString( "New DVD context @ %1 - %2")
-                .arg(pts)
-                .arg(m_curContext->GetNumFramesPresent()));
+            if (m_curContext->GetLBAPrevVideoFrame() != m_lbaLastVideoPkt)
+                ReleaseLastVideoPkt();
 
             if (m_curContext->GetNumFramesPresent() == 0)
             {
-                // No video frames present, so we need to generate
-                // them based on the last 'sequence end' video packet.
-                m_framesReq = m_curContext->GetNumFrames();
+                if (m_lastVideoPkt)
+                {
+                    // No video frames present, so we need to generate
+                    // them based on the last 'sequence end' video packet.
+                    m_framesReq = m_curContext->GetNumFrames();
+                }
+                else
+                {
+                    // There are no video frames in this VOBU and
+                    // we don't have one stored.  We've probably
+                    // jumped into the middle of a cell.
+                    // Jump back to the first VOBU that contains
+                    // video so we can get the video frame we need
+                    // before jumping back again.
+                    m_framesReq = 0;
+                    uint32_t lastVideoSector = m_curContext->GetLBAPrevVideoFrame();
+
+                    if (lastVideoSector != INVALID_LBA)
+                    {
+                        LOG(VB_PLAYBACK, LOG_DEBUG, LOC + QString( "Missing video.  Jumping to sector %1")
+                            .arg(lastVideoSector));
+
+                        ringBuffer->DVD()->SectorSeek(lastVideoSector);
+
+                        m_returnContext = m_curContext;
+                        m_curContext = NULL;
+                    }
+                    else
+                    {
+                        LOG(VB_GENERAL, LOG_ERR, LOC +
+                            QString("Missing video frame and no previous frame available! lba: %1")
+                            .arg(m_curContext->GetLBA()));
+                    }
+                }
             }
             else
             {
+                // Normal VOBU with at least one video frame so we don't need to generate frames.
                 m_framesReq = 0;
-                if (m_lastVideoPkt)
-                {
-                    av_free_packet(m_lastVideoPkt);
-                    delete m_lastVideoPkt;
-                    m_lastVideoPkt = NULL;
-                }
+                ReleaseLastVideoPkt();
             }
         }
     }
@@ -190 +271 @@
 
         av_init_packet(m_lastVideoPkt);
         av_copy_packet(m_lastVideoPkt, pkt);
+        m_lbaLastVideoPkt = m_curContext->GetLBA();
+
+        if (m_returnContext)
+        {
+            // After seeking in a slideshow, we needed to find
+            // the previous video frame to display.
+                // We've found it now, so we need to jump back to
+                // where we originally wanted to be.
+            LOG(VB_PLAYBACK, LOG_DEBUG, LOC + QString( "Found video packet, jumping back to sector %1")
+                .arg(m_returnContext->GetLBA()));
+
+            ringBuffer->DVD()->SectorSeek(m_returnContext->GetLBA());
+            ReleaseContext(m_returnContext);
+        }
+        else
+        {
+            if (m_lastVideoPkt->pts != AV_NOPTS_VALUE)
+                m_lastVideoPkt->pts += pkt->duration;
+
+            if (m_lastVideoPkt->dts != AV_NOPTS_VALUE)
+                m_lastVideoPkt->dts += pkt->duration;
+
+            m_framesReq = m_curContext->GetNumFrames() - m_curContext->GetNumFramesPresent();
 
-        if (m_lastVideoPkt->pts != AV_NOPTS_VALUE)
-            m_lastVideoPkt->pts += pkt->duration;
+            LOG(VB_PLAYBACK, LOG_DEBUG, LOC + QString( "SeqEnd @ %1 - require %2 frame(s)")
+                .arg(pkt->pts)
+                .arg(m_framesReq));
+        }
+    }
 
-        if (m_lastVideoPkt->dts != AV_NOPTS_VALUE)
-            m_lastVideoPkt->dts += pkt->duration;
+    return ret;
+}
 
-        m_framesReq = m_curContext->GetNumFrames() - m_curContext->GetNumFramesPresent();
+bool AvFormatDecoderDVD::ProcessVideoFrame(AVStream *stream, AVFrame *mpa_pic)
+{
+    bool ret = true;
 
-        LOG(VB_PLAYBACK, LOG_DEBUG, LOC + QString( "SeqEnd @ %1 - require %2 frame(s)")
-            .arg(pkt->pts)
-            .arg(m_framesReq));
+    if (m_returnContext == NULL)
+    {
+        // Only process video frames if we're not searching for
+        // the previous video frame after seeking in a slideshow.
+        ret = AvFormatDecoder::ProcessVideoFrame(stream, mpa_pic);
     }
 
     return ret;
@@ -224 +335 @@
             // If we don't have a current context, use
             // the first in the list
             CheckContext(m_contextList.first()->GetStartPTS());
+
+            if (m_lastVideoPkt && m_curContext)
+            {
+                // If there was no current context but there was
+                // a video packet, we've almost certainly been
+                // seeking so set the timestamps of the video
+                // packet to the new context to ensure we don't
+                // get sync errors.
+                m_lastVideoPkt->pts = m_curContext->GetStartPTS();
+                m_lastVideoPkt->dts = m_lastVideoPkt->pts;
+            }
         }
         else
         if (m_lastVideoPkt)

mythtv/libs/libmythtv/DVD/avformatdecoderdvd.h

@@ -19 +19 @@
   protected:
     virtual int  ReadPacket(AVFormatContext *ctx, AVPacket *pkt);
     virtual bool ProcessVideoPacket(AVStream *stream, AVPacket *pkt);
+    virtual bool ProcessVideoFrame(AVStream *stream, AVFrame *mpa_pic);
     virtual bool ProcessDataPacket(AVStream *curstream, AVPacket *pkt,
                                    DecodeType decodetype);
 
@@ -31 +32 @@
     virtual AudioTrackType GetAudioTrackType(uint stream_index);
 
     void CheckContext(int64_t pts);
+    void ReleaseLastVideoPkt();
+    void ReleaseContext(MythDVDContext *&context);
 
     long long DVDFindPosition(long long desiredFrame);
 
     MythDVDContext*        m_curContext;
     QList<MythDVDContext*> m_contextList;
     AVPacket*              m_lastVideoPkt;
+    uint32_t               m_lbaLastVideoPkt;
     int                    m_framesReq;
+    MythDVDContext*        m_returnContext;
 };
 
 #endif // AVFORMATDECODERDVD_H

mythtv/libs/libmythtv/DVD/dvdringbuffer.cpp

@@ -87 +87 @@
 {
 }
 
+/** \brief Returns the duration of this VOBU in frames
+ *  \sa GetNumFramesPresent
+ */
 int MythDVDContext::GetNumFrames() const
 {
     return ((GetEndPTS() - GetStartPTS()) * GetFPS()) / 90000;
 }
 
+/** \brief Returns the number of video frames present in this VOBU
+ *  \sa GetNumFrames
+ */
 int MythDVDContext::GetNumFramesPresent() const
 {
     int frames = 0;
@@ -112 +118 @@
     return frames;
 }
 
+/** \brief Returns the logical block address of the previous
+ * VOBU containing video.
+ * \return LBA or 0xbfffffff if no previous VOBU with video exists
+ */
+uint32_t MythDVDContext::GetLBAPrevVideoFrame() const
+{
+    uint32_t lba = m_dsi.vobu_sri.prev_video;
+
+    if (lba != 0xbfffffff)
+    {
+        // If there is a previous video frame in this
+        // cell, calculate the absolute LBA from the
+        // offset
+        lba = GetLBA() - (lba & 0x7ffffff);
+    }
+
+    return lba;
+}
+
 DVDRingBuffer::DVDRingBuffer(const QString &lfilename) :
     RingBuffer(kRingBuffer_DVD),
     m_dvdnav(NULL),     m_dvdBlockReadBuf(NULL),
@@ -295 +320 @@
     return Seek(time);
 }
 
+bool DVDRingBuffer::SectorSeek(uint64_t sector)
+{
+    dvdnav_status_t dvdRet = DVDNAV_STATUS_OK;
+
+    QMutexLocker lock(&m_seekLock);
+
+    dvdRet = dvdnav_sector_search(m_dvdnav, sector, SEEK_SET);
+
+    if (dvdRet == DVDNAV_STATUS_ERR)
+    {
+        LOG(VB_PLAYBACK, LOG_ERR, LOC +
+            QString("SectorSeek() to sector %1 failed").arg(sector));
+        return false;
+    }
+    else
+    {
+        LOG(VB_PLAYBACK, LOG_DEBUG, LOC +
+            QString("DVD Playback SectorSeek() sector: %1").arg(sector));
+        return true;
+    }
+}
+
 long long DVDRingBuffer::Seek(long long time)
 {
     dvdnav_status_t dvdRet = DVDNAV_STATUS_OK;
@@ -939 +986 @@
 
             case DVDNAV_HOP_CHANNEL:
             {
-                // debug
-                LOG(VB_PLAYBACK, LOG_DEBUG, LOC + "DVDNAV_HOP_CHANNEL");
-                WaitForPlayer();
+                if (!bReprocessing && !m_skipstillorwait)
+                {
+                    LOG(VB_PLAYBACK, LOG_DEBUG, LOC + "DVDNAV_HOP_CHANNEL - waiting");
+                    m_processState = PROCESS_WAIT;
+                    break;
+                }
+                else
+                {
+                    // debug
+                    LOG(VB_PLAYBACK, LOG_DEBUG, LOC + "DVDNAV_HOP_CHANNEL");
+                    WaitForPlayer();
+                }
             }
             break;
 

mythtv/libs/libmythtv/DVD/dvdringbuffer.h

@@ -20 +20 @@
 
 #include "dvdnav/dvdnav.h"
 
+/** \class MythDVDContext
+ *  \brief Encapsulates playback context at any given moment.
+ *
+ * This class is mainly represents a single VOBU (video object unit)
+ * on a DVD
+ */
 class MTV_PUBLIC MythDVDContext : public ReferenceCounter
 {
     friend class DVDRingBuffer;
@@ -27 +33 @@
   public:
     virtual ~MythDVDContext();
 
-    int64_t  GetStartPTS()         const { return (int64_t)m_pci.pci_gi.vobu_s_ptm;    }
-    int64_t  GetEndPTS()           const { return (int64_t)m_pci.pci_gi.vobu_e_ptm;    }
-    int64_t  GetSeqEndPTS()        const { return (int64_t)m_pci.pci_gi.vobu_se_e_ptm; }
-    uint32_t GetLBA()              const { return m_pci.pci_gi.nv_pck_lbn;             }
-    int      GetNumFrames()        const;
-    int      GetNumFramesPresent() const;
-    int      GetFPS()              const { return (m_pci.pci_gi.e_eltm.frame_u & 0x80) ? 30 : 25; }
+    int64_t  GetStartPTS()          const { return (int64_t)m_pci.pci_gi.vobu_s_ptm;    }
+    int64_t  GetEndPTS()            const { return (int64_t)m_pci.pci_gi.vobu_e_ptm;    }
+    int64_t  GetSeqEndPTS()         const { return (int64_t)m_pci.pci_gi.vobu_se_e_ptm; }
+    uint32_t GetLBA()               const { return m_pci.pci_gi.nv_pck_lbn;             }
+    uint32_t GetLBAPrevVideoFrame() const;
+    int      GetNumFrames()         const;
+    int      GetNumFramesPresent()  const;
+    int      GetFPS()               const { return (m_pci.pci_gi.e_eltm.frame_u & 0x80) ? 30 : 25; }
 
   protected:
     MythDVDContext();
@@ -104 +111 @@
     uint32_t AdjustTimestamp(uint32_t timestamp);
     int64_t AdjustTimestamp(int64_t timestamp);
     MythDVDContext* GetDVDContext(void);
+    int32_t GetLastEvent(void) const     { return m_dvdEvent; }
 
     // Public menu/button stuff
     AVSubtitle *GetMenuSubtitle(uint &version);
@@ -143 +151 @@
     virtual int safe_read(void *data, uint sz);
     virtual long long Seek(long long pos, int whence, bool has_lock);
     long long NormalSeek(long long time);
+    bool SectorSeek(uint64_t sector);
     void SkipStillFrame(void);
     void WaitSkip(void);
     void SkipDVDWaitingForPlayer(void)    { m_playerWait = false;           }

mythtv/libs/libmythtv/avformatdecoder.h

@@ -223 +223 @@
     int  H264PreProcessPkt(AVStream *stream, AVPacket *pkt);
     bool PreProcessVideoPacket(AVStream *stream, AVPacket *pkt);
     virtual bool ProcessVideoPacket(AVStream *stream, AVPacket *pkt);
-    bool ProcessVideoFrame(AVStream *stream, AVFrame *mpa_pic);
+    virtual bool ProcessVideoFrame(AVStream *stream, AVFrame *mpa_pic);
     bool ProcessAudioPacket(AVStream *stream, AVPacket *pkt,
                             DecodeType decodetype);
     bool ProcessSubtitlePacket(AVStream *stream, AVPacket *pkt);