OSDN Git Service

dvdnav:
authorjstebbins <jstebbins@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Mon, 29 Jun 2009 23:19:39 +0000 (23:19 +0000)
committerjstebbins <jstebbins@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Mon, 29 Jun 2009 23:19:39 +0000 (23:19 +0000)
- revert read error recovery
  Attempting to seek one sector forward doesn't work.  dvdnav rounds the seek
  request *down* to the nearest vobu.  So the seek actually goes backwards.

git-svn-id: svn://localhost/HandBrake/trunk@2644 b64f7644-9d1e-0410-96f1-a4d463321fa5

libhb/dvdnav.c

index fa6aa83..378c133 100644 (file)
@@ -971,7 +971,6 @@ static int hb_dvdnav_read( hb_dvd_t * e, hb_buffer_t * b )
     hb_dvdnav_t * d = &(e->dvdnav);
     int result, event, len;
     int chapter = 0;
-    int error_count = 0;
 
     while ( 1 )
     {
@@ -983,21 +982,8 @@ static int hb_dvdnav_read( hb_dvd_t * e, hb_buffer_t * b )
         if ( result == DVDNAV_STATUS_ERR )
         {
             hb_log("dvdnav: Read Error, %s", dvdnav_err_to_string(d->dvdnav));
-            if (dvdnav_sector_search(d->dvdnav, 1, SEEK_CUR) != DVDNAV_STATUS_OK)
-            {
-                hb_error( "dvd: dvdnav_sector_search failed - %s", 
-                        dvdnav_err_to_string(d->dvdnav) );
-                return 0;
-            }
-            error_count++;
-            if (error_count > 10)
-            {
-                hb_log("dvdnav: Error, too many consecutive read errors");
-                return 0;
-            }
-            continue;
+                       return 0;
         }
-        error_count = 0;
         switch ( event )
         {
         case DVDNAV_BLOCK_OK: