Ticket #8248: ticket_8248_fix.diff

mythtv/libs/libmythtv/DVDRingBuffer.cpp

@@ -50 +50 @@
       m_lastcellid(0), m_vobid(0),
       m_lastvobid(0), m_cellRepeated(false),
       m_buttonstreamid(0), m_runningCellStart(false),
-      m_runSeekCellStart(false),
       m_menupktpts(0), m_curAudioTrack(0),
       m_curSubtitleTrack(0),
       m_autoselectsubtitle(true),
@@ -1252 +1251 @@
     return false;
 }
 
-/** \brief Run SeekCellStart its okay to run seekcellstart
- ** ffmpeg for some reason doesnt' output menu spu if seekcellstart
+/** \brief Run SeekCellStart.
+ ** ffmpeg for some reason does not output menu spu if seekcellstart
  ** is started too soon after a video codec/resolution change
  */
 void DVDRingBufferPriv::RunSeekCellStart(void)
 {
-    if (!m_runSeekCellStart)
-        return;
-
     bool ret = true;
     if (NumMenuButtons() > 0 && !m_buttonExists)
         ret = false;
 
     if (ret)
-    {
         ret = SeekCellStart();
-        m_runSeekCellStart = false;
-    }
 }
 
 /** \brief seek the beginning of a dvd cell

mythtv/libs/libmythtv/DVDRingBuffer.h

@@ -107 +107 @@
     void JumpToTitle(bool change) { m_jumptotitle = change; }
     void SetDVDSpeed(void);
     void SetDVDSpeed(int speed);
-    void SetRunSeekCellStart(bool change) { m_runSeekCellStart = change; }
 
     void SetParent(NuppelVideoPlayer *p) { m_parent = p; }
 
-
   protected:
     dvdnav_t      *m_dvdnav;
     unsigned char  m_dvdBlockWriteBuf[DVD_BLOCK_SIZE];
@@ -155 +153 @@
     bool           m_cellRepeated;
     int            m_buttonstreamid;
     bool           m_runningCellStart;
-    bool           m_runSeekCellStart;
     long long      m_menupktpts;
     int            m_curAudioTrack;
     int8_t         m_curSubtitleTrack;

mythtv/libs/libmythtv/NuppelVideoPlayer.cpp

@@ -827 +827 @@
         DisableCaptions(textDisplayMode, false);
         SetCaptionsEnabled(true, false);
     }
-
-    if (player_ctx->buffer->InDVDMenuOrStillFrame())
-        player_ctx->buffer->DVD()->SetRunSeekCellStart(true);
 }
 
 QString NuppelVideoPlayer::ReinitAudio(void)

mythtv/libs/libmythtv/avformatdecoder.cpp

@@ -3556 +3558 @@
             bool cellChanged = ringBuffer->DVD()->CellChanged();
             bool inDVDStill = ringBuffer->DVD()->InStillFrame();
             bool inDVDMenu  = ringBuffer->DVD()->IsInMenu();
+            int storedPktCount = storedPackets.count();
             selectedVideoIndex = 0;
             if (dvdTitleChanged)
             {
-                if ((storedPackets.count() > 10 && !decodeStillFrame) ||
+                if ((storedPktCount > 10 && !decodeStillFrame) ||
                     decodeStillFrame)
                 {
                     storevideoframes = false;
@@ -3573 +3576 @@
             {
                 storevideoframes = false;
 
-                if (storedPackets.count() < 2 && !decodeStillFrame)
+                if (storedPktCount < 2 && !decodeStillFrame)
                     storevideoframes = true;
 
                 VERBOSE(VB_PLAYBACK+VB_EXTRA, QString("DVD Playback Debugging "
                     "inDVDMenu %1 storedPacketcount %2 dvdstill %3")
-                    .arg(inDVDMenu).arg(storedPackets.count()).arg(inDVDStill));
-
-                if (inDVDMenu && storedPackets.count() > 0)
-                    ringBuffer->DVD()->SetRunSeekCellStart(false);
-                else if (storedPackets.count() == 0)
+                    .arg(inDVDMenu).arg(storedPktCount).arg(inDVDStill));
+                
+                if (inDVDStill && (storedPktCount == 0) &&
+                    (GetNVP()->getVideoOutput()->ValidVideoFrames() == 0))
+                {
                     ringBuffer->DVD()->RunSeekCellStart();
+                }
             }
             if (GetNVP()->AtNormalSpeed() &&
                 ((cellChanged) || (lastdvdtitle != dvdtitle)))