Ticket #2808: dvd_seeking_fix.diff

libs/libmythdvdnav/searching.c

@@ -258 +258 @@
   for(cell_nr = first_cell_nr; (cell_nr <= last_cell_nr) && !found; cell_nr ++) {
     cell =  &(state->pgc->cell_playback[cell_nr-1]);
     length = cell->last_sector - cell->first_sector + 1;
-    if (target >= length) {
-      target -= length;
-    } else {
-      /* convert the target sector from Cell-relative to absolute physical sector */
-      target += cell->first_sector;
+    if (target >= cell->first_sector && target <= cell->last_sector) {
       found = 1;
       break;
     }

libs/libmythtv/DVDRingBuffer.cpp

@@ -296 +296 @@
 
                 if (repeatseek)
                 {
+                    QMutexLocker lock(&seekLock);
                     Seek(seekpos, seekwhence);
                     repeatseek = false;
                 }       
@@ -510 +511 @@
     if (newPart > 0)
         dvdnav_part_play(dvdnav, title, newPart);
     else
-        Seek(0,SEEK_SET); // May cause picture to become jumpy.
+    {
+        QMutexLocker lock(&seekLock);
+        Seek(0,SEEK_SET);
+    }
     gotStop = false;
 }