Ticket #11579: 0002-Add-DVD-context-class-to-encapsulate-the-state-of-th.patch

mythtv/libs/libmythtv/DVD/avformatdecoderdvd.cpp

@@ -2 +2 @@
 #include "mythdvdplayer.h"
 #include "avformatdecoderdvd.h"
 
+extern "C" {
+#include "libavcodec/avcodec.h"
+}
+
 #define LOC QString("AFD_DVD: ")
 
 AvFormatDecoderDVD::AvFormatDecoderDVD(
     MythPlayer *parent, const ProgramInfo &pginfo, PlayerFlags flags)
   : AvFormatDecoder(parent, pginfo, flags)
+  , m_curContext(NULL)
 {
 }
 
+AvFormatDecoderDVD::~AvFormatDecoderDVD()
+{
+    if (m_curContext)
+        m_curContext->DecrRef();
+
+    while (m_contextList.size() > 0)
+        m_contextList.takeFirst()->DecrRef();
+}
+
 void AvFormatDecoderDVD::Reset(bool reset_video_data, bool seek_reset, bool reset_file)
 {
     AvFormatDecoder::Reset(reset_video_data, seek_reset, reset_file);
@@ -32 +46 @@
     return AvFormatDecoder::GetFrame( kDecodeAV );
 }
 
-int64_t AvFormatDecoderDVD::AdjustTimestamp(int64_t timestamp)
-{
-    int64_t newTimestamp = timestamp;
-
-    if (newTimestamp != AV_NOPTS_VALUE)
-    {
-        int64_t timediff = ringBuffer->DVD()->GetTimeDiff();
-        if (newTimestamp >= timediff)
-        {
-            newTimestamp -= timediff;
-        }
-    }
-
-    return newTimestamp;
-}
-
 int AvFormatDecoderDVD::ReadPacket(AVFormatContext *ctx, AVPacket* pkt)
 {
     int result = av_read_frame(ctx, pkt);
@@ -67 +65 @@
 
     if (result >= 0)
     {
-        pkt->dts = AdjustTimestamp(pkt->dts);
-        pkt->pts = AdjustTimestamp(pkt->pts);
+        pkt->dts = ringBuffer->DVD()->AdjustTimestamp(pkt->dts);
+        pkt->pts = ringBuffer->DVD()->AdjustTimestamp(pkt->pts);
     }
 
     return result;
 }
 
