diff options
Diffstat (limited to 'libhb/decdca.c')
| -rw-r--r-- | libhb/decdca.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/libhb/decdca.c b/libhb/decdca.c index 4fe066135..89c2b1c17 100644 --- a/libhb/decdca.c +++ b/libhb/decdca.c @@ -33,7 +33,7 @@ struct hb_work_private_s hb_list_t * list; - int out_discrete_channels; + int out_discrete_channels; }; @@ -75,13 +75,15 @@ static int decdcaInit( hb_work_object_t * w, hb_job_t * job ) pv->list = hb_list_init(); pv->state = dca_init( 0 ); - /* Decide what format we want out of libdca - work.c has already done some of this deduction for us in do_job() */ + /* Decide what format we want out of libdca + work.c has already done some of this deduction for us in do_job() */ - pv->flags_out = HB_AMIXDOWN_GET_DCA_FORMAT(audio->config.out.mixdown); + pv->flags_out = HB_AMIXDOWN_GET_DCA_FORMAT(audio->config.out.mixdown); + if ( audio->config.out.codec == HB_ACODEC_LAME ) + pv->flags_out |= DCA_ADJUST_LEVEL; - /* 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; @@ -266,10 +268,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] * 16384; - } + for ( k = 0; k < pv->out_discrete_channels; k++ ) + { + samples_out[(pv->out_discrete_channels*j)+k] = samples_in[(256*k)+j] * 16384; + } } } |