x264 bump to r1101

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

diff --git a/libhb/sync.c b/libhb/sync.c
index 524ca4d..c391945 100644 (file)
--- a/libhb/sync.c
+++ b/libhb/sync.c
@@ -5,10 +5,9 @@
    It may be used under the terms of the GNU General Public License. */
 
 #include "hb.h"
+#include "hbffmpeg.h"
 #include <stdio.h>
-
 #include "samplerate.h"
-#include "libavcodec/avcodec.h"
 
 #ifdef INT64_MIN
 #undef INT64_MIN /* Because it isn't defined correctly in Zeta */
@@ -97,14 +96,21 @@ int syncInit( hb_work_object_t * w, hb_job_t * job )
     pv->pts_offset     = INT64_MIN;
 
     /* Calculate how many video frames we are expecting */
-    duration = 0;
-    for( i = job->chapter_start; i <= job->chapter_end; i++ )
+    if (job->pts_to_stop)
     {
-        chapter   = hb_list_item( title->list_chapter, i - 1 );
-        duration += chapter->duration;
+        duration = job->pts_to_stop + 90000;
     }
-    duration += 90000;
+    else
+    {
+        duration = 0;
+        for( i = job->chapter_start; i <= job->chapter_end; i++ )
+        {
+            chapter   = hb_list_item( title->list_chapter, i - 1 );
+            duration += chapter->duration;
+        }
+        duration += 90000;
         /* 1 second safety so we're sure we won't miss anything */
+    }
     pv->count_frames_max = duration * job->vrate / job->vrate_base / 90000;
 
     hb_log( "sync: expecting %d video frames", pv->count_frames_max );
@@ -188,14 +194,10 @@ int syncWork( hb_work_object_t * w, hb_buffer_t ** unused1,
     if ( pv->busy & 1 )
         SyncVideo( w );
 
-    /* If we ever got a video frame, handle audio now */
-    if( pv->pts_offset != INT64_MIN )
+    for( i = 0; i < hb_list_count( pv->job->title->list_audio ); i++ )
     {
-        for( i = 0; i < hb_list_count( pv->job->title->list_audio ); i++ )
-        {
-            if ( pv->busy & ( 1 << (i + 1) ) )
-                SyncAudio( w, i );
-        }
+        if ( pv->busy & ( 1 << (i + 1) ) )
+            SyncAudio( w, i );
     }
 
     return ( pv->busy? HB_WORK_OK : HB_WORK_DONE );
@@ -235,7 +237,7 @@ static void InitAudio( hb_work_object_t * w, int i )
         c->sample_rate = sync->audio->config.in.samplerate;
         c->channels    = HB_INPUT_CH_LAYOUT_GET_DISCRETE_COUNT( sync->audio->config.in.channel_layout );
 
-        if( avcodec_open( c, codec ) < 0 )
+        if( hb_avcodec_open( c, codec ) < 0 )
         {
             hb_log( "sync: avcodec_open failed" );
             return;
@@ -254,7 +256,7 @@ static void InitAudio( hb_work_object_t * w, int i )
         }
 
         free( zeros );
-        avcodec_close( c );
+        hb_avcodec_close( c );
         av_free( c );
     }
     else
@@ -329,6 +331,10 @@ static void SyncVideo( hb_work_object_t * w )
             }
         }
 
+        if( cur->new_chap ) {
+            hb_log("sync got new chapter %d", cur->new_chap );
+        }
+
         /*
          * since the first frame is always 0 and the upstream reader code
          * is taking care of adjusting for pts discontinuities, we just have
@@ -761,6 +767,19 @@ static void SyncAudio( hb_work_object_t * w, int i )
         }
         if ( buf->start - sync->next_pts >= (90 * 70) )
         {
+            if ( buf->start - sync->next_pts > (90000LL * 60) )
+            {
+                // there's a gap of more than a minute between the last
+                // frame and this. assume we got a corrupted timestamp
+                // and just drop the next buf.
+                hb_log( "sync: %d minute time gap in audio %d - dropping buf"
+                        "  start %lld, next %lld",
+                        (int)((buf->start - sync->next_pts) / (90000*60)),
+                        i, buf->start, sync->next_pts );
+                buf = hb_fifo_get( audio->priv.fifo_raw );
+                hb_buffer_close( &buf );
+                continue;
+            }
             /*
              * there's a gap of at least 70ms between the last
              * frame we processed & the next. Fill it with silence.