X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Fdeca52.c;h=0958a9139beb00b871a7c30e36b5ae7e02f5de22;hb=814438ce8ec7b400d211ef9050278e283d2bba5f;hp=db3b56fe50e3996886ebde210aec43e28f5bba3f;hpb=baccaa45d0271cb764aba275dd507260c11004d3;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/libhb/deca52.c b/libhb/deca52.c index db3b56fe..0958a913 100644 --- a/libhb/deca52.c +++ b/libhb/deca52.c @@ -97,13 +97,13 @@ static int deca52Init( hb_work_object_t * w, hb_job_t * job ) pv->list = hb_list_init(); pv->state = a52_init( 0 ); - /* Decide what format we want out of a52dec - work.c has already done some of this deduction for us in do_job() */ + /* Decide what format we want out of a52dec + work.c has already done some of this deduction for us in do_job() */ - pv->flags_out = HB_AMIXDOWN_GET_A52_FORMAT(audio->config.out.mixdown); + pv->flags_out = HB_AMIXDOWN_GET_A52_FORMAT(audio->config.out.mixdown); - /* pass the number of channels used into the private work data */ - /* will only be actually used if we're not doing AC3 passthru */ + /* pass the number of channels used into the private work data */ + /* will only be actually used if we're not doing AC3 passthru */ pv->out_discrete_channels = HB_AMIXDOWN_GET_DISCRETE_CHANNEL_COUNT(audio->config.out.mixdown); pv->level = 32768.0; @@ -259,7 +259,7 @@ static hb_buffer_t * Decode( hb_work_object_t * w ) double frame_dur = (6. * 256. * 90000.) / pv->rate; /* AC3 passthrough: don't decode the AC3 frame */ - if( audio->config.out.codec == HB_ACODEC_AC3 ) + if( audio->config.out.codec == HB_ACODEC_AC3_PASS ) { buf = hb_buffer_init( size ); memcpy( buf->data, pv->frame, size ); @@ -304,10 +304,10 @@ static hb_buffer_t * Decode( hb_work_object_t * w ) /* Interleave */ for( j = 0; j < 256; j++ ) { - for ( k = 0; k < pv->out_discrete_channels; k++ ) - { - samples_out[(pv->out_discrete_channels*j)+k] = samples_in[(256*k)+j]; - } + for ( k = 0; k < pv->out_discrete_channels; k++ ) + { + samples_out[(pv->out_discrete_channels*j)+k] = samples_in[(256*k)+j]; + } } }