wrapper/libxaac
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix to resolve CTS test case testDecodeUsacDrcEffectTypeM4a

Browse source 
Bug: 80133175
Test: CTS android.metia.cts.DecoderTestXheAac
Change-Id: Ic1962238eabe4ad98e4fa0ea85acc5494e762d30
This commit is contained in:
Ramesh Katuri 2018-05-29 18:34:57 +05:30 • committed by Ray Essick
parent 4908247643
commit 36ef96da45
1 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

27
decoder/drc_src/impd_drc_gain_dec.c
View file

@ -443,14 +443,14 @@ WORD32 impd_interpolate_drc_gain(ia_interp_params_struct* interp_params_str,
return (UNEXPECTED_ERROR); return (UNEXPECTED_ERROR);
} }
err = impd_conv_to_linear_domain (interp_params_str, drc_band, gain0, slope0, &gain_t1, &slope_t1);
if (err)
return (err);
err = impd_conv_to_linear_domain (interp_params_str, drc_band, gain1, slope1, &gain_t2, &slope_t2);
if (err)
return (err);
if (interp_params_str->gain_interpolation_type == GAIN_INTERPOLATION_TYPE_SPLINE) { if (interp_params_str->gain_interpolation_type == GAIN_INTERPOLATION_TYPE_SPLINE) {
err = impd_conv_to_linear_domain(interp_params_str, drc_band, gain0, slope0, &gain_t1, &slope_t1);
if (err)
return (err);
err = impd_conv_to_linear_domain (interp_params_str, drc_band, gain1, slope1, &gain_t2, &slope_t2);
if (err)
return (err);
slope_t1 = slope_t1/(FLOAT32) interp_params_str->delta_tmin; slope_t1 = slope_t1/(FLOAT32) interp_params_str->delta_tmin;
slope_t2 = slope_t2/(FLOAT32) interp_params_str->delta_tmin; slope_t2 = slope_t2/(FLOAT32) interp_params_str->delta_tmin;
if ((FLOAT32)fabs((FLOAT64)slope_t1) > (FLOAT32)fabs((FLOAT64)slope_t2)) { if ((FLOAT32)fabs((FLOAT64)slope_t1) > (FLOAT32)fabs((FLOAT64)slope_t2)) {
@ -530,11 +530,16 @@ WORD32 impd_interpolate_drc_gain(ia_interp_params_struct* interp_params_str,
} }
} }
} }
else { else{
a = (gain_t2 - gain_t1) / (FLOAT32)gain_step_tdomain;
b = gain_t1;
result[0] = gain_t1; err = impd_conv_to_linear_domain(interp_params_str, drc_band, gain1, slope1, &gain_t2, &slope_t2);
if (err)
return (err);
a = 0;
b = gain_t2;
result[0] = gain_t2;
result[gain_step_tdomain] = gain_t2; result[gain_step_tdomain] = gain_t2;
for (n=1; n<gain_step_tdomain; n++) { for (n=1; n<gain_step_tdomain; n++) {
FLOAT32 t = (FLOAT32) n; FLOAT32 t = (FLOAT32) n;