+void AvFormatDecoderDVD::CheckContext(int64_t pts)
+{
+    if (pts != AV_NOPTS_VALUE)
+    {
+        while (m_contextList.size() > 0 &&
+               pts >= m_contextList.first()->GetEndPTS())
+        {
+            if (m_curContext)
+                m_curContext->DecrRef();
+
+            m_curContext = m_contextList.takeFirst();
+
+            LOG(VB_GENERAL, LOG_ERR, LOC +
+                QString("DVD context missed! lba: %1, curpts: %2, nav end pts: %3")
+                .arg(m_curContext->GetLBA())
+                .arg(pts)
+                .arg(m_curContext->GetEndPTS()));
+        }
+
+        if (m_contextList.size() > 0 &&
+            pts >= m_contextList.first()->GetStartPTS())
+        {
+            if (m_curContext)
+                m_curContext->DecrRef();
+
+            m_curContext = m_contextList.takeFirst();
+        }
+    }
+}
+
+
+bool AvFormatDecoderDVD::ProcessVideoPacket(AVStream *stream, AVPacket *pkt)
+{
+    int64_t pts = pkt->pts;
+
+    if (pts == AV_NOPTS_VALUE)
+        pts = pkt->dts;
+
+    CheckContext(pts);
+
+    return AvFormatDecoder::ProcessVideoPacket(stream, pkt);
+}
+
+bool AvFormatDecoderDVD::ProcessDataPacket(AVStream *curstream, AVPacket *pkt,
+                                           DecodeType decodetype)
+{
+    bool ret = true;
+
+    if (curstream->codec->codec_id == AV_CODEC_ID_DVD_NAV)
+    {
+        MythDVDContext* context = ringBuffer->DVD()->GetDVDContext();
+
+        if (context)
+            m_contextList.append(context);
+    }
+    else
+    {
+        ret = AvFormatDecoder::ProcessDataPacket(curstream, pkt, decodetype);
+    }
+
+    return ret;
+}
+
 void AvFormatDecoderDVD::PostProcessTracks(void)
 {
     if (!ringBuffer)
@@ -238 +299 @@
 
     // Always use the first video stream
     // (must come after ScanStreams above)
-    selectedTrack[kTrackTypeVideo].av_stream_index = 0;
+    for (uint i = 0; i < ic->nb_streams; i++)
+    {
+        AVStream *st = ic->streams[i];
+        if (st && st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
+        {
+            selectedTrack[kTrackTypeVideo].av_stream_index = i;
+            break;
+        }
+    }
 }
 
 int AvFormatDecoderDVD::GetAudioLanguage(uint audio_index, uint stream_index)

mythtv/libs/libmythtv/DVD/avformatdecoderdvd.h

@@ -1 +1 @@
 #ifndef AVFORMATDECODERDVD_H
 #define AVFORMATDECODERDVD_H
 
+#include <QList>
 #include "avformatdecoder.h"
 
+class MythDVDContext;
+
 class AvFormatDecoderDVD : public AvFormatDecoder
 {
   public:
     AvFormatDecoderDVD(MythPlayer *parent, const ProgramInfo &pginfo,
                        PlayerFlags flags);
+    virtual ~AvFormatDecoderDVD();
     virtual void Reset(bool reset_video_data, bool seek_reset, bool reset_file);
     virtual void UpdateFramesPlayed(void);
     virtual bool GetFrame(DecodeType decodetype); // DecoderBase
 
   protected:
-    int64_t AdjustTimestamp(int64_t timestamp);
     virtual int  ReadPacket(AVFormatContext *ctx, AVPacket *pkt);
+    virtual bool ProcessVideoPacket(AVStream *stream, AVPacket *pkt);
+    virtual bool ProcessDataPacket(AVStream *curstream, AVPacket *pkt,
+                                   DecodeType decodetype);
 
   private:
     virtual bool DoRewindSeek(long long desiredFrame);
@@ -24 +30 @@
     virtual int GetAudioLanguage(uint audio_index, uint stream_index);
     virtual AudioTrackType GetAudioTrackType(uint stream_index);
 
+    void CheckContext(int64_t pts);
+
     long long DVDFindPosition(long long desiredFrame);
+
+    MythDVDContext*        m_curContext;
+    QList<MythDVDContext*> m_contextList;
 };
 
 #endif // AVFORMATDECODERDVD_H

mythtv/libs/libmythtv/DVD/dvdringbuffer.cpp

@@ -78 +78 @@
     return true;
 }
 
+MythDVDContext::MythDVDContext() :
+    ReferenceCounter("MythDVDContext")
+{
+}
+
+MythDVDContext::~MythDVDContext()
+{
+}
+
 DVDRingBuffer::DVDRingBuffer(const QString &lfilename) :
     RingBuffer(kRingBuffer_DVD),
     m_dvdnav(NULL),     m_dvdBlockReadBuf(NULL),
@@ -113 +122 @@
     m_currentTime(0),
     m_parent(NULL),
     m_forcedAspect(-1.0f),
+    m_contextLock(QMutex::Recursive), m_context(NULL),
     m_processState(PROCESS_NORMAL),
     m_dvdStat(DVDNAV_STATUS_OK),
     m_dvdEvent(0),
@@ -149 +159 @@
 
 void DVDRingBuffer::CloseDVD(void)
 {
+    QMutexLocker contextLocker(&m_contextLock);
     rwlock.lockForWrite();
     if (m_dvdnav)
     {
@@ -156 +167 @@
         dvdnav_close(m_dvdnav);
         m_dvdnav = NULL;
     }
+
+    if (m_context)
+    {
+        m_context->DecrRef();
+        m_context = NULL;
+    }
+
     m_gotStop = false;
     m_audioStreamsChanged = true;
     rwlock.unlock();
@@ -321 +339 @@
 
 bool DVDRingBuffer::OpenFile(const QString &lfilename, uint retry_ms)
 {
+    QMutexLocker contextLocker(&m_contextLock);
     rwlock.lockForWrite();
 
     if (m_dvdnav)
@@ -347 +366 @@
     LOG(VB_GENERAL, LOG_INFO, LOC + QString("Opened DVD device at %1")
             .arg(fname.constData()));
 
+    if (m_context)
+        m_context->DecrRef();
+
+    m_context = new MythDVDContext();
+
     dvdnav_set_readahead_flag(m_dvdnav, 0);
     dvdnav_set_PGC_positioning_flag(m_dvdnav, 1);
 
@@ -408 +432 @@
     m_endPts = 0;
     m_timeDiff = 0;
 
+    QMutexLocker contextLocker(&m_contextLock);
+    if (m_context)
+        m_context->DecrRef();
+
+    m_context = new MythDVDContext();
+
     return m_dvdnav;
 }
 
@@ -472 +502 @@
     return pos * DVD_BLOCK_SIZE;
 }
 
