Don't discard titles during scan just because of a read failure on one or more of...

[handbrake-jp/handbrake-jp-git.git] / libhb / scan.c

diff --git a/libhb/scan.c b/libhb/scan.c
index cda52e3..a23ae39 100644 (file)
--- a/libhb/scan.c
+++ b/libhb/scan.c
@@ -300,7 +300,7 @@ static int DecodePreviews( hb_scan_t * data, hb_title_t * title )
 
     if (data->dvd)
       hb_dvd_start( data->dvd, title->index, 1 );
-      
+    
     for( i = 0; i < 10; i++ )
     {
         int j, k;
@@ -334,14 +334,16 @@ static int DecodePreviews( hb_scan_t * data, hb_title_t * title )
             {
               if( !hb_dvd_read( data->dvd, buf_ps ) )
               {
-                  goto error;
+                  hb_log("Could not read preview %d, skipped", i);
+                  goto skip_preview;
               }
             }
             else if (data->stream)
             {
               if ( !hb_stream_read(data->stream,buf_ps) )
               {
-                goto error;
+                  hb_log("Could not read preview %d, skipped", i);
+                  goto skip_preview;
               }
             }
             hb_demux_ps( buf_ps, list_es );
@@ -386,7 +388,7 @@ static int DecodePreviews( hb_scan_t * data, hb_title_t * title )
         hb_libmpeg2_info( mpeg2, &title->width, &title->height,
                           &title->rate_base, &ar );
        
-        if (title->rate_base == 1126125)
+        if( title->rate_base == 1126125 )
         {
             /* Frame FPS is 23.976 (meaning it's progressive), so
                start keeping track of how many are reporting at
@@ -395,21 +397,33 @@ static int DecodePreviews( hb_scan_t * data, hb_title_t * title )
             */
             progressive_count++;
 
-            if (progressive_count < 6)
+            if( progressive_count < 6 )
+            {
                 /* Not enough frames are reporting as progressive,
                    which means we should be conservative and use
                    29.97 as the title's FPS for now.
                 */
                 title->rate_base = 900900;           
+            }
             else
             {
                 /* A majority of the scan frames are progressive. Make that
                     the title's FPS, and announce it once to the log.
                 */
-                if (progressive_count == 6)
+                if( progressive_count == 6 )
+                {
                     hb_log("Title's mostly progressive NTSC, setting fps to 23.976");
+                }
                 title->rate_base = 1126125;               
             }
+        } 
+        else if( title->rate_base == 900900 && progressive_count >= 6 )
+        {
+            /*
+             * We've already deduced that the frame rate is 23.976, so set it
+             * back again.
+             */
+            title->rate_base = 1126125;
         }
                
         if( i == 2) // Use the third frame's info, so as to skip opening logos
@@ -485,6 +499,7 @@ static int DecodePreviews( hb_scan_t * data, hb_title_t * title )
                 }
         }
 
+skip_preview:
         while( ( buf_raw = hb_list_item( list_raw, 0 ) ) )
         {
             hb_list_rem( list_raw, buf_raw );