minor bug fix: AC3 passthru audio frames with no pts were getting a bogus start and stop time which caused bad things to happen later on in sync.c. Move up the code that generates a pts for non-passthru frames so that it applies to both.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1340 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 5 insertions, 4 deletions

diff --git a/libhb/deca52.c b/libhb/deca52.c
index 593a2bf98..e38ce9c82 100644
--- a/libhb/deca52.c
+++ b/libhb/deca52.c
@@ -213,6 +213,10 @@ 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 == -1)
+    {
+        pts = pv->next_expected_pts;
+    }
 
     /* AC3 passthrough: don't decode the AC3 frame */
     if( pv->job->acodec & HB_ACODEC_AC3 ||
@@ -222,6 +226,7 @@ static hb_buffer_t * Decode( hb_work_object_t * w )
         memcpy( buf->data, pv->frame, pv->size );
         buf->start = pts + ( pos / pv->size ) * 6 * 256 * 90000 / pv->rate;
         buf->stop  = buf->start + 6 * 256 * 90000 / pv->rate;
+        pv->next_expected_pts = buf->stop;
         pv->sync = 0;
         return buf;
     }
@@ -236,10 +241,6 @@ static hb_buffer_t * Decode( hb_work_object_t * w )
 
     /* 6 blocks per frame, 256 samples per block, channelsused channels */
     buf        = hb_buffer_init( 6 * 256 * pv->out_discrete_channels * sizeof( float ) );
-    if (pts == -1)
-    {
-      pts = pv->next_expected_pts;
-    }
     buf->start = pts + ( pos / pv->size ) * 6 * 256 * 90000 / pv->rate;
     buf->stop  = buf->start + 6 * 256 * 90000 / pv->rate;