libhb: fix typo that causes 2 pass encodes to segfault at beginning of pass 2

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

diff --git a/libhb/decdca.c b/libhb/decdca.c
index b58a9ef..ec625c5 100644 (file)
--- a/libhb/decdca.c
+++ b/libhb/decdca.c
@@ -15,6 +15,7 @@ struct hb_work_private_s
     dca_state_t * state;
 
     double        next_pts;
+    int64_t       last_buf_pts;
     int           flags_in;
     int           flags_out;
     int           rate;
@@ -122,6 +123,13 @@ static int decdcaWork( hb_work_object_t * w, hb_buffer_t ** buf_in,
         return HB_WORK_DONE;
     }
 
+    if ( (*buf_in)->start < -1 && pv->next_pts == 0 )
+    {
+        // discard buffers that start before video time 0
+        *buf_out = NULL;
+        return HB_WORK_OK;
+    }
+
     hb_list_add( pv->list, *buf_in );
     *buf_in = NULL;
 
@@ -145,6 +153,7 @@ static hb_buffer_t * Decode( hb_work_object_t * w )
 {
     hb_work_private_t * pv = w->private_data;
     hb_buffer_t * buf;
+    hb_audio_t  * audio = w->audio;
     int           i, j, k;
     int64_t       pts, pos;
     int           num_blocks;
@@ -190,6 +199,42 @@ static hb_buffer_t * Decode( hb_work_object_t * w )
 
     /* Get the whole frame */
     hb_list_getbytes( pv->list, pv->frame, pv->size, &pts, &pos );
+    if ( pts != pv->last_buf_pts )
+    {
+        pv->last_buf_pts = pts;
+    }
+    else
+    {
+        // spec says that the PTS is the start time of the first frame
+        // that starts in the PES frame so we only use the PTS once then
+        // get the following frames' PTS from the frame length.
+        pts = -1;
+    }
+
+    // mkv files typically use a 1ms timebase which results in a lot of
+    // truncation error in their timestamps. Also, TSMuxer or something
+    // in the m2ts-to-mkv toolchain seems to take a very casual attitude
+    // about time - timestamps seem to randomly offset by ~40ms for a few
+    // seconds then recover. So, if the pts we got is within 50ms of the
+    // pts computed from the data stream, use the data stream pts.
+    if ( pts == -1 || ( pv->next_pts && fabs( pts - pv->next_pts ) < 50.*90. ) )
+    {
+        pts = pv->next_pts;
+    }
+
+    double frame_dur = (double)(pv->frame_length & ~0xFF) / (double)pv->rate * 90000.;
+
+    /* DCA passthrough: don't decode the DCA frame */
+    if( audio->config.out.codec == HB_ACODEC_DCA )
+    {
+        buf = hb_buffer_init( pv->size );
+        memcpy( buf->data, pv->frame, pv->size );
+        buf->start = pts;
+        pv->next_pts = pts + frame_dur;
+        buf->stop  = pv->next_pts;
+        pv->sync = 0;
+        return buf;
+    }
 
     /* Feed libdca */
     dca_frame( pv->state, pv->frame, &pv->flags_out, &pv->level, 0 );
@@ -201,18 +246,8 @@ static hb_buffer_t * Decode( hb_work_object_t * w )
     int nsamp = num_blocks * 256;
     buf = hb_buffer_init( nsamp * pv->out_discrete_channels * sizeof( float ) );
 
-    // mkv files typically use a 1ms timebase which results in a lot of
-    // truncation error in their timestamps. Also, TSMuxer or something
-    // in the m2ts-to-mkv toolchain seems to take a very casual attitude
-    // about time - timestamps seem to randomly offset by ~40ms for a few
-    // seconds then recover. So, if the pts we got is within 50ms of the
-    // pts computed from the data stream, use the data stream pts.
-    if ( pts < 0 || fabs( (double)pts - pv->next_pts ) < 50.*90. )
-    {
-        pts = pv->next_pts;
-    }
     buf->start = pts;
-    pv->next_pts += (double)nsamp / (double)pv->rate * 90000.;
+    pv->next_pts = pts + (double)nsamp / (double)pv->rate * 90000.;
     buf->stop  = pv->next_pts;
 
     for( i = 0; i < num_blocks; i++ )