Ticket #1827: dvd_seeking_improv.diff

libs/libmythtv/NuppelVideoPlayer.cpp

@@ -1284 +1283 @@
         videobuf_retries = 0;
     }
 
+    if (framesPlayed < 5 && play_speed > 1)
+        next_play_speed = 1;
+
     // Decode the correct frame
     if (!GetDecoder())
         VERBOSE(VB_IMPORTANT, LOC + "GetFrame() called with NULL decoder.");
@@ -3173 +3175 @@
             normal_speed = next_normal_speed;
             VERBOSE(VB_PLAYBACK, LOC + "Changing speed to " << play_speed);
 
+            if (ringBuffer->isDVD())
+                GetDecoder()->UpdateDVDFramesPlayed();
+
             if (play_speed == 0.0)
             {
                 DoPause();
@@ -3292 +3297 @@
             {
                 PauseVideo();
 
-                if (fftime >= 5)
+                if (fftime >= 5 && !ringBuffer->isDVD())
                     DoFastForward();
 
                 if (eof)
@@ -3692 +3697 @@
 #endif
 
         GetDecoder()->setExactSeeks(exactseeks && ffrew_skip == 1);
-        GetDecoder()->DoRewind(framesPlayed);
+        if (!ringBuffer->isDVD())
+            GetDecoder()->DoRewind(framesPlayed);
         ClearAfterSeek();
     }
 

libs/libmythtv/avformatdecoder.cpp

@@ -547 +547 @@
     {
         posmapStarted = false;
         SyncPositionMap();
-        framesPlayed = DVDCurrentFrameNumber();
-        framesRead = framesPlayed;
     }
 
 #if 0
@@ -2490 +2488 @@
                     ScanStreams(true);
                     lastdvdtitle = dvdtitle;
                 }
-                framesPlayed = DVDCurrentFrameNumber();
-                framesRead = framesPlayed;
+                UpdateDVDFramesPlayed();
                 VERBOSE(VB_PLAYBACK, QString(LOC + "DVD Cell Changed. "
                                              "Update framesPlayed: %1 ")
                                              .arg(framesPlayed));

libs/libmythtv/decoderbase.h

@@ -107 +107 @@
     void ChangeDVDTrack(bool ffw);
     long long DVDFindPosition(long long desiredFrame);
     long long DVDCurrentFrameNumber(void);
+    void UpdateDVDFramesPlayed(void);
 
     // Audio/Subtitle/EIA-608/EIA-708 stream selection
     virtual QStringList GetTracks(uint type) const;

libs/libmythtv/decoderbase.cpp

@@ -712 +714 @@
 
         if (elapsed == 0)
             SeekReset(framesPlayed, 0, true, true);
-
-        // update frames played
-        long long played = DVDCurrentFrameNumber();
-
-        framesPlayed = played;
-        GetNVP()->getVideoOutput()->SetFramesPlayed(played + 1);
-        GetNVP()->SetFramesPlayed(played + 1);
+    
+        UpdateDVDFramesPlayed();
     }
 }
 
@@ -734 +731 @@
 
 long long DecoderBase::DVDCurrentFrameNumber(void)
 {
-    if (!ringBuffer->isDVD())
+    int size = m_positionMap.size() - 1;
+    if (!ringBuffer->isDVD() || size < 0)
         return 0;
 
-    int size = m_positionMap.size() - 1;
     long long currentpos = ringBuffer->GetReadPosition();
     long long multiplier = (currentpos * m_positionMap[size].index);
     long long currentframe = multiplier / m_positionMap[size].pos;
     return currentframe;
 }
 
+void DecoderBase::UpdateDVDFramesPlayed(void)
+{
+    long long currentpos = DVDCurrentFrameNumber();
+    if (currentpos != 0)
+    {
+        framesPlayed = framesRead = currentpos ;
+        GetNVP()->getVideoOutput()->SetFramesPlayed(currentpos + 1);
+        GetNVP()->SetFramesPlayed(currentpos + 1);
+    }
+}
+
 QStringList DecoderBase::GetTracks(uint type) const
 {
     QStringList list;