X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Fdecdca.c;h=4fe06613503ac4d98357295bc4881b9e75c572ca;hb=033e32de9c380f54c7d1362a3979da205ebc3a29;hp=9d1bde71c3041f9b1cafcc025ccf9e524399ab7b;hpb=3cdb4eb95a2402eabb6622d02d969a2dc858de0c;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/libhb/decdca.c b/libhb/decdca.c
index 9d1bde71..4fe06613 100644
--- a/libhb/decdca.c
+++ b/libhb/decdca.c
@@ -153,8 +153,10 @@ 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;
+    uint64_t      upts, upos;
     int           num_blocks;
 
     /* Get a frame header if don't have one yet */
@@ -197,7 +199,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 );
+    hb_list_getbytes( pv->list, pv->frame, pv->size, &upts, &upos );
+    pts = (int64_t)upts;
+    pos = (int64_t)upos;
+
     if ( pts != pv->last_buf_pts )
     {
         pv->last_buf_pts = pts;
@@ -210,16 +215,6 @@ static hb_buffer_t * Decode( hb_work_object_t * w )
         pts = -1;
     }
 
-    /* Feed libdca */
-    dca_frame( pv->state, pv->frame, &pv->flags_out, &pv->level, 0 );
-
-    /* find out how many blocks are in this frame */
-    num_blocks = dca_blocks_num( pv->state );
-
-    /* num_blocks blocks per frame, 256 samples per block, channelsused channels */
-    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
@@ -230,6 +225,31 @@ static hb_buffer_t * Decode( hb_work_object_t * w )
     {
         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 );
+
+    /* find out how many blocks are in this frame */
+    num_blocks = dca_blocks_num( pv->state );
+
+    /* num_blocks blocks per frame, 256 samples per block, channelsused channels */
+    int nsamp = num_blocks * 256;
+    buf = hb_buffer_init( nsamp * pv->out_discrete_channels * sizeof( float ) );
+
     buf->start = pts;
     pv->next_pts = pts + (double)nsamp / (double)pv->rate * 90000.;
     buf->stop  = pv->next_pts;