+uint32_t DVDRingBuffer::AdjustTimestamp(uint32_t timestamp)
+{
+    uint32_t newTimestamp = timestamp;
+
+    if (newTimestamp >= m_timeDiff)
+    {
+        newTimestamp -= m_timeDiff;
+    }
+
+    return newTimestamp;
+}
+
+int64_t DVDRingBuffer::AdjustTimestamp(int64_t timestamp)
+{
+    int64_t newTimestamp = timestamp;
+
+    if (newTimestamp != AV_NOPTS_VALUE && newTimestamp >= m_timeDiff)
+    {
+        newTimestamp -= m_timeDiff;
+    }
+
+    return newTimestamp;
+}
+
+MythDVDContext *DVDRingBuffer::GetDVDContext(void)
+{
+    QMutexLocker contextLocker(&m_contextLock);
+
+    if (m_context)
+        m_context->IncrRef();
+
+    return m_context;
+}
+
 void DVDRingBuffer::WaitForPlayer(void)
 {
     if (!m_skipstillorwait)
@@ -759 +823 @@
 
                 m_endPts = pci->pci_gi.vobu_e_ptm;
 
+                QMutexLocker contextLocker(&m_contextLock);
+                if (m_context)
+                    m_context->DecrRef();
+
+                m_context = new MythDVDContext();
+
+                m_context->m_pci = *pci;
+
+                m_context->m_pci.pci_gi.vobu_s_ptm = AdjustTimestamp(m_context->m_pci.pci_gi.vobu_s_ptm);
+                m_context->m_pci.pci_gi.vobu_e_ptm = AdjustTimestamp(m_context->m_pci.pci_gi.vobu_e_ptm);
+
+                if (pci->pci_gi.vobu_se_e_ptm != 0)
+                    m_context->m_pci.pci_gi.vobu_se_e_ptm = AdjustTimestamp(m_context->m_pci.pci_gi.vobu_se_e_ptm);
+
                 // get the latest nav
                 m_lastNav = (dvdnav_t *)blockBuf;
 
-                // retrive the latest Data Search Information
+                // retrieve the latest Data Search Information
                 dsi_t *dsi = dvdnav_get_current_nav_dsi(m_dvdnav);
 
+                m_context->m_dsi = *dsi;
+
                 // if we are in a looping menu, we don't want to reset the
                 // selected button when we restart
                 m_vobid  = dsi->dsi_gi.vobu_vob_idn;
@@ -781 +861 @@
 
                 if (m_seeking)
                 {
-
                     int relativetime =
                         (int)((m_seektime - m_currentTime)/ 90000);
                     if (abs(relativetime) <= 1)
@@ -814 +893 @@
                 }
 
                 // debug
-                LOG(VB_PLAYBACK, LOG_DEBUG, LOC + QString("DVDNAV_NAV_PACKET - time:%1, pos:%2, vob:%3, cell:%4, seeking:%5, seektime:%6")
-                    .arg(m_currentTime)
-                    .arg(m_currentpos)
+                LOG(VB_PLAYBACK, LOG_DEBUG, LOC + QString("DVDNAV_NAV_PACKET - time:%1, lba:%2, vob:%3, cell:%4, seeking:%5, seektime:%6")
+                    .arg(m_context->GetStartPTS())
+                    .arg(m_context->GetLBA())
                     .arg(m_vobid)
                     .arg(m_cellid)
                     .arg(m_seeking)
                     .arg(m_seektime));
 
+                if (!m_seeking)
+                {
+                    memcpy(dest + offset, blockBuf, DVD_BLOCK_SIZE);
+                    tot += DVD_BLOCK_SIZE;
+                }
+
                 // release buffer
                 if (blockBuf != m_dvdBlockWriteBuf)
                     dvdnav_free_cache_block(m_dvdnav, blockBuf);

mythtv/libs/libmythtv/DVD/dvdringbuffer.h

@@ -12 +12 @@
 
 #include "ringbuffer.h"
 #include "mythdate.h"
+#include "referencecounter.h"
 
 extern "C" {
 #include "libavcodec/avcodec.h"
@@ -19 +20 @@
 
 #include "dvdnav/dvdnav.h"
 
+class MTV_PUBLIC MythDVDContext : public ReferenceCounter
+{
+    friend class DVDRingBuffer;
+
+  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;             }
+
+  protected:
+    MythDVDContext();
+
+  protected:
+    dsi_t          m_dsi;
+    pci_t          m_pci;
+};
+
 /** \class DVDRingBufferPriv
  *  \brief RingBuffer class for DVD's
  *
@@ -78 +99 @@
     bool IsWaiting(void) const           { return m_dvdWaiting;          }
     int  NumPartsInTitle(void)     const { return m_titleParts;          }
     void GetMenuSPUPkt(uint8_t *buf, int len, int stream_id, uint32_t startTime);
-    int64_t GetTimeDiff(void)      const { return m_timeDiff; }
+
+    uint32_t AdjustTimestamp(uint32_t timestamp);
+    int64_t AdjustTimestamp(int64_t timestamp);
+    MythDVDContext* GetDVDContext(void);
 
     // Public menu/button stuff
     AVSubtitle *GetMenuSubtitle(uint &version);
@@ -206 +230 @@
     MythDVDPlayer *m_parent;
     float          m_forcedAspect;
 
+    QMutex          m_contextLock;
+    MythDVDContext *m_context;
     processState_t  m_processState;
     dvdnav_status_t m_dvdStat;
     int32_t        m_dvdEvent;

mythtv/libs/libmythtv/avformatdecoder.h

@@ -96 +96 @@
     static void GetDecoders(render_opts &opts);
     AvFormatDecoder(MythPlayer *parent, const ProgramInfo &pginfo,
                     PlayerFlags flags);
-   ~AvFormatDecoder();
+    virtual ~AvFormatDecoder();
 
     virtual void SetEof(bool eof);
 
@@ -222 +222 @@
     void MpegPreProcessPkt(AVStream *stream, AVPacket *pkt);
     int  H264PreProcessPkt(AVStream *stream, AVPacket *pkt);
     bool PreProcessVideoPacket(AVStream *stream, AVPacket *pkt);
-    bool ProcessVideoPacket(AVStream *stream, AVPacket *pkt);
+    virtual bool ProcessVideoPacket(AVStream *stream, AVPacket *pkt);
     bool ProcessVideoFrame(AVStream *stream, AVFrame *mpa_pic);
     bool ProcessAudioPacket(AVStream *stream, AVPacket *pkt,
                             DecodeType decodetype);
     bool ProcessSubtitlePacket(AVStream *stream, AVPacket *pkt);
     bool ProcessRawTextPacket(AVPacket *pkt);
-    bool ProcessDataPacket(AVStream *curstream, AVPacket *pkt,
-                           DecodeType decodetype);
+    virtual bool ProcessDataPacket(AVStream *curstream, AVPacket *pkt,
+                                   DecodeType decodetype);
 
     void ProcessVBIDataPacket(const AVStream *stream, const AVPacket *pkt);
     void ProcessDVBDataPacket(const AVStream *stream, const AVPacket *pkt);