Ticket #1827: dvd_seek_improv2.diff

libs/libmythtv/DVDRingBuffer.cpp

@@ -40 +40 @@
       menupktpts(0), curAudioTrack(0),
       curSubtitleTrack(0), autoselectaudio(true),
       autoselectsubtitle(true), 
-      jumptotitle(true), parent(0)
+      jumptotitle(true), repeatseek(false),
+      seekpos(0), seekwhence(0),
+      parent(0)
 {
 }
 
@@ -61 +63 @@
 
 long long DVDRingBufferPriv::Seek(long long pos, int whence)
 {
-    dvdnav_sector_search(this->dvdnav, pos / DVD_BLOCK_SIZE , whence);
+    dvdnav_status_t dvdRet = dvdnav_sector_search(this->dvdnav, pos / DVD_BLOCK_SIZE , whence);
+    if (dvdRet == DVDNAV_STATUS_ERR && !repeatseek)
+    {
+        VERBOSE(VB_PLAYBACK, LOC + QString("Seek failed to jump to position %1").arg(pos) +
+                            " Will try and seek to this position at the next cell change");
+        repeatseek = true;
+        seekpos = pos;
+        seekwhence = whence;
+    }
     gotStop = false;
     return GetReadPosition();
 }
@@ -264 +274 @@
                     autoselectsubtitle = true;
                 }
 
+                if (repeatseek)
+                {
+                    Seek(seekpos, seekwhence);
+                    repeatseek = false;
+                }       
+
                 if (blockBuf != dvdBlockWriteBuf)
                 {
                     dvdnav_free_cache_block(dvdnav, blockBuf);

libs/libmythtv/DVDRingBuffer.h

@@ -142 +142 @@
     const char     *dvdname;
     const char     *serialnumber;
     bool           jumptotitle;
+    bool           repeatseek;
+    long long      seekpos;
+    int            seekwhence;
 
     NuppelVideoPlayer *parent;