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

Fix for build errors with -Wunreachable-code-loop-increment flag am: 750dd58c8d am: ce1b551e99

Browse source 
Change-Id: I0bfff50cf05734d3033f9ac9581807f44c05b6e4
This commit is contained in:
Rajat Kumar 2020-05-15 02:56:25 +00:00 • committed by Automerger Merge Worker
commit 514510a33c
2 changed files with 52 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

89
decoder/drc_src/impd_drc_eq.c
View file

@ -1037,63 +1037,60 @@ VOID impd_calc_filt_sect_delay(WORD32 section_count,
VOID impd_get_eq_set_delay(ia_eq_set_struct* eq_set, WORD32* cascade_delay) { VOID impd_get_eq_set_delay(ia_eq_set_struct* eq_set, WORD32* cascade_delay) {
FLOAT32 delay, sect_delay; FLOAT32 delay, sect_delay;
WORD32 k, g, c, b; WORD32 k, g, b;
delay = 0; delay = 0;
for (c = 0; c < eq_set->audio_num_chan; c++) { g = eq_set->eq_ch_group_of_channel[0];
g = eq_set->eq_ch_group_of_channel[c]; if (g >= 0) {
if (g >= 0) { switch (eq_set->domain) {
switch (eq_set->domain) { case EQ_FILTER_DOMAIN_TIME: {
case EQ_FILTER_DOMAIN_TIME: { ia_filt_cascade_td_struct* filt_cascade_td =
ia_filt_cascade_td_struct* filt_cascade_td = &eq_set->filt_cascade_td[g];
&eq_set->filt_cascade_td[g]; for (b = 0; b < filt_cascade_td->block_count; b++) {
for (b = 0; b < filt_cascade_td->block_count; b++) { ia_eq_filt_ele_struct* eq_filt_element =
ia_eq_filt_ele_struct* eq_filt_element = &filt_cascade_td->pstr_eq_filt_block[b].eq_filt_element[0];
&filt_cascade_td->pstr_eq_filt_block[b].eq_filt_element[0]; switch (eq_filt_element->format) {
switch (eq_filt_element->format) { case FILTER_ELEMENT_FORMAT_POLE_ZERO:
case FILTER_ELEMENT_FORMAT_POLE_ZERO: impd_calc_filt_sect_delay(
impd_calc_filt_sect_delay( eq_filt_element->pstr_pole_zero_filt.section_count,
eq_filt_element->pstr_pole_zero_filt.section_count, eq_filt_element->pstr_pole_zero_filt.filt_section,
eq_filt_element->pstr_pole_zero_filt.filt_section, &sect_delay);
&sect_delay);
delay += sect_delay;
if (eq_filt_element->pstr_pole_zero_filt.filt_coeffs_flag) {
delay += 0.5f * (eq_filt_element->pstr_pole_zero_filt
.fir_filter.coeff_count -
1);
}
break;
case FILTER_ELEMENT_FORMAT_FIR:
delay += 0.5f * (eq_filt_element->fir_filter.coeff_count - 1);
break;
default:
break;
}
for (k = 0; k < eq_filt_element->num_ph_align_filt; k++) {
ia_ph_alignment_filt_struct* ph_alignment_filt =
&eq_filt_element->ph_alignment_filt[k];
impd_calc_filt_sect_delay(ph_alignment_filt->section_count,
ph_alignment_filt->filt_section,
&sect_delay);
delay += sect_delay; delay += sect_delay;
} if (eq_filt_element->pstr_pole_zero_filt.filt_coeffs_flag) {
delay += 0.5f * (eq_filt_element->pstr_pole_zero_filt.fir_filter
.coeff_count -
1);
}
break;
case FILTER_ELEMENT_FORMAT_FIR:
delay += 0.5f * (eq_filt_element->fir_filter.coeff_count - 1);
break;
default:
break;
} }
for (b = 0; b < filt_cascade_td->num_ph_align_filt; b++) { for (k = 0; k < eq_filt_element->num_ph_align_filt; k++) {
ia_ph_alignment_filt_struct* ph_alignment_filt = ia_ph_alignment_filt_struct* ph_alignment_filt =
&filt_cascade_td->ph_alignment_filt[b]; &eq_filt_element->ph_alignment_filt[k];
impd_calc_filt_sect_delay(ph_alignment_filt->section_count, impd_calc_filt_sect_delay(ph_alignment_filt->section_count,
ph_alignment_filt->filt_section, ph_alignment_filt->filt_section,
&sect_delay); &sect_delay);
delay += sect_delay; delay += sect_delay;
} }
} break; }
case EQ_FILTER_DOMAIN_SUBBAND: for (b = 0; b < filt_cascade_td->num_ph_align_filt; b++) {
case EQ_FILTER_DOMAIN_NONE: ia_ph_alignment_filt_struct* ph_alignment_filt =
default: &filt_cascade_td->ph_alignment_filt[b];
break; impd_calc_filt_sect_delay(ph_alignment_filt->section_count,
} ph_alignment_filt->filt_section,
&sect_delay);
delay += sect_delay;
}
} break;
case EQ_FILTER_DOMAIN_SUBBAND:
case EQ_FILTER_DOMAIN_NONE:
default:
break;
} }
break;
} }
*cascade_delay = (WORD32)delay; *cascade_delay = (WORD32)delay;
return; return;

22
decoder/drc_src/impd_drc_loudness_control.c
View file

@ -304,20 +304,16 @@ WORD32 impd_signal_peak_level_info(
&pstr_drc_config->str_drc_instruction_str[n]; &pstr_drc_config->str_drc_instruction_str[n];
if (loudness_drc_set_id_requested == if (loudness_drc_set_id_requested ==
drc_instructions_drc_tmp->drc_set_id) { drc_instructions_drc_tmp->drc_set_id) {
for (k = 0; k < drc_instructions_drc_tmp->dwnmix_id_count; k++) { if (ID_FOR_BASE_LAYOUT == drc_instructions_drc_tmp->downmix_id[0]) {
if (ID_FOR_BASE_LAYOUT == if (drc_instructions_drc_tmp->limiter_peak_target_present) {
drc_instructions_drc_tmp->downmix_id[k]) { eq_set_id[peak_count] = -1;
if (drc_instructions_drc_tmp->limiter_peak_target_present) { signal_peak_level[peak_count] =
eq_set_id[peak_count] = -1; drc_instructions_drc_tmp->limiter_peak_target +
signal_peak_level[peak_count] = signal_peak_level_tmp;
drc_instructions_drc_tmp->limiter_peak_target + explicit_peak_information_present[peak_count] = 0;
signal_peak_level_tmp; match_found_flag = 1;
explicit_peak_information_present[peak_count] = 0; peak_count++;
match_found_flag = 1;
peak_count++;
}
} }
break;
} }
} }
} }