diff options
author | Rajat Kumar <rajat.kumar@ittiam.com> | 2019-04-09 14:55:52 +0530 |
---|---|---|
committer | Ray Essick <essick@google.com> | 2019-05-15 15:18:34 -0700 |
commit | 7bee3616b8c907cb476425e4cb7c26201ffad9a4 (patch) | |
tree | f2647fd5f5dcce8c677fd6f71a69c28592904c22 | |
parent | 89de8ea934f1d623a1b51881ad867e85e4ea0d95 (diff) | |
download | libxaac-7bee3616b8c907cb476425e4cb7c26201ffad9a4.tar.gz |
Fix to remove unused codes from MPEG-D DRC.
MPEG-D DRC integrated with USAC does work only in
time domain.
Hence removed the above related code in this patch.
Bug:130262151
Test: atest android.media.cts.DecoderTestXheAac
Test: atest android.media.cts.DecoderTestAacDrc
Change-Id: Ib51ef29fb7a1fe7a09718d48e2c9e7cda268ae7b
22 files changed, 53 insertions, 3215 deletions
@@ -111,15 +111,10 @@ cc_library_static { "decoder/drc_src/impd_drc_filter_bank.c", "decoder/drc_src/impd_drc_gain_dec.c", "decoder/drc_src/impd_drc_gain_decoder.c", - "decoder/drc_src/impd_drc_host_params.c", "decoder/drc_src/impd_drc_init.c", "decoder/drc_src/impd_drc_interface_decoder.c", - "decoder/drc_src/impd_drc_interface_parser.c", "decoder/drc_src/impd_drc_loudness_control.c", - "decoder/drc_src/impd_drc_main_qmf_process.c", - "decoder/drc_src/impd_drc_main_stft_process.c", "decoder/drc_src/impd_drc_main_td_process.c", - "decoder/drc_src/impd_drc_main_td_qmf_process.c", "decoder/drc_src/impd_drc_multiband.c", "decoder/drc_src/impd_drc_parametric_dec.c", "decoder/drc_src/impd_drc_peak_limiter.c", diff --git a/decoder/drc_src/impd_drc_api.c b/decoder/drc_src/impd_drc_api.c index 4fea3de..a0f7727 100644 --- a/decoder/drc_src/impd_drc_api.c +++ b/decoder/drc_src/impd_drc_api.c @@ -56,8 +56,6 @@ IA_ERRORCODE impd_drc_mem_api(ia_drc_api_struct *p_obj_drc, WORD32 i_cmd, IA_ERRORCODE impd_drc_fill_mem_tables(ia_drc_api_struct *p_obj_drc); -VOID impd_drc_set_default_config_params(ia_drc_config_struct *ptr_config); - IA_ERRORCODE impd_drc_process_frame(ia_drc_api_struct *p_obj_drc); IA_ERRORCODE impd_drc_init(ia_drc_api_struct *p_obj_drc); IA_ERRORCODE impd_drc_set_default_config(ia_drc_api_struct *p_obj_drc); @@ -268,60 +266,6 @@ IA_ERRORCODE ia_drc_dec_api(pVOID p_ia_drc_dec_obj, WORD32 i_cmd, WORD32 i_idx, } case IA_API_CMD_SET_CONFIG_PARAM: { switch (i_idx) { - case IA_DRC_DEC_CONFIG_PARAM_DEC_TYPE: { - if (*pus_value == 1) { - p_obj_drc->str_config.dec_type = DEC_TYPE_TD_QMF64; - p_obj_drc->str_config.sub_band_domain_mode = - SUBBAND_DOMAIN_MODE_QMF64; - p_obj_drc->str_config.sub_band_down_sampling_factor = - AUDIO_CODEC_SUBBAND_DOWNSAMPLING_FACTOR_QMF64; - p_obj_drc->str_config.sub_band_count = - AUDIO_CODEC_SUBBAND_COUNT_QMF64; - } else if (*pus_value == 2) { - p_obj_drc->str_config.dec_type = DEC_TYPE_QMF64; - p_obj_drc->str_config.sub_band_domain_mode = - SUBBAND_DOMAIN_MODE_QMF64; - p_obj_drc->str_config.sub_band_down_sampling_factor = - AUDIO_CODEC_SUBBAND_DOWNSAMPLING_FACTOR_QMF64; - p_obj_drc->str_config.sub_band_count = - AUDIO_CODEC_SUBBAND_COUNT_QMF64; - } else if (*pus_value == 3) { - p_obj_drc->str_config.dec_type = DEC_TYPE_STFT256; - p_obj_drc->str_config.sub_band_domain_mode = - SUBBAND_DOMAIN_MODE_STFT256; - p_obj_drc->str_config.sub_band_down_sampling_factor = - AUDIO_CODEC_SUBBAND_DOWNSAMPLING_FACTOR_STFT256; - p_obj_drc->str_config.sub_band_count = - AUDIO_CODEC_SUBBAND_COUNT_STFT256; - } else { - p_obj_drc->str_config.dec_type = DEC_TYPE_TD; - p_obj_drc->str_config.sub_band_domain_mode = - SUBBAND_DOMAIN_MODE_OFF; - } - - if (*pus_value < 0 || *pus_value > 3) { - return IA_DRC_DEC_CONFIG_NON_FATAL_INVALID_DECODE_TYPE; - } - break; - } - case IA_DRC_DEC_CONFIG_PARAM_CTRL_PARAM: { - if (*pus_value < 1 || *pus_value > 39) { - return IA_DRC_DEC_CONFIG_NON_FATAL_INVALID_CTRL_PARAM_IDX; - } - p_obj_drc->str_config.control_parameter_index = *pus_value; - break; - } - case IA_DRC_DEC_CONFIG_PARAM_PEAK_LIMITER: { - if (*pus_value < 0 || *pus_value > 1) { - return IA_DRC_DEC_CONFIG_NON_FATAL_INVALID_PEAK_LIM_FLAG; - } - p_obj_drc->str_config.peak_limiter = *pus_value; - break; - } - - case IA_DRC_DEC_CONFIG_PARAM_VER_MODE: { - break; - } case IA_DRC_DEC_CONFIG_PARAM_SAMP_FREQ: { if (*pus_value < 8000 || *pus_value > 96000) { return IA_DRC_DEC_CONFIG_NON_FATAL_INVALID_SAMP_FREQ; @@ -348,54 +292,9 @@ IA_ERRORCODE ia_drc_dec_api(pVOID p_ia_drc_dec_obj, WORD32 i_cmd, WORD32 i_idx, } case IA_DRC_DEC_CONFIG_PARAM_BITS_FORMAT: { - if ((*pus_value != 1) && (*pus_value != 0)) { - return -1; - } - p_obj_drc->str_config.bitstream_file_format = *pus_value; - break; } case IA_DRC_DEC_CONFIG_PARAM_INT_PRESENT: { - if ((*pus_value != 1) && (*pus_value != 0)) { - return -1; - } - p_obj_drc->str_config.interface_bitstream_present = *pus_value; - - break; - } - case IA_DRC_DEC_CONFIG_PARAM_DELAY_MODE: { - if ((*pus_value != 1) && (*pus_value != 0)) { - return IA_DRC_DEC_CONFIG_NON_FATAL_INVALID_DELAY_MODE; - } - p_obj_drc->str_config.delay_mode = *pus_value; - - break; - } - case IA_DRC_DEC_CONFIG_PARAM_GAIN_DELAY: { - if ((*pus_value > MAX_SIGNAL_DELAY) || (*pus_value < 0)) { - return IA_DRC_DEC_CONFIG_NON_FATAL_INVALID_GAIN_DELAY; - } - - p_obj_drc->str_config.gain_delay_samples = *pus_value; - - break; - } - - /*Sujith: introduce error*/ - case IA_DRC_DEC_CONFIG_PARAM_AUDIO_DELAY: { - break; - } - case IA_DRC_DEC_CONFIG_PARAM_CON_DELAY_MODE: { - if (*pus_value < 0 || *pus_value > 1) { - return IA_DRC_DEC_CONFIG_PARAM_CON_DELAY_MODE; - } - p_obj_drc->str_config.constant_delay_on = *pus_value; - - break; - } - case IA_DRC_DEC_CONFIG_PARAM_ABSO_DELAY_OFF: { - p_obj_drc->str_config.absorb_delay_on = *pus_value; - break; } case IA_DRC_DEC_CONFIG_PARAM_FRAME_SIZE: { @@ -408,7 +307,6 @@ IA_ERRORCODE ia_drc_dec_api(pVOID p_ia_drc_dec_obj, WORD32 i_cmd, WORD32 i_idx, break; } case IA_DRC_DEC_CONFIG_GAIN_STREAM_FLAG: { - p_obj_drc->str_bit_handler.gain_stream_flag = *pus_value; break; } @@ -460,11 +358,11 @@ IA_ERRORCODE ia_drc_dec_api(pVOID p_ia_drc_dec_obj, WORD32 i_cmd, WORD32 i_idx, } else if (p_obj_drc->str_config.dec_type == DEC_TYPE_TD) { error_code = impd_process_time_domain(p_obj_drc); } else if (p_obj_drc->str_config.dec_type == DEC_TYPE_QMF64) { - error_code = impd_init_process_audio_main_qmf(p_obj_drc); + error_code = IA_FATAL_ERROR; } else if (p_obj_drc->str_config.dec_type == DEC_TYPE_STFT256) { - error_code = impd_init_process_audio_main_stft(p_obj_drc); + error_code = IA_FATAL_ERROR; } else if (p_obj_drc->str_config.dec_type == DEC_TYPE_TD_QMF64) { - error_code = impd_init_process_audio_main_td_qmf(p_obj_drc); + error_code = IA_FATAL_ERROR; } break; } @@ -499,22 +397,6 @@ IA_ERRORCODE ia_drc_dec_api(pVOID p_ia_drc_dec_obj, WORD32 i_cmd, WORD32 i_idx, p_obj_drc->p_state->ui_exe_done = 1; break; } - case IA_API_CMD_INPUT_OVER_BS: { - p_obj_drc->str_bit_handler.cpy_over = 1; - break; - } - case IA_API_CMD_INPUT_OVER_IC_BS: { - p_obj_drc->str_bit_handler.cpy_over_ic = 1; - break; - } - case IA_API_CMD_INPUT_OVER_IL_BS: { - p_obj_drc->str_bit_handler.cpy_over_il = 1; - break; - } - case IA_API_CMD_INPUT_OVER_IN_BS: { - p_obj_drc->str_bit_handler.cpy_over_in = 1; - break; - } case IA_API_CMD_SET_INPUT_BYTES_BS: { p_obj_drc->str_bit_handler.num_byts_cur = *pus_value; break; diff --git a/decoder/drc_src/impd_drc_bitbuffer.c b/decoder/drc_src/impd_drc_bitbuffer.c index 3750f11..02950b4 100644 --- a/decoder/drc_src/impd_drc_bitbuffer.c +++ b/decoder/drc_src/impd_drc_bitbuffer.c @@ -165,51 +165,6 @@ WORD32 impd_init_drc_bitstream_dec(ia_drc_bits_dec_struct* p_drc_bs_dec_struct, return err_code; } -WORD32 impd_process_drc_bitstream_dec( - ia_drc_bits_dec_struct* p_drc_bs_dec_struct, ia_bit_buf_struct* it_bit_buff, - ia_drc_config* pstr_drc_config, - ia_drc_loudness_info_set_struct* pstr_loudness_info, - UWORD8* bitstream_config, WORD32 num_bytes, WORD32 num_bits_offset, - WORD32* num_bits_read) { - WORD32 err_code = 0; - - WORD32 loudness_info_set_present, drc_config_present, dummy; - - if (bitstream_config == NULL) { - *num_bits_read = 0; - } else { - it_bit_buff = - impd_create_init_bit_buf(it_bit_buff, bitstream_config, num_bytes); - - dummy = impd_read_bits_buf(it_bit_buff, num_bits_offset); - if (it_bit_buff->error) return it_bit_buff->error; - - loudness_info_set_present = impd_read_bits_buf(it_bit_buff, 1); - if (it_bit_buff->error) return it_bit_buff->error; - - if (loudness_info_set_present) { - drc_config_present = impd_read_bits_buf(it_bit_buff, 1); - if (it_bit_buff->error) return it_bit_buff->error; - - if (drc_config_present) { - err_code = impd_parse_drc_config( - it_bit_buff, &p_drc_bs_dec_struct->ia_drc_params_struct, - pstr_drc_config); - - if (err_code) return (err_code); - } - - err_code = impd_parse_loudness_info_set(it_bit_buff, pstr_loudness_info); - - if (err_code) return (err_code); - } - - *num_bits_read = it_bit_buff->size - it_bit_buff->cnt_bits; - } - - return err_code; -} - WORD32 impd_process_drc_bitstream_dec_config( ia_drc_bits_dec_struct* p_drc_bs_dec_struct, ia_bit_buf_struct* it_bit_buff, ia_drc_config* pstr_drc_config, UWORD8* bitstream_config, diff --git a/decoder/drc_src/impd_drc_bitstream_dec_api.h b/decoder/drc_src/impd_drc_bitstream_dec_api.h index 25773d5..eb1e5ba 100644 --- a/decoder/drc_src/impd_drc_bitstream_dec_api.h +++ b/decoder/drc_src/impd_drc_bitstream_dec_api.h @@ -25,13 +25,6 @@ WORD32 impd_init_drc_bitstream_dec( WORD32 frame_size, WORD32 delay_mode, WORD32 lfe_channel_map_count, WORD32* lfe_channel_map); -WORD32 impd_process_drc_bitstream_dec( - ia_drc_bits_dec_struct* p_uni_drc_bs_dec_struct, - ia_bit_buf_struct* it_bit_buff, ia_drc_config* pstr_drc_config, - ia_drc_loudness_info_set_struct* pstr_loudness_info, - UWORD8* bitstream_config, WORD32 num_bytes, WORD32 num_bits_offset, - WORD32* num_bits_read); - WORD32 impd_process_drc_bitstream_dec_config( ia_drc_bits_dec_struct* p_uni_drc_bs_dec_struct, ia_bit_buf_struct* it_bit_buff, ia_drc_config* pstr_drc_config, diff --git a/decoder/drc_src/impd_drc_eq.c b/decoder/drc_src/impd_drc_eq.c index 3ebb366..373f864 100644 --- a/decoder/drc_src/impd_drc_eq.c +++ b/decoder/drc_src/impd_drc_eq.c @@ -1257,26 +1257,6 @@ VOID impd_pole_zero_filt_process(ia_pole_zero_filt_struct* pstr_pole_zero_filt, return; } -VOID impd_subband_filter_process(ia_subband_filt_struct* pstr_subband_filt, - FLOAT32* ptr_audio_real_buff, - FLOAT32* ptr_audio_imag_buff) { - WORD32 i, j; - WORD32 eq_frame_size_subband = pstr_subband_filt->eq_frame_size_subband; - WORD32 coeff_count = pstr_subband_filt->coeff_count; - - FLOAT32* ptr_subband_coeff = pstr_subband_filt->subband_coeff; - - for (i = 0; i < eq_frame_size_subband; i++) { - for (j = 0; j < coeff_count; j++) { - ptr_audio_real_buff[j] *= ptr_subband_coeff[j]; - ptr_audio_imag_buff[j] *= ptr_subband_coeff[j]; - } - ptr_audio_real_buff += coeff_count; - ptr_audio_imag_buff += coeff_count; - } - return; -} - VOID impd_phase_align_filt_process( ia_ph_alignment_filt_struct* ph_alignment_filt, WORD32 channel, FLOAT32* ptr_audio_out) { @@ -1368,23 +1348,3 @@ WORD32 impd_process_eq_set_time_domain(ia_eq_set_struct* pstr_eq_set, return 0; } -WORD32 impd_process_eq_set_subband_domain(ia_eq_set_struct* pstr_eq_set, - WORD32 channel, - FLOAT32* ptr_audio_real_buff, - FLOAT32* ptr_audio_imag_buff) { - WORD32 g; - - if (pstr_eq_set != NULL) { - g = pstr_eq_set->eq_ch_group_of_channel[channel]; - if (g >= 0) { - if (pstr_eq_set->domain == 0) { - return (-1); - } else { - impd_subband_filter_process(&pstr_eq_set->subband_filt[g], - &ptr_audio_real_buff[0], - &ptr_audio_imag_buff[0]); - } - } - } - return (0); -} diff --git a/decoder/drc_src/impd_drc_eq.h b/decoder/drc_src/impd_drc_eq.h index d45e7ed..70c8050 100644 --- a/decoder/drc_src/impd_drc_eq.h +++ b/decoder/drc_src/impd_drc_eq.h @@ -178,11 +178,6 @@ impd_process_eq_set_td(ia_eq_set_struct* eq_set, WORD32 channel, WORD32 impd_process_eq_set_time_domain(ia_eq_set_struct* eq_set, WORD32 channel, FLOAT32* audio_in, FLOAT32* audio_out, WORD32 frame_size); -WORD32 -impd_process_eq_set_subband_domain(ia_eq_set_struct* eq_set, WORD32 channel, - FLOAT32* subbandSampleIn, - FLOAT32* subbandSampleOut); - #ifdef __cplusplus } #endif diff --git a/decoder/drc_src/impd_drc_fiilter_bank.c b/decoder/drc_src/impd_drc_fiilter_bank.c deleted file mode 100644 index f6637b6..0000000 --- a/decoder/drc_src/impd_drc_fiilter_bank.c +++ /dev/null @@ -1,431 +0,0 @@ -/****************************************************************************** - * - * Copyright (C) 2015 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - ***************************************************************************** - * Originally developed and contributed by Ittiam Systems Pvt. Ltd, Bangalore -*/ -#include <stdio.h> -#include <stdlib.h> -#include <math.h> - -#include "impd_type_def.h" -#include "impd_drc_uni_tables.h" -#include "impd_drc_uni_common.h" -#include "impd_drc_struct.h" -#include "impd_drc_filter_bank.h" -#include "impd_drc_rom.h" - -VOID impd_compute_filt_coeff(WORD32 crossover_freq_idx, - ia_iir_filter_struct* pstr_lp_filt_coeff, - ia_iir_filter_struct* pstr_hp_filt_coeff, - ia_iir_filter_struct* pstr_ap_filt_coeff, - WORD32 filter_type) { - FLOAT32 gamma = normal_cross_freq[crossover_freq_idx].gamma; - FLOAT32 delta = normal_cross_freq[crossover_freq_idx].delta; - - if (filter_type == 0 || filter_type == 2) { - pstr_lp_filt_coeff->a0 = 1.0f; - pstr_lp_filt_coeff->a1 = 2.0f * (gamma - delta); - pstr_lp_filt_coeff->a2 = 2.0f * (gamma + delta) - 1.0f; - pstr_lp_filt_coeff->b0 = gamma; - pstr_lp_filt_coeff->b1 = 2.0f * gamma; - pstr_lp_filt_coeff->b2 = gamma; - - pstr_hp_filt_coeff->a0 = 1.0f; - pstr_hp_filt_coeff->a1 = pstr_lp_filt_coeff->a1; - pstr_hp_filt_coeff->a2 = pstr_lp_filt_coeff->a2; - pstr_hp_filt_coeff->b0 = delta; - pstr_hp_filt_coeff->b1 = -2.0f * delta; - pstr_hp_filt_coeff->b2 = delta; - } - - if (filter_type == 1 || filter_type == 2) { - pstr_ap_filt_coeff->a0 = 1.0f; - pstr_ap_filt_coeff->a1 = 2.0f * (gamma - delta); - ; - pstr_ap_filt_coeff->a2 = 2.0f * (gamma + delta) - 1.0f; - ; - pstr_ap_filt_coeff->b0 = pstr_ap_filt_coeff->a2; - pstr_ap_filt_coeff->b1 = pstr_ap_filt_coeff->a1; - pstr_ap_filt_coeff->b2 = pstr_ap_filt_coeff->a0; - } - - return; -} - -WORD32 impd_initialize_filt_bank(WORD32 num_sub_bands, - ia_gain_params_struct* gain_params, - ia_drc_filter_bank_struct* drc_filter_bank) { - ia_two_band_filt_struct* str_two_band_bank; - ia_three_band_filt_struct* str_three_band_bank; - ia_four_band_filt_struct* str_four_band_bank; - drc_filter_bank->complexity = 0; - drc_filter_bank->num_bands = num_sub_bands; - - if (num_sub_bands == 1) { - return 0; - } else if (num_sub_bands == 2) { - str_two_band_bank = &drc_filter_bank->str_two_band_bank; - impd_compute_filt_coeff(gain_params[1].crossover_freq_idx, - &(str_two_band_bank->low_pass), - &(str_two_band_bank->high_pass), NULL, 0); - } else if (num_sub_bands == 3) { - str_three_band_bank = &drc_filter_bank->str_three_band_bank; - - impd_compute_filt_coeff(gain_params[1].crossover_freq_idx, - &(str_three_band_bank->str_low_pass_stage_2), - &(str_three_band_bank->str_high_pass_stage_2), - &(str_three_band_bank->str_all_pass_stage_2), 2); - impd_compute_filt_coeff(gain_params[2].crossover_freq_idx, - &(str_three_band_bank->str_low_pass_stage_1), - &(str_three_band_bank->str_high_pass_stage_1), NULL, - 0); - } - - else if (num_sub_bands == 4) { - str_four_band_bank = &drc_filter_bank->str_four_band_bank; - - impd_compute_filt_coeff(gain_params[1].crossover_freq_idx, - &(str_four_band_bank->str_low_pass_stage_3_low), - &(str_four_band_bank->str_high_pass_stage_3_low), - &(str_four_band_bank->str_all_pass_stage_2_high), - 2); - impd_compute_filt_coeff(gain_params[2].crossover_freq_idx, - &(str_four_band_bank->str_low_pass_stage_1), - &(str_four_band_bank->str_high_pass_stage_1), NULL, - 0); - impd_compute_filt_coeff(gain_params[3].crossover_freq_idx, - &(str_four_band_bank->str_low_pass_stage_3_high), - &(str_four_band_bank->str_high_pass_stage_3_high), - &(str_four_band_bank->str_all_pass_stage_2_low), 2); - } else { - return -1; - } - - return 0; -} - -WORD32 impd_init_all_filter_banks( - ia_uni_drc_coeffs_struct* str_p_loc_drc_coefficients_uni_drc, - ia_drc_instructions_struct* str_drc_instruction_str, - ia_filter_banks_struct* ia_filter_banks_struct) { - WORD32 err_code = 0; - WORD32 b, g, i, k, m, s, crossover_freq_idx, num_ch_in_groups, - num_ph_align_ch_groups; - WORD32 match_found = 0, num_filter; - WORD32 cascade_cross_idx[CHANNEL_GROUP_COUNT_MAX + 1] - [CHANNEL_GROUP_COUNT_MAX * 3]; - WORD32 count[CHANNEL_GROUP_COUNT_MAX + 1]; - - num_ch_in_groups = 0; - num_ph_align_ch_groups = str_drc_instruction_str->num_drc_ch_groups; - - for (g = 0; g < str_drc_instruction_str->num_drc_ch_groups; g++) { - num_ch_in_groups += str_drc_instruction_str->num_chan_per_ch_group[g]; - } - - if (num_ch_in_groups < str_drc_instruction_str->audio_num_chan) { - num_ph_align_ch_groups++; - } - - ia_filter_banks_struct->nfilter_banks = - str_drc_instruction_str->num_drc_ch_groups; - ia_filter_banks_struct->num_ph_align_ch_groups = num_ph_align_ch_groups; - - if (str_p_loc_drc_coefficients_uni_drc == NULL) { - ia_filter_banks_struct->str_drc_filter_bank->num_bands = 1; - } else { - for (g = 0; g < str_drc_instruction_str->num_drc_ch_groups; g++) { - err_code = impd_initialize_filt_bank( - str_p_loc_drc_coefficients_uni_drc - ->gain_set_params[str_drc_instruction_str - ->gain_set_index_for_channel_group[g]] - .band_count, - str_p_loc_drc_coefficients_uni_drc - ->gain_set_params[str_drc_instruction_str - ->gain_set_index_for_channel_group[g]] - .gain_params, - &(ia_filter_banks_struct->str_drc_filter_bank[g])); - if (err_code != 0) return (err_code); - } - } - - for (g = 0; g < CHANNEL_GROUP_COUNT_MAX + 1; g++) { - count[g] = 0; - } - for (g = 0; g < str_drc_instruction_str->num_drc_ch_groups; g++) { - for (b = 1; - b < str_p_loc_drc_coefficients_uni_drc - ->gain_set_params[str_drc_instruction_str - ->gain_set_index_for_channel_group[g]] - .band_count; - b++) { - crossover_freq_idx = - str_p_loc_drc_coefficients_uni_drc - ->gain_set_params[str_drc_instruction_str - ->gain_set_index_for_channel_group[g]] - .gain_params[b] - .crossover_freq_idx; - for (k = 0; k < num_ph_align_ch_groups; k++) { - if (k != g) { - cascade_cross_idx[k][count[k]] = crossover_freq_idx; - count[k]++; - if (count[k] > CHANNEL_GROUP_COUNT_MAX * 3) { - return -1; - } - } - } - } - } - - i = 0; - while (i < count[0]) { - crossover_freq_idx = cascade_cross_idx[0][i]; - match_found = 0; - for (g = 1; g < num_ph_align_ch_groups; g++) { - match_found = 0; - for (k = 0; k < count[g]; k++) { - if (cascade_cross_idx[g][k] == crossover_freq_idx) { - match_found = 1; - break; - } - } - if (match_found == 0) break; - } - if (match_found == 1) { - for (g = 0; g < num_ph_align_ch_groups; g++) { - for (m = 0; m < count[g]; m++) { - if (cascade_cross_idx[g][m] == crossover_freq_idx) { - for (s = m + 1; s < count[g]; s++) { - cascade_cross_idx[g][s - 1] = cascade_cross_idx[g][s]; - } - count[g]--; - break; - } - } - } - i = 0; - } else { - i++; - } - } - - for (g = 0; g < num_ph_align_ch_groups; g++) { - num_filter = count[g]; - if (num_filter > 0) { - for (i = 0; i < num_filter; i++) { - impd_compute_filt_coeff( - cascade_cross_idx[g][i], NULL, NULL, - &(ia_filter_banks_struct->str_drc_filter_bank[g] - .str_all_pass_cascade.str_all_pass_cascade_filter[i] - .str_all_pass_stage), - 1); - } - ia_filter_banks_struct->str_drc_filter_bank[g] - .str_all_pass_cascade.num_filter = num_filter; - } - - if (err_code != 0) return (err_code); - } - - return 0; -} - -VOID impd_iir_second_order_filter_all_pass(ia_iir_filter_struct* filter, - WORD32 chan_idx, WORD32 frame_len, - FLOAT32* input, FLOAT32* output) { - WORD32 i; - FLOAT32 tmp; - FLOAT32 a1 = filter->a1; - FLOAT32 a2 = filter->a2; - FLOAT32 b0 = filter->b0; - FLOAT32 b1 = filter->b1; - FLOAT32 b2 = filter->b2; - - FLOAT32 st1 = filter->x_p[chan_idx * 2]; - FLOAT32 st2 = filter->y_p[chan_idx * 2]; - - for (i = 0; i < frame_len; i++) { - tmp = input[i]; - output[i] = b0 * tmp + st1; - st1 = b1 * tmp - a1 * output[i] + st2; - st2 = b2 * tmp - a2 * output[i]; - } - filter->x_p[chan_idx * 2] = st1; - filter->y_p[chan_idx * 2] = st2; - - return; -} - -VOID impd_apply_low_high_filter(ia_iir_filter_struct* pstr_lp_filt_coeff, - ia_iir_filter_struct* pstr_hp_filt_coeff, - WORD32 chan_idx, WORD32 frame_len, - FLOAT32* input, FLOAT32* output[]) { - WORD32 i; - FLOAT32 tmp, tmp1; - FLOAT32 a1_l = pstr_lp_filt_coeff->a1; - FLOAT32 a2_l = pstr_lp_filt_coeff->a2; - FLOAT32 b0_l = pstr_lp_filt_coeff->b0; - FLOAT32 b1_l = pstr_lp_filt_coeff->b1; - FLOAT32 b2_l = pstr_lp_filt_coeff->b2; - - FLOAT32 st1_l = pstr_lp_filt_coeff->x_p[chan_idx * 2 + 0]; - FLOAT32 st2_l = pstr_lp_filt_coeff->x_p[chan_idx * 2 + 1]; - FLOAT32 st3_l = pstr_lp_filt_coeff->y_p[chan_idx * 2 + 0]; - FLOAT32 st4_l = pstr_lp_filt_coeff->y_p[chan_idx * 2 + 1]; - - FLOAT32 a1_h = pstr_hp_filt_coeff->a1; - FLOAT32 a2_h = pstr_hp_filt_coeff->a2; - FLOAT32 b0_h = pstr_hp_filt_coeff->b0; - FLOAT32 b1_h = pstr_hp_filt_coeff->b1; - FLOAT32 b2_h = pstr_hp_filt_coeff->b2; - - FLOAT32 st1_h = pstr_hp_filt_coeff->x_p[chan_idx * 2 + 0]; - FLOAT32 st2_h = pstr_hp_filt_coeff->x_p[chan_idx * 2 + 1]; - FLOAT32 st3_h = pstr_hp_filt_coeff->y_p[chan_idx * 2 + 0]; - FLOAT32 st4_h = pstr_hp_filt_coeff->y_p[chan_idx * 2 + 1]; - - FLOAT32* output_low = output[0]; - FLOAT32* output_high = output[1]; - - for (i = 0; i < frame_len; i++) { - tmp1 = input[i]; - tmp = b0_l * tmp1 + st1_l; - st1_l = b1_l * tmp1 - a1_l * tmp + st2_l; - st2_l = b2_l * tmp1 - a2_l * tmp; - - output_low[i] = b0_l * tmp + st3_l; - st3_l = b1_l * tmp - a1_l * output_low[i] + st4_l; - st4_l = b2_l * tmp - a2_l * output_low[i]; - - tmp = b0_h * tmp1 + st1_h; - st1_h = b1_h * tmp1 - a1_h * tmp + st2_h; - st2_h = b2_h * tmp1 - a2_h * tmp; - - output_high[i] = b0_h * tmp + st3_h; - st3_h = b1_h * tmp - a1_h * output_high[i] + st4_h; - st4_h = b2_h * tmp - a2_h * output_high[i]; - } - pstr_lp_filt_coeff->x_p[chan_idx * 2 + 0] = st1_l; - pstr_lp_filt_coeff->x_p[chan_idx * 2 + 1] = st2_l; - pstr_lp_filt_coeff->y_p[chan_idx * 2 + 0] = st3_l; - pstr_lp_filt_coeff->y_p[chan_idx * 2 + 1] = st4_l; - - pstr_hp_filt_coeff->x_p[chan_idx * 2 + 0] = st1_h; - pstr_hp_filt_coeff->x_p[chan_idx * 2 + 1] = st2_h; - pstr_hp_filt_coeff->y_p[chan_idx * 2 + 0] = st3_h; - pstr_hp_filt_coeff->y_p[chan_idx * 2 + 1] = st4_h; - - return; -} -VOID impd_two_band_filter_process(ia_two_band_filt_struct* str_two_band_bank, - WORD32 chan_idx, WORD32 frame_len, - FLOAT32* input, FLOAT32* output[]) { - ia_iir_filter_struct* pstr_lp_filt_coeff = &str_two_band_bank->low_pass; - ia_iir_filter_struct* pstr_hp_filt_coeff = &str_two_band_bank->high_pass; - - impd_apply_low_high_filter(pstr_lp_filt_coeff, pstr_hp_filt_coeff, chan_idx, - frame_len, input, output); - return; -} - -VOID impd_three_band_filter_process( - ia_three_band_filt_struct* str_three_band_bank, WORD32 c, WORD32 size, - FLOAT32* input, FLOAT32* output[]) { - WORD32 err_code = 0; - ia_iir_filter_struct* all_pass_filter; - ia_iir_filter_struct* pstr_lp_filt_coeff = - &str_three_band_bank->str_low_pass_stage_1; - ia_iir_filter_struct* pstr_hp_filt_coeff = - &str_three_band_bank->str_high_pass_stage_1; - FLOAT32* output1[2]; - output1[0] = output[0]; - output1[1] = output[1]; - - impd_apply_low_high_filter(pstr_lp_filt_coeff, pstr_hp_filt_coeff, c, size, - input, output1); - - all_pass_filter = &str_three_band_bank->str_all_pass_stage_2; - - impd_iir_second_order_filter_all_pass(all_pass_filter, c, size, output1[1], - output[2]); - pstr_lp_filt_coeff = &str_three_band_bank->str_low_pass_stage_2; - pstr_hp_filt_coeff = &str_three_band_bank->str_high_pass_stage_2; - - impd_apply_low_high_filter(pstr_lp_filt_coeff, pstr_hp_filt_coeff, c, size, - output1[0], output1); - - return; -} - -VOID impd_four_band_filter_process(ia_four_band_filt_struct* str_four_band_bank, - WORD32 cha_idx, WORD32 win_size, - FLOAT32* input, FLOAT32* output[]) { - WORD32 err_code = 0; - ia_iir_filter_struct* all_pass_filter; - ia_iir_filter_struct* pstr_lp_filt_coeff = - &str_four_band_bank->str_low_pass_stage_1; - ia_iir_filter_struct* pstr_hp_filt_coeff = - &str_four_band_bank->str_high_pass_stage_1; - FLOAT32* output1[2]; - FLOAT32* output2[2]; - output1[0] = output[0]; - output1[1] = output[1]; - output2[0] = output[2]; - output2[1] = output[3]; - - impd_apply_low_high_filter(pstr_lp_filt_coeff, pstr_hp_filt_coeff, cha_idx, - win_size, input, output1); - - all_pass_filter = &str_four_band_bank->str_all_pass_stage_2_low; - - impd_iir_second_order_filter_all_pass(all_pass_filter, cha_idx, win_size, - output1[0], output1[0]); - - all_pass_filter = &str_four_band_bank->str_all_pass_stage_2_high; - - impd_iir_second_order_filter_all_pass(all_pass_filter, cha_idx, win_size, - output1[1], output2[0]); - - pstr_lp_filt_coeff = &str_four_band_bank->str_low_pass_stage_3_low; - pstr_hp_filt_coeff = &str_four_band_bank->str_high_pass_stage_3_low; - - impd_apply_low_high_filter(pstr_lp_filt_coeff, pstr_hp_filt_coeff, cha_idx, - win_size, output1[0], output1); - - pstr_lp_filt_coeff = &str_four_band_bank->str_low_pass_stage_3_high; - pstr_hp_filt_coeff = &str_four_band_bank->str_high_pass_stage_3_high; - - impd_apply_low_high_filter(pstr_lp_filt_coeff, pstr_hp_filt_coeff, cha_idx, - win_size, output2[0], output2); - - return; -} - -VOID impd_all_pass_cascade_process( - ia_all_pass_cascade_struct* str_all_pass_cascade, WORD32 ch_idx, - WORD32 win_size, FLOAT32* input) { - WORD32 i; - - for (i = 0; i < str_all_pass_cascade->num_filter; i++) { - impd_iir_second_order_filter_all_pass( - &(str_all_pass_cascade->str_all_pass_cascade_filter[i] - .str_all_pass_stage), - ch_idx, win_size, input, input); - } - - return; -}
\ No newline at end of file diff --git a/decoder/drc_src/impd_drc_gain_decoder.c b/decoder/drc_src/impd_drc_gain_decoder.c index 829f576..c9d29ea 100644 --- a/decoder/drc_src/impd_drc_gain_decoder.c +++ b/decoder/drc_src/impd_drc_gain_decoder.c @@ -380,76 +380,6 @@ IA_ERRORCODE impd_drc_process_time_domain( return err_code; } -IA_ERRORCODE impd_drc_process_freq_domain( - ia_drc_gain_dec_struct* p_drc_gain_dec_structs, - ia_drc_config* pstr_drc_config, ia_drc_gain_struct* pstr_drc_gain, - FLOAT32* audio_real_buff[], FLOAT32* audio_imag_buff[], - FLOAT32 loudness_normalization_gain_db, FLOAT32 boost, FLOAT32 compress, - WORD32 drc_characteristic_target) { - WORD32 sel_drc_index; - IA_ERRORCODE err_code = 0; - ia_drc_instructions_struct* str_drc_instruction_str = - pstr_drc_config->str_drc_instruction_str; - - if (p_drc_gain_dec_structs->eq_set) { - WORD32 ch; - - for (ch = 0; ch < p_drc_gain_dec_structs->eq_set->audio_num_chan; ch++) { - err_code = impd_process_eq_set_subband_domain( - p_drc_gain_dec_structs->eq_set, ch, audio_real_buff[ch], - audio_imag_buff[ch]); - if (err_code != IA_NO_ERROR) return (err_code); - } - } - err_code = impd_store_audio_io_buffer_freq( - audio_real_buff, audio_imag_buff, - &p_drc_gain_dec_structs->audio_in_out_buf); - if (err_code != IA_NO_ERROR) return (err_code); - - if (pstr_drc_config->apply_drc) { - for (sel_drc_index = 0; - sel_drc_index < - p_drc_gain_dec_structs->ia_drc_params_struct.drc_set_counter; - sel_drc_index++) { - err_code = impd_get_drc_gain( - p_drc_gain_dec_structs, pstr_drc_config, pstr_drc_gain, compress, - boost, drc_characteristic_target, loudness_normalization_gain_db, - sel_drc_index, &p_drc_gain_dec_structs->drc_gain_buffers); - if (err_code != IA_NO_ERROR) return (err_code); - } - - if (p_drc_gain_dec_structs->ia_drc_params_struct.drc_set_counter == 0) { - err_code = impd_retrieve_audio_buffer_freq( - audio_real_buff, audio_imag_buff, - &p_drc_gain_dec_structs->audio_in_out_buf); - if (err_code != IA_NO_ERROR) return (err_code); - } else { - for (sel_drc_index = 0; - sel_drc_index < - p_drc_gain_dec_structs->ia_drc_params_struct.drc_set_counter; - sel_drc_index++) { - err_code = impd_apply_gains_subband( - str_drc_instruction_str, - p_drc_gain_dec_structs->ia_drc_params_struct - .sel_drc_array[sel_drc_index] - .drc_instructions_index, - &p_drc_gain_dec_structs->ia_drc_params_struct, - &(p_drc_gain_dec_structs->drc_gain_buffers - .pstr_gain_buf[sel_drc_index]), - &p_drc_gain_dec_structs->str_overlap_params, - p_drc_gain_dec_structs->audio_in_out_buf.audio_buffer_delayed_real, - p_drc_gain_dec_structs->audio_in_out_buf.audio_buffer_delayed_imag, - audio_real_buff, audio_imag_buff); - if (err_code != IA_NO_ERROR) return (err_code); - } - } - } - - err_code = - impd_advance_audio_buff_freq(&p_drc_gain_dec_structs->audio_in_out_buf); - - return err_code; -} VOID impd_get_parametric_drc_delay( ia_drc_gain_dec_struct* p_drc_gain_dec_structs, diff --git a/decoder/drc_src/impd_drc_host_params.c b/decoder/drc_src/impd_drc_host_params.c deleted file mode 100644 index 0cfe0df..0000000 --- a/decoder/drc_src/impd_drc_host_params.c +++ /dev/null @@ -1,197 +0,0 @@ -/****************************************************************************** - * - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - ***************************************************************************** - * Originally developed and contributed by Ittiam Systems Pvt. Ltd, Bangalore -*/ -#include <stdio.h> -#include "impd_type_def.h" -#include "impd_drc_extr_delta_coded_info.h" -#include "impd_drc_common.h" -#include "impd_drc_struct.h" -#include "impd_drc_interface.h" -#include "impd_drc_selection_process.h" -#include "impd_drc_filter_bank.h" -#include "impd_drc_rom.h" - -WORD32 impd_set_default_params_selection_process( - ia_drc_sel_proc_params_struct* pstr_drc_sel_proc_params) { - pstr_drc_sel_proc_params->base_channel_count = -1; - pstr_drc_sel_proc_params->base_layout = -1; - pstr_drc_sel_proc_params->target_config_request_type = 0; - pstr_drc_sel_proc_params->num_downmix_id_requests = 0; - - pstr_drc_sel_proc_params->album_mode = 0; - - pstr_drc_sel_proc_params->peak_limiter = 1; - - pstr_drc_sel_proc_params->loudness_normalization_on = 0; - pstr_drc_sel_proc_params->target_loudness = -24.0f; - - pstr_drc_sel_proc_params->loudness_deviation_max = - LOUDNESS_DEVIATION_MAX_DEFAULT; - - pstr_drc_sel_proc_params->loudness_measurement_method = - USER_METHOD_DEFINITION_DEFAULT; - pstr_drc_sel_proc_params->loudness_measurement_system = - USER_MEASUREMENT_SYSTEM_DEFAULT; - pstr_drc_sel_proc_params->loudness_measurement_pre_proc = - USER_LOUDNESS_PREPROCESSING_DEFAULT; - pstr_drc_sel_proc_params->device_cut_off_frequency = 500; - pstr_drc_sel_proc_params->loudness_norm_gain_db_max = - LOUDNESS_NORMALIZATION_GAIN_MAX_DEFAULT; - pstr_drc_sel_proc_params->loudness_norm_gain_modification_db = 0.0f; - pstr_drc_sel_proc_params->output_peak_level_max = 0.0f; - if (pstr_drc_sel_proc_params->peak_limiter == 1) { - pstr_drc_sel_proc_params->output_peak_level_max = 6.0f; - } - - pstr_drc_sel_proc_params->dynamic_range_control_on = 1; - pstr_drc_sel_proc_params->num_bands_supported = 4; - pstr_drc_sel_proc_params->num_drc_feature_requests = 0; - - pstr_drc_sel_proc_params->boost = 1.f; - pstr_drc_sel_proc_params->compress = 1.f; - pstr_drc_sel_proc_params->drc_characteristic_target = 0; - - return 0; -} -WORD32 impd_set_custom_params( - const WORD32 param_set_idx, - ia_drc_sel_proc_params_struct* pstr_drc_sel_proc_params) { - WORD32 i, k; - - const ia_loc_sys_interface_struct* system_interface = - &(loc_sys_interface[param_set_idx - 1]); - - const ia_loc_loudness_norm_ctrl_interface_struct* - loudness_norm_ctrl_interface = - &(loc_loudness_norm_ctrl_interface[param_set_idx - 1]); - const ia_loc_loudness_norm_param_interface_struct* - loudness_norm_param_interface = - &(loc_loudness_norm_param_interface[param_set_idx - 1]); - - const ia_loc_drc_interface_struct* drc_ctrl_interface = - &(loc_dyn_range_ctrl_interface[param_set_idx - 1]); - const ia_loc_requested_drc_effect_struct* requested_drc_effect_type = - &(loc_requested_drc_effect_type_str[param_set_idx - 1]); - const ia_loc_drc_parameter_interface_struct* drc_parameter_interface = - &(loc_drc_parameter_interface[param_set_idx - 1]); - - pstr_drc_sel_proc_params->target_config_request_type = - system_interface->target_config_request_type; - switch (system_interface->target_config_request_type) { - case 1: - pstr_drc_sel_proc_params->requested_target_layout = - system_interface->requested_target_layout; - break; - case 2: - pstr_drc_sel_proc_params->requested_target_ch_count = - system_interface->requested_target_ch_count; - break; - case 0: - default: - pstr_drc_sel_proc_params->num_downmix_id_requests = - system_interface->num_downmix_id_requests; - for (i = 0; i < system_interface->num_downmix_id_requests; i++) { - pstr_drc_sel_proc_params->requested_dwnmix_id[i] = - system_interface->requested_dwnmix_id[i]; - } - break; - } - - pstr_drc_sel_proc_params->loudness_normalization_on = - loudness_norm_ctrl_interface->loudness_normalization_on; - pstr_drc_sel_proc_params->target_loudness = - loudness_norm_ctrl_interface->target_loudness; - - pstr_drc_sel_proc_params->album_mode = - loudness_norm_param_interface->album_mode; - pstr_drc_sel_proc_params->peak_limiter = - loudness_norm_param_interface->peak_limiter; - pstr_drc_sel_proc_params->loudness_deviation_max = - loudness_norm_param_interface->loudness_deviation_max; - pstr_drc_sel_proc_params->loudness_measurement_method = - loudness_norm_param_interface->loudness_measurement_method; - pstr_drc_sel_proc_params->loudness_measurement_system = - loudness_norm_param_interface->loudness_measurement_system; - pstr_drc_sel_proc_params->loudness_measurement_pre_proc = - loudness_norm_param_interface->loudness_measurement_pre_proc; - pstr_drc_sel_proc_params->device_cut_off_frequency = - loudness_norm_param_interface->device_cut_off_frequency; - pstr_drc_sel_proc_params->loudness_norm_gain_db_max = - loudness_norm_param_interface->loudness_norm_gain_db_max; - pstr_drc_sel_proc_params->loudness_norm_gain_modification_db = - loudness_norm_param_interface->loudness_norm_gain_modification_db; - pstr_drc_sel_proc_params->output_peak_level_max = - loudness_norm_param_interface->output_peak_level_max; - - pstr_drc_sel_proc_params->dynamic_range_control_on = - drc_ctrl_interface->dynamic_range_control_on; - pstr_drc_sel_proc_params->num_drc_feature_requests = - drc_ctrl_interface->num_drc_feature_requests; - for (i = 0; i < drc_ctrl_interface->num_drc_feature_requests; i++) { - pstr_drc_sel_proc_params->drc_feature_req_type[i] = - drc_ctrl_interface->drc_feature_req_type[i]; - switch (drc_ctrl_interface->drc_feature_req_type[i]) { - case MATCH_EFFECT_TYPE: - pstr_drc_sel_proc_params->requested_num_drc_effects[i] = - requested_drc_effect_type->requested_num_drc_effects; - pstr_drc_sel_proc_params->desired_num_drc_effects_of_requested[i] = - requested_drc_effect_type->desired_num_drc_effects_of_requested; - for (k = 0; k < requested_drc_effect_type->requested_num_drc_effects; - k++) { - pstr_drc_sel_proc_params->requested_drc_effect_type[i][k] = - requested_drc_effect_type->requested_drc_effect_type[k]; - } - break; - case MATCH_DYNAMIC_RANGE: - pstr_drc_sel_proc_params->requested_dyn_range_measur_type[i] = - drc_ctrl_interface->requested_dyn_rng_measurement_type; - pstr_drc_sel_proc_params->requested_dyn_range_range_flag[i] = - drc_ctrl_interface->requested_dyn_range_is_single_val_flag; - pstr_drc_sel_proc_params->requested_dyn_range_value[i] = - drc_ctrl_interface->requested_dyn_range_value; - pstr_drc_sel_proc_params->requested_dyn_range_min_val[i] = - drc_ctrl_interface->requested_dyn_range_min_val; - pstr_drc_sel_proc_params->requested_dyn_range_max_val[i] = - drc_ctrl_interface->requested_dyn_range_max_val; - break; - case MATCH_DRC_CHARACTERISTIC: - pstr_drc_sel_proc_params->requested_drc_characteristic[i] = - drc_ctrl_interface->requested_drc_characteristic; - break; - default: - return (UNEXPECTED_ERROR); - } - } - - pstr_drc_sel_proc_params->boost = drc_parameter_interface->boost; - pstr_drc_sel_proc_params->compress = drc_parameter_interface->compress; - pstr_drc_sel_proc_params->drc_characteristic_target = - drc_parameter_interface->drc_characteristic_target; - - return (0); -} -WORD32 impd_eval_custom_params_selection_process( - ia_drc_sel_proc_params_struct* pstr_drc_sel_proc_params) { - pstr_drc_sel_proc_params->loudness_norm_gain_db_max = - max(0.0f, pstr_drc_sel_proc_params->loudness_norm_gain_db_max); - pstr_drc_sel_proc_params->loudness_deviation_max = - max(0, pstr_drc_sel_proc_params->loudness_deviation_max); - - return (0); -} diff --git a/decoder/drc_src/impd_drc_host_params.h b/decoder/drc_src/impd_drc_host_params.h deleted file mode 100644 index 9c71245..0000000 --- a/decoder/drc_src/impd_drc_host_params.h +++ /dev/null @@ -1,41 +0,0 @@ -/****************************************************************************** - * - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - ***************************************************************************** - * Originally developed and contributed by Ittiam Systems Pvt. Ltd, Bangalore -*/ -#ifndef IMPD_DRC_HOST_PARAMS_H -#define IMPD_DRC_HOST_PARAMS_H - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -WORD32 impd_set_default_params_selection_process( - ia_drc_sel_proc_params_struct* pstr_drc_sel_proc_params); - -WORD32 impd_set_custom_params( - const WORD32 param_set_idx, - ia_drc_sel_proc_params_struct* pstr_drc_sel_proc_params); - -WORD32 impd_eval_custom_params_selection_process( - ia_drc_sel_proc_params_struct* pstr_drc_sel_proc_params); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif diff --git a/decoder/drc_src/impd_drc_init.c b/decoder/drc_src/impd_drc_init.c index b4711c8..4d96c38 100644 --- a/decoder/drc_src/impd_drc_init.c +++ b/decoder/drc_src/impd_drc_init.c @@ -41,7 +41,6 @@ #include "impd_drc_selection_process.h" #include "impd_drc_api_struct_def.h" #include "impd_drc_peak_limiter.h" -#include "impd_drc_host_params.h" #define PARAMETRIC_DRC_DELAY_MAX_DEFAULT 4096 #define EQ_DELAY_MAX_DEFAULT 256 @@ -90,7 +89,7 @@ static WORD32 impd_match_downmix(WORD32 downmix_id, WORD32 dec_downmix_id) { IA_ERRORCODE impd_drc_set_default_config(ia_drc_api_struct *p_obj_drc) { memset(p_obj_drc, 0, sizeof(*p_obj_drc)); - p_obj_drc->str_config.bitstream_file_format = 0; + p_obj_drc->str_config.bitstream_file_format = 1; p_obj_drc->str_config.dec_type = 0; p_obj_drc->str_config.sub_band_domain_mode = 0; p_obj_drc->str_config.sub_band_count = 0; @@ -102,10 +101,11 @@ IA_ERRORCODE impd_drc_set_default_config(ia_drc_api_struct *p_obj_drc) { p_obj_drc->str_config.control_parameter_index = -1; p_obj_drc->str_config.peak_limiter = 0; p_obj_drc->str_config.delay_mode = 0; - p_obj_drc->str_config.interface_bitstream_present = 0; + p_obj_drc->str_config.interface_bitstream_present = 1; p_obj_drc->str_config.gain_delay_samples = 0; p_obj_drc->str_config.absorb_delay_on = 1; p_obj_drc->str_config.subband_domain_io_flag = 0; + p_obj_drc->str_bit_handler.gain_stream_flag = 1; p_obj_drc->str_config.constant_delay_on = 0; p_obj_drc->str_config.audio_delay_samples = 0; p_obj_drc->str_config.effect_type = 0; @@ -401,99 +401,52 @@ IA_ERRORCODE impd_drc_init(ia_drc_api_struct *p_obj_drc) { p_obj_drc->str_payload.pstr_gain_dec[i]); } - if (p_obj_drc->str_config.interface_bitstream_present) { - err_code = impd_drc_dec_interface_add_effect_type( - p_obj_drc->str_payload.pstr_drc_interface, - p_obj_drc->str_config.effect_type, - p_obj_drc->str_config.target_loudness, - p_obj_drc->str_config.loud_norm_flag); - - if (err_code != IA_NO_ERROR) return err_code; - - err_code = impd_drc_uni_selction_proc_init( - p_obj_drc->str_payload.pstr_selection_proc, 0, - p_obj_drc->str_payload.pstr_drc_interface, - p_obj_drc->str_config.sub_band_domain_mode); - if (err_code != IA_NO_ERROR) return err_code; - - if (p_obj_drc->str_payload.pstr_drc_interface - ->loudness_norm_parameter_interface_flag && - p_obj_drc->str_payload.pstr_drc_interface->loudness_norm_param_interface - .peak_limiter) { - p_obj_drc->str_config.peak_limiter = 1; - } - } else { - err_code = impd_set_default_params_selection_process( - p_obj_drc->str_payload.pstr_drc_sel_proc_params); - if (err_code != IA_NO_ERROR) return err_code; - err_code = - impd_set_custom_params(p_obj_drc->str_config.control_parameter_index, - p_obj_drc->str_payload.pstr_drc_sel_proc_params); - if (err_code != IA_NO_ERROR) return err_code; - err_code = impd_eval_custom_params_selection_process( - p_obj_drc->str_payload.pstr_drc_sel_proc_params); - if (err_code != IA_NO_ERROR) return err_code; - err_code = impd_drc_uni_selction_proc_init( - p_obj_drc->str_payload.pstr_selection_proc, - p_obj_drc->str_payload.pstr_drc_sel_proc_params, 0, - p_obj_drc->str_config.sub_band_domain_mode); - if (err_code != IA_NO_ERROR) return err_code; - - if (p_obj_drc->str_payload.pstr_drc_sel_proc_params->peak_limiter) { - p_obj_drc->str_config.peak_limiter = 1; - } + err_code = impd_drc_dec_interface_add_effect_type( + p_obj_drc->str_payload.pstr_drc_interface, + p_obj_drc->str_config.effect_type, p_obj_drc->str_config.target_loudness, + p_obj_drc->str_config.loud_norm_flag); + + if (err_code != IA_NO_ERROR) return err_code; + + err_code = impd_drc_uni_selction_proc_init( + p_obj_drc->str_payload.pstr_selection_proc, 0, + p_obj_drc->str_payload.pstr_drc_interface, + p_obj_drc->str_config.sub_band_domain_mode); + if (err_code != IA_NO_ERROR) return err_code; + + if (p_obj_drc->str_payload.pstr_drc_interface + ->loudness_norm_parameter_interface_flag && + p_obj_drc->str_payload.pstr_drc_interface->loudness_norm_param_interface + .peak_limiter) { + p_obj_drc->str_config.peak_limiter = 1; } + p_obj_drc->str_payload.pstr_loudness_info->loudness_info_album_count = 0; p_obj_drc->str_payload.pstr_loudness_info->loudness_info_count = 0; p_obj_drc->str_payload.pstr_loudness_info->loudness_info_set_ext_present = 0; p_obj_drc->p_state->ui_exe_done = 0; - if (p_obj_drc->str_config.bitstream_file_format == - BITSTREAM_FILE_FORMAT_SPLIT) { - err_code = impd_process_drc_bitstream_dec_config( - p_obj_drc->str_payload.pstr_bitstream_dec, p_obj_drc->pstr_bit_buf, - p_obj_drc->str_payload.pstr_drc_config, - &p_obj_drc->str_bit_handler.bitstream_drc_config[0], - p_obj_drc->str_bit_handler.num_bytes_bs_drc_config); - - if (err_code == 1) { - memset(p_obj_drc->str_payload.pstr_drc_config, 0, sizeof(ia_drc_config)); - err_code = impd_drc_set_default_bitstream_config( - p_obj_drc->str_payload.pstr_drc_config); - p_obj_drc->str_payload.pstr_drc_config->channel_layout - .base_channel_count = p_obj_drc->str_config.num_ch_in; - } - - if (err_code != IA_NO_ERROR) return err_code; - err_code = impd_process_drc_bitstream_dec_loudness_info_set( - p_obj_drc->pstr_bit_buf, p_obj_drc->str_payload.pstr_loudness_info, - &p_obj_drc->str_bit_handler.bitstream_loudness_info[0], - p_obj_drc->str_bit_handler.num_bytes_bs_loudness_info); - if (err_code != IA_NO_ERROR) return err_code; - - } else { - err_code = impd_process_drc_bitstream_dec( - p_obj_drc->str_payload.pstr_bitstream_dec, p_obj_drc->pstr_bit_buf, - p_obj_drc->str_payload.pstr_drc_config, - p_obj_drc->str_payload.pstr_loudness_info, - &p_obj_drc->str_bit_handler - .it_bit_buf[p_obj_drc->str_bit_handler.byte_index_bs], - p_obj_drc->str_bit_handler.num_bytes_bs, - p_obj_drc->str_bit_handler.num_bits_offset_bs, - &p_obj_drc->str_bit_handler.num_bits_read_bs); - - if (err_code > PROC_COMPLETE) return -1; - - p_obj_drc->str_bit_handler.num_bytes_read_bs = - (p_obj_drc->str_bit_handler.num_bits_read_bs >> 3); - p_obj_drc->str_bit_handler.num_bits_offset_bs = - (p_obj_drc->str_bit_handler.num_bits_read_bs & 7); - p_obj_drc->str_bit_handler.byte_index_bs += - p_obj_drc->str_bit_handler.num_bytes_read_bs; - p_obj_drc->str_bit_handler.num_bytes_bs -= - p_obj_drc->str_bit_handler.num_bytes_read_bs; + err_code = impd_process_drc_bitstream_dec_config( + p_obj_drc->str_payload.pstr_bitstream_dec, p_obj_drc->pstr_bit_buf, + p_obj_drc->str_payload.pstr_drc_config, + &p_obj_drc->str_bit_handler.bitstream_drc_config[0], + p_obj_drc->str_bit_handler.num_bytes_bs_drc_config); + + if (err_code == 1) { + memset(p_obj_drc->str_payload.pstr_drc_config, 0, sizeof(ia_drc_config)); + err_code = impd_drc_set_default_bitstream_config( + p_obj_drc->str_payload.pstr_drc_config); + p_obj_drc->str_payload.pstr_drc_config->channel_layout.base_channel_count = + p_obj_drc->str_config.num_ch_in; } + if (err_code != IA_NO_ERROR) return err_code; + err_code = impd_process_drc_bitstream_dec_loudness_info_set( + p_obj_drc->pstr_bit_buf, p_obj_drc->str_payload.pstr_loudness_info, + &p_obj_drc->str_bit_handler.bitstream_loudness_info[0], + p_obj_drc->str_bit_handler.num_bytes_bs_loudness_info); + if (err_code != IA_NO_ERROR) return err_code; + err_code = impd_drc_uni_sel_proc_process( p_obj_drc->str_payload.pstr_selection_proc, p_obj_drc->str_payload.pstr_drc_config, diff --git a/decoder/drc_src/impd_drc_interface_decoder.c b/decoder/drc_src/impd_drc_interface_decoder.c index 35b1f3c..4e0301c 100644 --- a/decoder/drc_src/impd_drc_interface_decoder.c +++ b/decoder/drc_src/impd_drc_interface_decoder.c @@ -30,29 +30,6 @@ #include "impd_drc_parser_interface.h" WORD32 -impd_drc_dec_interface_process(ia_bit_buf_struct* it_bit_buff, - ia_drc_interface_struct* pstr_drc_interface, - UWORD8* it_bit_buf, WORD32 num_bit_stream_bits, - WORD32* num_bits_read) { - WORD32 err = 0; - - if (it_bit_buff != NULL && num_bit_stream_bits) { - it_bit_buff = impd_create_init_bit_buf(it_bit_buff, it_bit_buf, - num_bit_stream_bits / 8); - - } else { - return -1; - } - - err = impd_unidrc_interface_read(it_bit_buff, pstr_drc_interface); - if (err) return (err); - - *num_bits_read = (it_bit_buff->size) - it_bit_buff->cnt_bits; - - return err; -} - -WORD32 impd_drc_dec_interface_add_effect_type( ia_drc_interface_struct* pstr_drc_interface, WORD32 drc_effect_type, WORD32 target_loudness, WORD32 loud_norm) { diff --git a/decoder/drc_src/impd_drc_interface_parser.c b/decoder/drc_src/impd_drc_interface_parser.c deleted file mode 100644 index 1ae69a2..0000000 --- a/decoder/drc_src/impd_drc_interface_parser.c +++ /dev/null @@ -1,514 +0,0 @@ -/****************************************************************************** - * - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - ***************************************************************************** - * Originally developed and contributed by Ittiam Systems Pvt. Ltd, Bangalore -*/ -#include <stdio.h> -#include <string.h> -#include <math.h> - -#include "impd_type_def.h" -#include "impd_drc_bitbuffer.h" -#include "impd_drc_common.h" -#include "impd_drc_interface.h" -#include "impd_drc_extr_delta_coded_info.h" -#include "impd_drc_struct.h" - -WORD32 impd_unidrc_interface_signature_read( - ia_bit_buf_struct* it_bit_buff, - ia_drc_uni_interface_signat_struct* drc_uni_interface_signature) { - // WORD32 err = 0 - WORD32 interface_signat_data_len = 0, i, tmp; - - tmp = impd_read_bits_buf(it_bit_buff, 16); - if (it_bit_buff->error) return it_bit_buff->error; - - drc_uni_interface_signature->interface_signat_type = (tmp >> 8) & 0xff; - drc_uni_interface_signature->interface_signat_data_len = tmp & 0xff; - - interface_signat_data_len = - drc_uni_interface_signature->interface_signat_data_len + 1; - for (i = 0; i < interface_signat_data_len; i++) { - tmp = impd_read_bits_buf(it_bit_buff, 8); - if (it_bit_buff->error) return it_bit_buff->error; - drc_uni_interface_signature->interface_signat_data[i] = (UWORD32)tmp; - } - - return (0); -} -WORD32 impd_sys_interface_read(ia_bit_buf_struct* it_bit_buff, - ia_system_interface_struct* system_interface) { - // WORD32 err = 0; - WORD32 i = 0, tmp = 0; - - system_interface->target_config_request_type = - impd_read_bits_buf(it_bit_buff, 2); - if (it_bit_buff->error) return it_bit_buff->error; - - switch (system_interface->target_config_request_type) { - case 0: - system_interface->num_downmix_id_requests = - impd_read_bits_buf(it_bit_buff, 4); - if (it_bit_buff->error) return it_bit_buff->error; - - if (system_interface->num_downmix_id_requests == 0) { - system_interface->num_downmix_id_requests = 1; - system_interface->requested_dwnmix_id[0] = 0; - break; - } - for (i = 0; i < system_interface->num_downmix_id_requests; i++) { - system_interface->requested_dwnmix_id[i] = - impd_read_bits_buf(it_bit_buff, 7); - if (it_bit_buff->error) return it_bit_buff->error; - } - break; - case 1: - system_interface->requested_target_layout = - impd_read_bits_buf(it_bit_buff, 8); - if (it_bit_buff->error) return it_bit_buff->error; - break; - case 2: - tmp = impd_read_bits_buf(it_bit_buff, 7); - if (it_bit_buff->error) return it_bit_buff->error; - system_interface->requested_target_ch_count = tmp + 1; - break; - default: - return (1); - break; - } - return (0); -} - -WORD32 impd_loudness_norm_control_interface_read( - ia_bit_buf_struct* it_bit_buff, - ia_loudness_norm_ctrl_interface_struct* loudness_norm_ctrl_interface) { - // WORD32 err = 0; - WORD32 tmp = 0; - - loudness_norm_ctrl_interface->loudness_normalization_on = - impd_read_bits_buf(it_bit_buff, 1); - if (it_bit_buff->error) return it_bit_buff->error; - - if (loudness_norm_ctrl_interface->loudness_normalization_on == 1) { - tmp = impd_read_bits_buf(it_bit_buff, 12); - if (it_bit_buff->error) return it_bit_buff->error; - loudness_norm_ctrl_interface->target_loudness = -tmp * 0.03125f; - } - return (0); -} - -WORD32 impd_loudness_norm_param_interface_read( - ia_bit_buf_struct* it_bit_buff, ia_loudness_norm_parameter_interface_struct* - loudness_norm_param_interface) { - // WORD32 err = 0; - WORD32 tmp = 0; - - tmp = impd_read_bits_buf(it_bit_buff, 3); - if (it_bit_buff->error) return it_bit_buff->error; - - loudness_norm_param_interface->album_mode = (tmp >> 2) & 1; - loudness_norm_param_interface->peak_limiter = (tmp >> 1) & 1; - loudness_norm_param_interface->change_loudness_deviation_max = tmp & 1; - - if (loudness_norm_param_interface->change_loudness_deviation_max == 1) { - loudness_norm_param_interface->loudness_deviation_max = - impd_read_bits_buf(it_bit_buff, 6); - if (it_bit_buff->error) return it_bit_buff->error; - } - - loudness_norm_param_interface->change_loudness_measur_method = - impd_read_bits_buf(it_bit_buff, 1); - if (it_bit_buff->error) return it_bit_buff->error; - if (loudness_norm_param_interface->change_loudness_measur_method == 1) { - loudness_norm_param_interface->loudness_measurement_method = - impd_read_bits_buf(it_bit_buff, 3); - if (it_bit_buff->error) return it_bit_buff->error; - } - - loudness_norm_param_interface->change_loudness_measur_system = - impd_read_bits_buf(it_bit_buff, 1); - if (it_bit_buff->error) return it_bit_buff->error; - if (loudness_norm_param_interface->change_loudness_measur_system == 1) { - loudness_norm_param_interface->loudness_measurement_system = - impd_read_bits_buf(it_bit_buff, 4); - if (it_bit_buff->error) return it_bit_buff->error; - } - - loudness_norm_param_interface->change_loudness_measur_pre_proc = - impd_read_bits_buf(it_bit_buff, 1); - if (it_bit_buff->error) return it_bit_buff->error; - if (loudness_norm_param_interface->change_loudness_measur_pre_proc == 1) { - loudness_norm_param_interface->loudness_measurement_pre_proc = - impd_read_bits_buf(it_bit_buff, 2); - if (it_bit_buff->error) return it_bit_buff->error; - } - - loudness_norm_param_interface->change_device_cut_off_freq = - impd_read_bits_buf(it_bit_buff, 1); - if (it_bit_buff->error) return it_bit_buff->error; - if (loudness_norm_param_interface->change_device_cut_off_freq == 1) { - tmp = impd_read_bits_buf(it_bit_buff, 6); - if (it_bit_buff->error) return it_bit_buff->error; - loudness_norm_param_interface->device_cut_off_frequency = - max(min(tmp * 10, 500), 20); - } - - loudness_norm_param_interface->change_loudness_norm_gain_db_max = - impd_read_bits_buf(it_bit_buff, 1); - if (it_bit_buff->error) return it_bit_buff->error; - if (loudness_norm_param_interface->change_loudness_norm_gain_db_max == 1) { - tmp = impd_read_bits_buf(it_bit_buff, 6); - if (it_bit_buff->error) return it_bit_buff->error; - if (tmp < 63) { - loudness_norm_param_interface->loudness_norm_gain_db_max = tmp * 0.5f; - } else { - loudness_norm_param_interface->loudness_norm_gain_db_max = - LOUDNESS_NORMALIZATION_GAIN_MAX_DEFAULT; - } - } - - loudness_norm_param_interface->change_loudness_norm_gain_modification_db = - impd_read_bits_buf(it_bit_buff, 1); - if (it_bit_buff->error) return it_bit_buff->error; - if (loudness_norm_param_interface - ->change_loudness_norm_gain_modification_db == 1) { - tmp = impd_read_bits_buf(it_bit_buff, 10); - if (it_bit_buff->error) return it_bit_buff->error; - loudness_norm_param_interface->loudness_norm_gain_modification_db = - -16 + tmp * 0.03125f; - } - - loudness_norm_param_interface->change_output_peak_level_max = - impd_read_bits_buf(it_bit_buff, 1); - if (it_bit_buff->error) return it_bit_buff->error; - if (loudness_norm_param_interface->change_output_peak_level_max == 1) { - tmp = impd_read_bits_buf(it_bit_buff, 6); - if (it_bit_buff->error) return it_bit_buff->error; - loudness_norm_param_interface->output_peak_level_max = tmp * 0.5f; - } - - return (0); -} - -WORD32 impd_drc_interface_read( - ia_bit_buf_struct* it_bit_buff, - ia_dyn_rng_ctrl_interface_struct* drc_ctrl_interface) { - // WORD32 err = 0; - WORD32 i = 0, j = 0, tmp = 0; - - drc_ctrl_interface->dynamic_range_control_on = - impd_read_bits_buf(it_bit_buff, 1); - if (it_bit_buff->error) return it_bit_buff->error; - - if (drc_ctrl_interface->dynamic_range_control_on == 1) { - drc_ctrl_interface->num_drc_feature_requests = - impd_read_bits_buf(it_bit_buff, 3); - if (it_bit_buff->error) return it_bit_buff->error; - - for (i = 0; i < drc_ctrl_interface->num_drc_feature_requests; i++) { - drc_ctrl_interface->drc_feature_req_type[i] = - impd_read_bits_buf(it_bit_buff, 2); - if (it_bit_buff->error) return it_bit_buff->error; - - switch (drc_ctrl_interface->drc_feature_req_type[i]) { - case 0: - tmp = impd_read_bits_buf(it_bit_buff, 8); - if (it_bit_buff->error) return it_bit_buff->error; - - drc_ctrl_interface->requested_num_drc_effects[i] = (tmp >> 4) & 0xf; - drc_ctrl_interface->desired_num_drc_effects_of_requested[i] = - tmp & 0xf; - - for (j = 0; j < drc_ctrl_interface->requested_num_drc_effects[i]; - j++) { - drc_ctrl_interface->requested_drc_effect_type[i][j] = - impd_read_bits_buf(it_bit_buff, 4); - if (it_bit_buff->error) return it_bit_buff->error; - } - break; - case 1: - tmp = impd_read_bits_buf(it_bit_buff, 3); - if (it_bit_buff->error) return it_bit_buff->error; - - drc_ctrl_interface->requested_dyn_rng_measurement_type[i] = - (tmp >> 1) & 3; - drc_ctrl_interface->requested_dyn_range_is_single_val_flag[i] = - tmp & 1; - - if (drc_ctrl_interface->requested_dyn_range_is_single_val_flag[i] == - 0) { - tmp = impd_read_bits_buf(it_bit_buff, 8); - if (it_bit_buff->error) return it_bit_buff->error; - if (tmp == 0) - drc_ctrl_interface->requested_dyn_range_value[i] = 0.0f; - else if (tmp <= 128) - drc_ctrl_interface->requested_dyn_range_value[i] = tmp * 0.25f; - else if (tmp <= 204) - drc_ctrl_interface->requested_dyn_range_value[i] = - 0.5f * tmp - 32.0f; - else - drc_ctrl_interface->requested_dyn_range_value[i] = tmp - 134.0f; - } else { - tmp = impd_read_bits_buf(it_bit_buff, 8); - if (it_bit_buff->error) return it_bit_buff->error; - if (tmp == 0) - drc_ctrl_interface->requested_dyn_range_min_val[i] = 0.0f; - else if (tmp <= 128) - drc_ctrl_interface->requested_dyn_range_min_val[i] = tmp * 0.25f; - else if (tmp <= 204) - drc_ctrl_interface->requested_dyn_range_min_val[i] = - 0.5f * tmp - 32.0f; - else - drc_ctrl_interface->requested_dyn_range_min_val[i] = tmp - 134.0f; - tmp = impd_read_bits_buf(it_bit_buff, 8); - if (it_bit_buff->error) return it_bit_buff->error; - if (tmp == 0) - drc_ctrl_interface->requested_dyn_range_max_val[i] = 0.0f; - else if (tmp <= 128) - drc_ctrl_interface->requested_dyn_range_max_val[i] = tmp * 0.25f; - else if (tmp <= 204) - drc_ctrl_interface->requested_dyn_range_max_val[i] = - 0.5f * tmp - 32.0f; - else - drc_ctrl_interface->requested_dyn_range_max_val[i] = tmp - 134.0f; - } - break; - case 2: - drc_ctrl_interface->requested_drc_characteristic[i] = - impd_read_bits_buf(it_bit_buff, 7); - if (it_bit_buff->error) return it_bit_buff->error; - break; - default: - return (1); - break; - } - } - } - return (0); -} - -WORD32 impd_drc_param_interface_read( - ia_bit_buf_struct* it_bit_buff, - ia_drc_parameter_interface_struct* drc_parameter_interface) { - // WORD32 err = 0; - WORD32 tmp = 0; - - tmp = impd_read_bits_buf(it_bit_buff, 2); - if (it_bit_buff->error) return it_bit_buff->error; - - drc_parameter_interface->change_compress = (tmp >> 1) & 1; - drc_parameter_interface->change_boost = tmp & 1; - - if (drc_parameter_interface->change_compress == 1) { - tmp = impd_read_bits_buf(it_bit_buff, 8); - if (it_bit_buff->error) return it_bit_buff->error; - if (tmp < 255) { - drc_parameter_interface->compress = 1 - tmp * 0.00390625f; - } else { - drc_parameter_interface->compress = 0.f; - } - } - - if (drc_parameter_interface->change_boost == 1) { - tmp = impd_read_bits_buf(it_bit_buff, 8); - if (it_bit_buff->error) return it_bit_buff->error; - if (tmp < 255) { - drc_parameter_interface->boost = 1 - tmp * 0.00390625f; - } else { - drc_parameter_interface->boost = 0.f; - } - } - - drc_parameter_interface->change_drc_characteristic_target = - impd_read_bits_buf(it_bit_buff, 1); - if (it_bit_buff->error) return it_bit_buff->error; - - if (drc_parameter_interface->change_drc_characteristic_target == 1) { - drc_parameter_interface->drc_characteristic_target = - impd_read_bits_buf(it_bit_buff, 8); - if (it_bit_buff->error) return it_bit_buff->error; - } - return (0); -} - -static WORD32 impd_parse_loud_eq_param_interface( - ia_bit_buf_struct* it_bit_buff, ia_loudness_eq_parameter_interface_struct* - loudness_eq_parameter_interface) { - // WORD32 err = 0; - WORD32 bsSensitivity, bsPlaybackGain; - - loudness_eq_parameter_interface->loudness_eq_request_flag = - impd_read_bits_buf(it_bit_buff, 1); - if (it_bit_buff->error) return it_bit_buff->error; - if (loudness_eq_parameter_interface->loudness_eq_request_flag) { - loudness_eq_parameter_interface->loudness_eq_request = - impd_read_bits_buf(it_bit_buff, 2); - if (it_bit_buff->error) return it_bit_buff->error; - } - loudness_eq_parameter_interface->sensitivity_flag = - impd_read_bits_buf(it_bit_buff, 1); - if (it_bit_buff->error) return it_bit_buff->error; - if (loudness_eq_parameter_interface->sensitivity_flag) { - bsSensitivity = impd_read_bits_buf(it_bit_buff, 7); - if (it_bit_buff->error) return it_bit_buff->error; - loudness_eq_parameter_interface->sensitivity = bsSensitivity + 23.0f; - } - loudness_eq_parameter_interface->playback_gain_flag = - impd_read_bits_buf(it_bit_buff, 1); - if (it_bit_buff->error) return it_bit_buff->error; - if (loudness_eq_parameter_interface->playback_gain_flag) { - bsPlaybackGain = impd_read_bits_buf(it_bit_buff, 7); - if (it_bit_buff->error) return it_bit_buff->error; - loudness_eq_parameter_interface->playback_gain = (FLOAT32)-bsPlaybackGain; - } - return (0); -} - -WORD32 -impd_unidrc_interface_extension_read( - ia_bit_buf_struct* it_bit_buff, - ia_drc_interface_struct* impd_drc_uni_interface, - ia_drc_uni_interface_ext_struct* drc_uni_interface_ext) { - WORD32 err = 0, i = 0, tmp = 0, dummy; - WORD32 uni_drc_interface_ext_type; - ia_specific_interface_extension_struct* specific_interface_ext; - - uni_drc_interface_ext_type = impd_read_bits_buf(it_bit_buff, 4); - if (it_bit_buff->error) return it_bit_buff->error; - - while (uni_drc_interface_ext_type != UNIDRCINTERFACEEXT_TERM) { - specific_interface_ext = - &(drc_uni_interface_ext->specific_interface_ext[i]); - specific_interface_ext->uni_drc_interface_ext_type = - uni_drc_interface_ext_type; - tmp = impd_read_bits_buf(it_bit_buff, 4); - if (it_bit_buff->error) return it_bit_buff->error; - specific_interface_ext->ext_size_bits = tmp + 4; - - tmp = - impd_read_bits_buf(it_bit_buff, specific_interface_ext->ext_size_bits); - if (it_bit_buff->error) return it_bit_buff->error; - - specific_interface_ext->ext_bit_size = tmp + 1; - - switch (uni_drc_interface_ext_type) { - case UNIDRCINTERFACEEXT_EQ: - impd_drc_uni_interface->drc_uni_interface_ext - .loudness_eq_parameter_interface_flag = - impd_read_bits_buf(it_bit_buff, 1); - if (it_bit_buff->error) return it_bit_buff->error; - if (impd_drc_uni_interface->drc_uni_interface_ext - .loudness_eq_parameter_interface_flag) { - err = impd_parse_loud_eq_param_interface( - it_bit_buff, &(impd_drc_uni_interface->drc_uni_interface_ext - .loudness_eq_parameter_interface)); - if (err) return (err); - } - impd_drc_uni_interface->drc_uni_interface_ext.eq_ctrl_interface_flag = - impd_read_bits_buf(it_bit_buff, 1); - if (it_bit_buff->error) return it_bit_buff->error; - if (impd_drc_uni_interface->drc_uni_interface_ext - .eq_ctrl_interface_flag) { - impd_drc_uni_interface->drc_uni_interface_ext.eq_ctrl_interface - .eq_set_purpose_request = impd_read_bits_buf(it_bit_buff, 16); - if (it_bit_buff->error) return it_bit_buff->error; - } - break; - default: - dummy = impd_read_bits_buf(it_bit_buff, - specific_interface_ext->ext_bit_size); - if (it_bit_buff->error) return it_bit_buff->error; - break; - } - - i++; - if (i == EXT_COUNT_MAX) { - return (1); - } - uni_drc_interface_ext_type = impd_read_bits_buf(it_bit_buff, 4); - if (it_bit_buff->error) return it_bit_buff->error; - } - drc_uni_interface_ext->interface_ext_count = i; - return (0); -} -WORD32 impd_unidrc_interface_read(ia_bit_buf_struct* it_bit_buff, - ia_drc_interface_struct* uniDrcInterface) { - WORD32 err = 0; - - uniDrcInterface->interface_signat_flag = impd_read_bits_buf(it_bit_buff, 1); - if (it_bit_buff->error) return it_bit_buff->error; - if (uniDrcInterface->interface_signat_flag == 1) { - err = impd_unidrc_interface_signature_read( - it_bit_buff, &(uniDrcInterface->drc_uni_interface_signature)); - if (err) return (err); - } - - uniDrcInterface->system_interface_flag = impd_read_bits_buf(it_bit_buff, 1); - if (it_bit_buff->error) return it_bit_buff->error; - if (uniDrcInterface->system_interface_flag == 1) { - err = impd_sys_interface_read(it_bit_buff, - &(uniDrcInterface->system_interface)); - if (err) return (err); - } - - uniDrcInterface->loudness_norm_ctrl_interface_flag = - impd_read_bits_buf(it_bit_buff, 1); - if (it_bit_buff->error) return it_bit_buff->error; - if (uniDrcInterface->loudness_norm_ctrl_interface_flag == 1) { - err = impd_loudness_norm_control_interface_read( - it_bit_buff, &(uniDrcInterface->loudness_norm_ctrl_interface)); - if (err) return (err); - } - - uniDrcInterface->loudness_norm_parameter_interface_flag = - impd_read_bits_buf(it_bit_buff, 1); - if (it_bit_buff->error) return it_bit_buff->error; - if (uniDrcInterface->loudness_norm_parameter_interface_flag == 1) { - err = impd_loudness_norm_param_interface_read( - it_bit_buff, &(uniDrcInterface->loudness_norm_param_interface)); - if (err) return (err); - } - - uniDrcInterface->drc_interface_flag = impd_read_bits_buf(it_bit_buff, 1); - if (it_bit_buff->error) return it_bit_buff->error; - if (uniDrcInterface->drc_interface_flag == 1) { - err = impd_drc_interface_read(it_bit_buff, - &(uniDrcInterface->drc_ctrl_interface)); - if (err) return (err); - } - - uniDrcInterface->drc_parameter_interface_flag = - impd_read_bits_buf(it_bit_buff, 1); - if (it_bit_buff->error) return it_bit_buff->error; - if (uniDrcInterface->drc_parameter_interface_flag == 1) { - err = impd_drc_param_interface_read( - it_bit_buff, &(uniDrcInterface->drc_parameter_interface)); - if (err) return (err); - } - - uniDrcInterface->drc_uni_interface_ext_flag = - impd_read_bits_buf(it_bit_buff, 1); - if (it_bit_buff->error) return it_bit_buff->error; - if (uniDrcInterface->drc_uni_interface_ext_flag == 1) { - err = impd_unidrc_interface_extension_read( - it_bit_buff, uniDrcInterface, - &(uniDrcInterface->drc_uni_interface_ext)); - if (err) return (err); - } - - return (0); -}
\ No newline at end of file diff --git a/decoder/drc_src/impd_drc_loud_eq.c b/decoder/drc_src/impd_drc_loud_eq.c deleted file mode 100644 index ef04db2..0000000 --- a/decoder/drc_src/impd_drc_loud_eq.c +++ /dev/null @@ -1,169 +0,0 @@ -/****************************************************************************** - * - * Copyright (C) 2015 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - ***************************************************************************** - * Originally developed and contributed by Ittiam Systems Pvt. Ltd, Bangalore -*/ -#include <stdio.h> -#include <stdlib.h> -#include <math.h> -#include <string.h> -#include "impd_type_def.h" -#include "impd_drc_uni_tables.h" -#include "impd_drc_uni_common.h" -#include "impd_drc_uni_interface.h" -#include "impd_drc_struct.h" -#include "impd_drc_uni_gain_dec.h" -#include "impd_drc_uni_loud_eq.h" -#include "impd_parametric_drc_dec.h" -#include "impd_drc_uni_multi_band.h" -#include "impd_drc_filter_bank.h" -#include "impd_drc_uni_process_audio.h" -#include "impd_drc_rom.h" - -WORD32 impd_parametric_drc_instance_reset( - WORD32 instance_idx, ia_parametric_drc_instance_params_struct* - pstr_parametric_drc_instance_params) { - WORD32 err = 0; - - if (pstr_parametric_drc_instance_params->parametric_drc_type == - PARAM_DRC_TYPE_FF) { - ia_parametric_drc_type_ff_params_struct* - pstr_parametric_ffwd_type_drc_params = - &(pstr_parametric_drc_instance_params - ->str_parametric_drc_type_ff_params); - err = impd_parametric_ffwd_type_drc_reset( - pstr_parametric_ffwd_type_drc_params); - if (err) return (err); - - } else { - return (UNEXPECTED_ERROR); - } - - return 0; -} - -WORD32 impd_add_drc_band_audio( - ia_drc_instructions_struct* pstr_drc_instruction_arr, - const WORD32 drc_instructions_index, - ia_drc_params_struct* ia_drc_params_struct, - ia_audio_band_buffer_struct* audio_band_buffer, FLOAT32* audio_io_buf[]) { - WORD32 g, b, i, c; - FLOAT32 sum; - WORD32 signalIndex = 0; - FLOAT32** drcBandAudio; - FLOAT32** channel_audio; - ia_drc_instructions_struct* str_drc_instruction_str; - - drcBandAudio = audio_band_buffer->non_interleaved_audio; - channel_audio = audio_io_buf; - - if (drc_instructions_index >= 0) { - str_drc_instruction_str = - &(pstr_drc_instruction_arr[drc_instructions_index]); - } else { - return -1; - } - - if (str_drc_instruction_str->drc_set_id > 0) { - for (c = 0; c < str_drc_instruction_str->audio_num_chan; c++) - - { - g = str_drc_instruction_str->channel_group_of_ch[c]; - if (g >= 0) { - for (i = 0; i < ia_drc_params_struct->drc_frame_size; i++) { - sum = 0.0f; - for (b = 0; b < str_drc_instruction_str->band_count_of_ch_group[g]; - b++) { - sum += drcBandAudio[signalIndex + b][i]; - } - - channel_audio[c][i] = sum; - } - signalIndex += str_drc_instruction_str->band_count_of_ch_group[g]; - } else { - signalIndex++; - } - } - } else { - for (c = 0; c < str_drc_instruction_str->audio_num_chan; c++) - - { - for (i = 0; i < ia_drc_params_struct->drc_frame_size; i++) { - channel_audio[c][i] = drcBandAudio[c][i]; - } - } - } - return (0); -} - -WORD32 removeTables(void) { return (0); } - -const ia_slope_code_table_struct* impd_get_slope_code_tbl_by_value(void) { - return (&(slopeCodeTableEntryByValue[0])); -} - -FLOAT32 impd_decode_slope_idx(const WORD32 slopeCodeIndex) { - const ia_slope_code_table_struct* slopeCodeTable = - impd_get_slope_code_tbl_by_value(); - return slopeCodeTable[slopeCodeIndex].value; -} - -FLOAT32 impd_decode_slope_idx_magnitude(const WORD32 slopeCodeIndex) { - const ia_slope_code_table_struct* slopeCodeTable = - impd_get_slope_code_tbl_by_value(); - return (FLOAT32)fabs((FLOAT64)slopeCodeTable[slopeCodeIndex].value); -} - -WORD32 impd_get_multi_band_drc_present(ia_drc_config* pstr_drc_config, - WORD32 numSets[3], - WORD32 multiBandDrcPresent[3]) { - WORD32 err = 0, k, m; - for (k = 0; k < pstr_drc_config->drc_instructions_uni_drc_count; k++) { - if ((pstr_drc_config->str_drc_instruction_str[k].downmix_id[0] == - ID_FOR_BASE_LAYOUT) || - (pstr_drc_config->str_drc_instruction_str[k].drc_apply_to_dwnmix == - 0)) { - numSets[0]++; - } else if (pstr_drc_config->str_drc_instruction_str[k].downmix_id[0] == - ID_FOR_ANY_DOWNMIX) { - numSets[1]++; - } else { - numSets[2]++; - } - for (m = 0; - m < pstr_drc_config->str_drc_instruction_str[k].num_drc_ch_groups; - m++) { - if (pstr_drc_config->str_p_loc_drc_coefficients_uni_drc[0] - .gain_set_params[pstr_drc_config->str_drc_instruction_str - ->gain_set_index_for_channel_group[m]] - .band_count > 1) { - if ((pstr_drc_config->str_drc_instruction_str[k].downmix_id[0] == - ID_FOR_BASE_LAYOUT) || - (pstr_drc_config->str_drc_instruction_str[k].drc_apply_to_dwnmix == - 0)) { - multiBandDrcPresent[0] = 1; - } else if (pstr_drc_config->str_drc_instruction_str[k].downmix_id[0] == - ID_FOR_ANY_DOWNMIX) { - multiBandDrcPresent[1] = 1; - } else { - multiBandDrcPresent[2] = 1; - } - } - } - } - return err; -} diff --git a/decoder/drc_src/impd_drc_main_qmf_process.c b/decoder/drc_src/impd_drc_main_qmf_process.c deleted file mode 100644 index 3c4e711..0000000 --- a/decoder/drc_src/impd_drc_main_qmf_process.c +++ /dev/null @@ -1,254 +0,0 @@ -/****************************************************************************** - * - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - ***************************************************************************** - * Originally developed and contributed by Ittiam Systems Pvt. Ltd, Bangalore -*/ -#include <math.h> -#include "impd_type_def.h" -#include "impd_memory_standards.h" -#include "impd_drc_bitbuffer.h" -#include "impd_drc_extr_delta_coded_info.h" -#include "impd_drc_common.h" -#include "impd_drc_struct.h" -#include "impd_drc_interface.h" - -#include "impd_drc_bitstream_dec_api.h" -#include "impd_drc_gain_dec.h" -#include "impd_drc_filter_bank.h" -#include "impd_drc_multi_band.h" -#include "impd_drc_process_audio.h" -#include "impd_parametric_drc_dec.h" -#include "impd_drc_eq.h" -#include "impd_drc_gain_decoder.h" -#include "impd_drc_selection_process.h" - -#include "impd_drc_peak_limiter.h" -#include "impd_drc_api_struct_def.h" - -#define BITSTREAM_FILE_FORMAT_SPLIT 1 - -static WORD32 impd_down_mix( - ia_drc_sel_proc_output_struct *uni_drc_sel_proc_output, - FLOAT32 **input_audio, WORD32 frame_len) { - WORD32 num_base_ch = uni_drc_sel_proc_output->base_channel_count; - WORD32 num_target_ch = uni_drc_sel_proc_output->target_channel_count; - WORD32 i, i_ch, o_ch; - FLOAT32 tmp_out[MAX_CHANNEL_COUNT]; - - if (uni_drc_sel_proc_output->downmix_matrix_present == 0) return 0; - - if (input_audio == 0) return 0; - - if (num_target_ch > MAX_CHANNEL_COUNT) return -1; - - if (num_target_ch > num_base_ch) return -1; - - for (i = 0; i < frame_len; i++) { - for (o_ch = 0; o_ch < num_target_ch; o_ch++) { - tmp_out[o_ch] = 0.0f; - for (i_ch = 0; i_ch < num_base_ch; i_ch++) { - tmp_out[o_ch] += input_audio[i_ch][i] * - uni_drc_sel_proc_output->downmix_matrix[i_ch][o_ch]; - } - } - for (o_ch = 0; o_ch < num_target_ch; o_ch++) { - input_audio[o_ch][i] = tmp_out[o_ch]; - } - for (; o_ch < num_base_ch; o_ch++) { - input_audio[o_ch][i] = 0.0f; - } - } - - return 0; -} - -WORD32 impd_init_process_audio_main_qmf(ia_drc_api_struct *p_obj_drc) - -{ - WORD32 error = 0, i, j, num_samples_per_channel; - FLOAT32 *input_buffer; - FLOAT32 *output_buffer; - FLOAT32 *audio_io_buf_real[10]; - FLOAT32 *audio_io_buf_imag[10]; - FLOAT32 *scratch_buffer; - WORD32 last_frame = 0; - scratch_buffer = (FLOAT32 *)p_obj_drc->pp_mem[1]; - input_buffer = (FLOAT32 *)p_obj_drc->pp_mem[2]; - output_buffer = (FLOAT32 *)p_obj_drc->pp_mem[3]; - - if (p_obj_drc->p_state->ui_in_bytes <= 0) { - p_obj_drc->p_state->ui_out_bytes = 0; - return 0; - } - - if ((p_obj_drc->p_state->ui_in_bytes / p_obj_drc->str_config.num_ch_in / - (p_obj_drc->str_config.pcm_size >> 3)) < - (UWORD32)p_obj_drc->str_config.frame_size) - last_frame = 1; - for (i = 0; i < p_obj_drc->str_config.num_ch_in; i++) { - audio_io_buf_real[i] = - scratch_buffer + i * (p_obj_drc->str_config.frame_size + 32); - audio_io_buf_imag[i] = - scratch_buffer + - p_obj_drc->str_config.num_ch_in * p_obj_drc->str_config.frame_size + - p_obj_drc->str_config.num_ch_in * 64 + - i * (p_obj_drc->str_config.frame_size + 64); - for (j = 0; j < p_obj_drc->str_config.frame_size; j++) { - audio_io_buf_real[i][j] = - input_buffer[j * p_obj_drc->str_config.num_ch_in + i]; - audio_io_buf_imag[i][j] = - input_buffer[p_obj_drc->str_config.num_ch_in * - p_obj_drc->str_config.frame_size + - j * p_obj_drc->str_config.num_ch_in + i]; - } - } - - error = impd_process_drc_bitstream_dec_gain( - p_obj_drc->str_payload.pstr_bitstream_dec, p_obj_drc->pstr_bit_buf, - p_obj_drc->str_payload.pstr_drc_config, - p_obj_drc->str_payload.pstr_drc_gain, - &p_obj_drc->str_bit_handler - .it_bit_buf[p_obj_drc->str_bit_handler.byte_index_bs], - p_obj_drc->str_bit_handler.num_bytes_bs, - p_obj_drc->str_bit_handler.num_bits_offset_bs, - &p_obj_drc->str_bit_handler.num_bits_read_bs); - - if (error > PROC_COMPLETE) return -1; - - p_obj_drc->str_bit_handler.num_bytes_read_bs = - (p_obj_drc->str_bit_handler.num_bits_read_bs >> 3); - p_obj_drc->str_bit_handler.num_bits_offset_bs = - (p_obj_drc->str_bit_handler.num_bits_read_bs & 7); - p_obj_drc->str_bit_handler.byte_index_bs += - p_obj_drc->str_bit_handler.num_bytes_read_bs; - if (p_obj_drc->str_bit_handler.gain_stream_flag == - 0) // ITTIAM: Flag for applying gain frame by frame - { - p_obj_drc->str_bit_handler.num_bytes_bs -= - p_obj_drc->str_bit_handler.num_bytes_read_bs; - } - - if (p_obj_drc->str_config.bitstream_file_format == - BITSTREAM_FILE_FORMAT_SPLIT) { - if (p_obj_drc->str_bit_handler.num_bits_offset_bs != 0) { - p_obj_drc->str_bit_handler.num_bits_read_bs = - p_obj_drc->str_bit_handler.num_bits_read_bs + 8 - - p_obj_drc->str_bit_handler.num_bits_offset_bs; - p_obj_drc->str_bit_handler.num_bytes_read_bs = - p_obj_drc->str_bit_handler.num_bytes_read_bs + 1; - p_obj_drc->str_bit_handler.num_bits_offset_bs = 0; - p_obj_drc->str_bit_handler.byte_index_bs = - p_obj_drc->str_bit_handler.byte_index_bs + 1; - if (p_obj_drc->str_bit_handler.gain_stream_flag == - 0) // ITTIAM: Flag for applying gain frame by frame - { - p_obj_drc->str_bit_handler.num_bytes_bs = - p_obj_drc->str_bit_handler.num_bytes_bs - 1; - } - } - } - - error = impd_drc_process_freq_domain( - p_obj_drc->str_payload.pstr_gain_dec[0], - p_obj_drc->str_payload.pstr_drc_config, - p_obj_drc->str_payload.pstr_drc_gain, audio_io_buf_real, - audio_io_buf_imag, p_obj_drc->str_payload.pstr_drc_sel_proc_output - ->loudness_normalization_gain_db, - p_obj_drc->str_payload.pstr_drc_sel_proc_output->boost, - p_obj_drc->str_payload.pstr_drc_sel_proc_output->compress, - p_obj_drc->str_payload.pstr_drc_sel_proc_output - ->drc_characteristic_target); - if (error) return -1; - - error = impd_down_mix(p_obj_drc->str_payload.pstr_drc_sel_proc_output, - audio_io_buf_real, p_obj_drc->str_config.frame_size); - if (error) return -1; - - error = impd_down_mix(p_obj_drc->str_payload.pstr_drc_sel_proc_output, - audio_io_buf_imag, p_obj_drc->str_config.frame_size); - if (error) return -1; - - error = impd_drc_process_freq_domain( - p_obj_drc->str_payload.pstr_gain_dec[1], - p_obj_drc->str_payload.pstr_drc_config, - p_obj_drc->str_payload.pstr_drc_gain, audio_io_buf_real, - audio_io_buf_imag, p_obj_drc->str_payload.pstr_drc_sel_proc_output - ->loudness_normalization_gain_db, - p_obj_drc->str_payload.pstr_drc_sel_proc_output->boost, - p_obj_drc->str_payload.pstr_drc_sel_proc_output->compress, - p_obj_drc->str_payload.pstr_drc_sel_proc_output - ->drc_characteristic_target); - if (error) return -1; - - if (p_obj_drc->str_payload.pstr_drc_sel_proc_output - ->loudness_normalization_gain_db != 0.0f) { - FLOAT32 loudness_normalization_gain = - (FLOAT32)pow(10.0, p_obj_drc->str_payload.pstr_drc_sel_proc_output - ->loudness_normalization_gain_db / - 20.0); - for (i = 0; i < p_obj_drc->str_config.num_ch_out; i++) { - for (j = 0; j < p_obj_drc->str_config.frame_size; j++) { - audio_io_buf_real[i][j] *= loudness_normalization_gain; - audio_io_buf_imag[i][j] *= loudness_normalization_gain; - } - } - } - num_samples_per_channel = p_obj_drc->str_config.frame_size; - - for (i = 0; i < p_obj_drc->str_config.num_ch_out; i++) { - for (j = 0; j < p_obj_drc->str_config.frame_size; j++) { - output_buffer[j * p_obj_drc->str_config.num_ch_out + i] = - audio_io_buf_real[i][j]; - output_buffer[p_obj_drc->str_config.frame_size * - p_obj_drc->str_config.num_ch_in + - j * p_obj_drc->str_config.num_ch_out + i] = - audio_io_buf_imag[i][j]; - } - } - p_obj_drc->p_state->ui_out_bytes = - p_obj_drc->str_config.num_ch_out * (p_obj_drc->str_config.frame_size) * 4; - p_obj_drc->p_state->ui_out_bytes = - p_obj_drc->str_config.num_ch_out * - (p_obj_drc->p_state->ui_in_bytes / p_obj_drc->str_config.num_ch_in); - - if (last_frame == 0) { - if (p_obj_drc->str_config.bitstream_file_format != - BITSTREAM_FILE_FORMAT_SPLIT) { - error = impd_process_drc_bitstream_dec( - p_obj_drc->str_payload.pstr_bitstream_dec, p_obj_drc->pstr_bit_buf, - p_obj_drc->str_payload.pstr_drc_config, - p_obj_drc->str_payload.pstr_loudness_info, - &p_obj_drc->str_bit_handler - .it_bit_buf[p_obj_drc->str_bit_handler.byte_index_bs], - p_obj_drc->str_bit_handler.num_bytes_bs, - p_obj_drc->str_bit_handler.num_bits_offset_bs, - &p_obj_drc->str_bit_handler.num_bits_read_bs); - - if (error > PROC_COMPLETE) return -1; - - p_obj_drc->str_bit_handler.num_bytes_read_bs = - (p_obj_drc->str_bit_handler.num_bits_read_bs >> 3); - p_obj_drc->str_bit_handler.num_bits_offset_bs = - (p_obj_drc->str_bit_handler.num_bits_read_bs & 7); - p_obj_drc->str_bit_handler.byte_index_bs += - p_obj_drc->str_bit_handler.num_bytes_read_bs; - p_obj_drc->str_bit_handler.num_bytes_bs -= - p_obj_drc->str_bit_handler.num_bytes_read_bs; - } - } - return error; -} diff --git a/decoder/drc_src/impd_drc_main_stft_process.c b/decoder/drc_src/impd_drc_main_stft_process.c deleted file mode 100644 index c1e89e1..0000000 --- a/decoder/drc_src/impd_drc_main_stft_process.c +++ /dev/null @@ -1,254 +0,0 @@ -/****************************************************************************** - * - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - ***************************************************************************** - * Originally developed and contributed by Ittiam Systems Pvt. Ltd, Bangalore -*/ -#include <math.h> -#include "impd_type_def.h" -#include "impd_memory_standards.h" -#include "impd_drc_bitbuffer.h" -#include "impd_drc_extr_delta_coded_info.h" -#include "impd_drc_common.h" -#include "impd_drc_struct.h" -#include "impd_drc_interface.h" -#include "impd_drc_peak_limiter.h" -#include "impd_drc_bitstream_dec_api.h" -#include "impd_drc_gain_dec.h" -#include "impd_drc_filter_bank.h" -#include "impd_drc_multi_band.h" -#include "impd_drc_process_audio.h" -#include "impd_parametric_drc_dec.h" -#include "impd_drc_eq.h" -#include "impd_drc_gain_decoder.h" -#include "impd_drc_selection_process.h" -#include "impd_drc_api_struct_def.h" - -#define BITSTREAM_FILE_FORMAT_SPLIT 1 - -static WORD32 impd_down_mix( - ia_drc_sel_proc_output_struct *uni_drc_sel_proc_output, - FLOAT32 **input_audio, WORD32 frame_len) { - WORD32 num_base_ch = uni_drc_sel_proc_output->base_channel_count; - WORD32 num_target_ch = uni_drc_sel_proc_output->target_channel_count; - WORD32 i, i_ch, o_ch; - FLOAT32 tmp_out[MAX_CHANNEL_COUNT]; - - if (uni_drc_sel_proc_output->downmix_matrix_present == 0) return 0; - - if (input_audio == 0) return 0; - - if (num_target_ch > MAX_CHANNEL_COUNT) return -1; - - if (num_target_ch > num_base_ch) return -1; - - for (i = 0; i < frame_len; i++) { - for (o_ch = 0; o_ch < num_target_ch; o_ch++) { - tmp_out[o_ch] = 0.0f; - for (i_ch = 0; i_ch < num_base_ch; i_ch++) { - tmp_out[o_ch] += input_audio[i_ch][i] * - uni_drc_sel_proc_output->downmix_matrix[i_ch][o_ch]; - } - } - for (o_ch = 0; o_ch < num_target_ch; o_ch++) { - input_audio[o_ch][i] = tmp_out[o_ch]; - } - for (; o_ch < num_base_ch; o_ch++) { - input_audio[o_ch][i] = 0.0f; - } - } - - return 0; -} - -WORD32 impd_init_process_audio_main_stft(ia_drc_api_struct *p_obj_drc) - -{ - WORD32 error = 0, i, j, num_samples_per_channel; - FLOAT32 *input_buffer; - FLOAT32 *output_buffer; - FLOAT32 *audio_io_buf_real[10]; - FLOAT32 *audio_io_buf_imag[10]; - FLOAT32 *scratch_buffer; - WORD32 last_frame = 0; - scratch_buffer = (FLOAT32 *)p_obj_drc->pp_mem[1]; - input_buffer = (FLOAT32 *)p_obj_drc->pp_mem[2]; - output_buffer = (FLOAT32 *)p_obj_drc->pp_mem[3]; - - if (p_obj_drc->p_state->ui_in_bytes <= 0) { - p_obj_drc->p_state->ui_out_bytes = 0; - return 0; - } - - if ((p_obj_drc->p_state->ui_in_bytes / p_obj_drc->str_config.num_ch_in / - (p_obj_drc->str_config.pcm_size >> 3)) < - (UWORD32)p_obj_drc->str_config.frame_size) - last_frame = 1; - for (i = 0; i < p_obj_drc->str_config.num_ch_in; i++) { - audio_io_buf_real[i] = - scratch_buffer + i * (p_obj_drc->str_config.frame_size + 32); - audio_io_buf_imag[i] = - scratch_buffer + - p_obj_drc->str_config.num_ch_in * p_obj_drc->str_config.frame_size + - p_obj_drc->str_config.num_ch_in * 64 + - i * (p_obj_drc->str_config.frame_size + 64); - for (j = 0; j < p_obj_drc->str_config.frame_size; j++) { - audio_io_buf_real[i][j] = - input_buffer[j * p_obj_drc->str_config.num_ch_in + i]; - audio_io_buf_imag[i][j] = - input_buffer[p_obj_drc->str_config.num_ch_in * - p_obj_drc->str_config.frame_size + - j * p_obj_drc->str_config.num_ch_in + i]; - } - } - - error = impd_process_drc_bitstream_dec_gain( - p_obj_drc->str_payload.pstr_bitstream_dec, p_obj_drc->pstr_bit_buf, - p_obj_drc->str_payload.pstr_drc_config, - p_obj_drc->str_payload.pstr_drc_gain, - &p_obj_drc->str_bit_handler - .it_bit_buf[p_obj_drc->str_bit_handler.byte_index_bs], - p_obj_drc->str_bit_handler.num_bytes_bs, - p_obj_drc->str_bit_handler.num_bits_offset_bs, - &p_obj_drc->str_bit_handler.num_bits_read_bs); - - if (error > PROC_COMPLETE) return -1; - - p_obj_drc->str_bit_handler.num_bytes_read_bs = - (p_obj_drc->str_bit_handler.num_bits_read_bs >> 3); - p_obj_drc->str_bit_handler.num_bits_offset_bs = - (p_obj_drc->str_bit_handler.num_bits_read_bs & 7); - p_obj_drc->str_bit_handler.byte_index_bs += - p_obj_drc->str_bit_handler.num_bytes_read_bs; - if (p_obj_drc->str_bit_handler.gain_stream_flag == - 0) // ITTIAM: Flag for applying gain frame by frame - { - p_obj_drc->str_bit_handler.num_bytes_bs -= - p_obj_drc->str_bit_handler.num_bytes_read_bs; - } - - if (p_obj_drc->str_config.bitstream_file_format == - BITSTREAM_FILE_FORMAT_SPLIT) { - if (p_obj_drc->str_bit_handler.num_bits_offset_bs != 0) { - p_obj_drc->str_bit_handler.num_bits_read_bs = - p_obj_drc->str_bit_handler.num_bits_read_bs + 8 - - p_obj_drc->str_bit_handler.num_bits_offset_bs; - p_obj_drc->str_bit_handler.num_bytes_read_bs = - p_obj_drc->str_bit_handler.num_bytes_read_bs + 1; - p_obj_drc->str_bit_handler.num_bits_offset_bs = 0; - p_obj_drc->str_bit_handler.byte_index_bs = - p_obj_drc->str_bit_handler.byte_index_bs + 1; - if (p_obj_drc->str_bit_handler.gain_stream_flag == - 0) // ITTIAM: Flag for applying gain frame by frame - { - p_obj_drc->str_bit_handler.num_bytes_bs = - p_obj_drc->str_bit_handler.num_bytes_bs - 1; - } - } - } - - error = impd_drc_process_freq_domain( - p_obj_drc->str_payload.pstr_gain_dec[0], - p_obj_drc->str_payload.pstr_drc_config, - p_obj_drc->str_payload.pstr_drc_gain, audio_io_buf_real, - audio_io_buf_imag, p_obj_drc->str_payload.pstr_drc_sel_proc_output - ->loudness_normalization_gain_db, - p_obj_drc->str_payload.pstr_drc_sel_proc_output->boost, - p_obj_drc->str_payload.pstr_drc_sel_proc_output->compress, - p_obj_drc->str_payload.pstr_drc_sel_proc_output - ->drc_characteristic_target); - if (error) return -1; - - error = impd_down_mix(p_obj_drc->str_payload.pstr_drc_sel_proc_output, - audio_io_buf_real, p_obj_drc->str_config.frame_size); - if (error) return -1; - - error = impd_down_mix(p_obj_drc->str_payload.pstr_drc_sel_proc_output, - audio_io_buf_imag, p_obj_drc->str_config.frame_size); - if (error) return -1; - - error = impd_drc_process_freq_domain( - p_obj_drc->str_payload.pstr_gain_dec[1], - p_obj_drc->str_payload.pstr_drc_config, - p_obj_drc->str_payload.pstr_drc_gain, audio_io_buf_real, - audio_io_buf_imag, p_obj_drc->str_payload.pstr_drc_sel_proc_output - ->loudness_normalization_gain_db, - p_obj_drc->str_payload.pstr_drc_sel_proc_output->boost, - p_obj_drc->str_payload.pstr_drc_sel_proc_output->compress, - p_obj_drc->str_payload.pstr_drc_sel_proc_output - ->drc_characteristic_target); - if (error) return -1; - - if (p_obj_drc->str_payload.pstr_drc_sel_proc_output - ->loudness_normalization_gain_db != 0.0f) { - FLOAT32 loudness_normalization_gain = - (FLOAT32)pow(10.0, p_obj_drc->str_payload.pstr_drc_sel_proc_output - ->loudness_normalization_gain_db / - 20.0); - for (i = 0; i < p_obj_drc->str_config.num_ch_out; i++) { - for (j = 0; j < p_obj_drc->str_config.frame_size; j++) { - audio_io_buf_real[i][j] *= loudness_normalization_gain; - audio_io_buf_imag[i][j] *= loudness_normalization_gain; - } - } - } - - num_samples_per_channel = p_obj_drc->str_config.frame_size; - - for (i = 0; i < p_obj_drc->str_config.num_ch_out; i++) { - for (j = 0; j < p_obj_drc->str_config.frame_size; j++) { - output_buffer[j * p_obj_drc->str_config.num_ch_out + i] = - audio_io_buf_real[i][j]; - output_buffer[p_obj_drc->str_config.frame_size * - p_obj_drc->str_config.num_ch_in + - j * p_obj_drc->str_config.num_ch_out + i] = - audio_io_buf_imag[i][j]; - } - } - p_obj_drc->p_state->ui_out_bytes = - p_obj_drc->str_config.num_ch_out * (p_obj_drc->str_config.frame_size) * 4; - p_obj_drc->p_state->ui_out_bytes = - p_obj_drc->str_config.num_ch_out * - (p_obj_drc->p_state->ui_in_bytes / p_obj_drc->str_config.num_ch_in); - - if (last_frame == 0) { - if (p_obj_drc->str_config.bitstream_file_format != - BITSTREAM_FILE_FORMAT_SPLIT) { - error = impd_process_drc_bitstream_dec( - p_obj_drc->str_payload.pstr_bitstream_dec, p_obj_drc->pstr_bit_buf, - p_obj_drc->str_payload.pstr_drc_config, - p_obj_drc->str_payload.pstr_loudness_info, - &p_obj_drc->str_bit_handler - .it_bit_buf[p_obj_drc->str_bit_handler.byte_index_bs], - p_obj_drc->str_bit_handler.num_bytes_bs, - p_obj_drc->str_bit_handler.num_bits_offset_bs, - &p_obj_drc->str_bit_handler.num_bits_read_bs); - - if (error > PROC_COMPLETE) return -1; - - p_obj_drc->str_bit_handler.num_bytes_read_bs = - (p_obj_drc->str_bit_handler.num_bits_read_bs >> 3); - p_obj_drc->str_bit_handler.num_bits_offset_bs = - (p_obj_drc->str_bit_handler.num_bits_read_bs & 7); - p_obj_drc->str_bit_handler.byte_index_bs += - p_obj_drc->str_bit_handler.num_bytes_read_bs; - p_obj_drc->str_bit_handler.num_bytes_bs -= - p_obj_drc->str_bit_handler.num_bytes_read_bs; - } - } - - return error; -} diff --git a/decoder/drc_src/impd_drc_main_td_process.c b/decoder/drc_src/impd_drc_main_td_process.c index 6449531..e9d0131 100644 --- a/decoder/drc_src/impd_drc_main_td_process.c +++ b/decoder/drc_src/impd_drc_main_td_process.c @@ -111,29 +111,16 @@ IA_ERRORCODE impd_process_time_domain(ia_drc_api_struct *p_obj_drc) { (p_obj_drc->str_bit_handler.num_bits_read_bs & 7); p_obj_drc->str_bit_handler.byte_index_bs += p_obj_drc->str_bit_handler.num_bytes_read_bs; - if (p_obj_drc->str_bit_handler.gain_stream_flag == - 0) // ITTIAM: Flag for applying gain frame by frame - { - p_obj_drc->str_bit_handler.num_bytes_bs -= - p_obj_drc->str_bit_handler.num_bytes_read_bs; - } - if (p_obj_drc->str_config.bitstream_file_format == - BITSTREAM_FILE_FORMAT_SPLIT) { - if (p_obj_drc->str_bit_handler.num_bits_offset_bs != 0) { - p_obj_drc->str_bit_handler.num_bits_read_bs = - p_obj_drc->str_bit_handler.num_bits_read_bs + 8 - - p_obj_drc->str_bit_handler.num_bits_offset_bs; - p_obj_drc->str_bit_handler.num_bytes_read_bs = - p_obj_drc->str_bit_handler.num_bytes_read_bs + 1; - p_obj_drc->str_bit_handler.num_bits_offset_bs = 0; - p_obj_drc->str_bit_handler.byte_index_bs = - p_obj_drc->str_bit_handler.byte_index_bs + 1; - if (p_obj_drc->str_bit_handler.gain_stream_flag == 0) { - p_obj_drc->str_bit_handler.num_bytes_bs = - p_obj_drc->str_bit_handler.num_bytes_bs - 1; - } - } + if (p_obj_drc->str_bit_handler.num_bits_offset_bs != 0) { + p_obj_drc->str_bit_handler.num_bits_read_bs = + p_obj_drc->str_bit_handler.num_bits_read_bs + 8 - + p_obj_drc->str_bit_handler.num_bits_offset_bs; + p_obj_drc->str_bit_handler.num_bytes_read_bs = + p_obj_drc->str_bit_handler.num_bytes_read_bs + 1; + p_obj_drc->str_bit_handler.num_bits_offset_bs = 0; + p_obj_drc->str_bit_handler.byte_index_bs = + p_obj_drc->str_bit_handler.byte_index_bs + 1; } num_sample_to_process = @@ -294,32 +281,5 @@ IA_ERRORCODE impd_process_time_domain(ia_drc_api_struct *p_obj_drc) { p_obj_drc->str_config.num_ch_out * (p_obj_drc->str_config.pcm_size >> 3); } - - if (last_frame == 0) { - if (p_obj_drc->str_config.bitstream_file_format != - BITSTREAM_FILE_FORMAT_SPLIT) { - err_code = impd_process_drc_bitstream_dec( - p_obj_drc->str_payload.pstr_bitstream_dec, p_obj_drc->pstr_bit_buf, - p_obj_drc->str_payload.pstr_drc_config, - p_obj_drc->str_payload.pstr_loudness_info, - &p_obj_drc->str_bit_handler - .it_bit_buf[p_obj_drc->str_bit_handler.byte_index_bs], - p_obj_drc->str_bit_handler.num_bytes_bs, - p_obj_drc->str_bit_handler.num_bits_offset_bs, - &p_obj_drc->str_bit_handler.num_bits_read_bs); - - if (err_code > PROC_COMPLETE) return -1; - - p_obj_drc->str_bit_handler.num_bytes_read_bs = - (p_obj_drc->str_bit_handler.num_bits_read_bs >> 3); - p_obj_drc->str_bit_handler.num_bits_offset_bs = - (p_obj_drc->str_bit_handler.num_bits_read_bs & 7); - p_obj_drc->str_bit_handler.byte_index_bs += - p_obj_drc->str_bit_handler.num_bytes_read_bs; - p_obj_drc->str_bit_handler.num_bytes_bs -= - p_obj_drc->str_bit_handler.num_bytes_read_bs; - } - } - return err_code; } diff --git a/decoder/drc_src/impd_drc_main_td_qmf_process.c b/decoder/drc_src/impd_drc_main_td_qmf_process.c deleted file mode 100644 index 2697c54..0000000 --- a/decoder/drc_src/impd_drc_main_td_qmf_process.c +++ /dev/null @@ -1,364 +0,0 @@ -/****************************************************************************** - * - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - ***************************************************************************** - * Originally developed and contributed by Ittiam Systems Pvt. Ltd, Bangalore -*/ -#include <math.h> -#include "impd_type_def.h" -#include "impd_memory_standards.h" -#include "impd_drc_peak_limiter.h" -#include "impd_drc_extr_delta_coded_info.h" -#include "impd_drc_common.h" -#include "impd_drc_struct.h" -#include "impd_drc_interface.h" -#include "impd_drc_bitbuffer.h" -#include "impd_drc_bitstream_dec_api.h" -#include "impd_drc_gain_dec.h" -#include "impd_drc_filter_bank.h" -#include "impd_drc_multi_band.h" -#include "impd_drc_process_audio.h" -#include "impd_parametric_drc_dec.h" -#include "impd_drc_eq.h" -#include "impd_drc_gain_decoder.h" -#include "impd_drc_selection_process.h" -#include "impd_drc_api_struct_def.h" -#include "impd_drc_hashdefines.h" -#include "impd_drc_rom.h" - -VOID process_qmf_syn_filt_bank(ia_drc_qmf_filt_struct *qmf_filt, FLOAT64 *buff, - FLOAT32 *input_real, FLOAT32 *input_imag, - FLOAT32 *output) { - WORD32 i, j; - FLOAT64 U[10 * QMF_NUM_FILT_BANDS]; - FLOAT64 W[10 * QMF_NUM_FILT_BANDS]; - - FLOAT64 tmp; - - for (i = 20 * QMF_FILT_RESOLUTION - 1; i >= 2 * QMF_FILT_RESOLUTION; i--) { - buff[i] = buff[i - 2 * QMF_FILT_RESOLUTION]; - } - - for (i = 0; i < 2 * QMF_FILT_RESOLUTION; i++) { - tmp = 0.0; - for (j = 0; j < QMF_FILT_RESOLUTION; j++) { - tmp = tmp + input_real[j] * qmf_filt->syn_tab_real[i][j] - - input_imag[j] * qmf_filt->syn_tab_imag[i][j]; - } - buff[i] = tmp; - } - - for (i = 0; i < 5; i++) { - for (j = 0; j < QMF_FILT_RESOLUTION; j++) { - U[2 * QMF_FILT_RESOLUTION * i + j] = - buff[4 * QMF_FILT_RESOLUTION * i + j]; - U[2 * QMF_FILT_RESOLUTION * i + QMF_FILT_RESOLUTION + j] = - buff[4 * QMF_FILT_RESOLUTION * i + 3 * QMF_FILT_RESOLUTION + j]; - } - } - - for (i = 0; i < 10 * QMF_FILT_RESOLUTION; i++) { - W[i] = U[i] * qmf_filter_coeff[i]; - } - - for (i = 0; i < QMF_FILT_RESOLUTION; i++) { - tmp = 0.0; - for (j = 0; j < 10; j++) { - tmp = tmp + W[QMF_FILT_RESOLUTION * j + i]; - } - output[i] = (FLOAT32)tmp; - } -} - -VOID process_qmf_ana_filt_bank(ia_drc_qmf_filt_struct *qmf_filt, FLOAT64 *buff, - FLOAT32 *input, FLOAT32 *output_real, - FLOAT32 *output_imag) { - WORD32 i, j; - FLOAT32 Z[10 * QMF_NUM_FILT_BANDS]; - FLOAT32 Y[2 * QMF_NUM_FILT_BANDS]; - - for (i = 10 * QMF_FILT_RESOLUTION - 1; i >= QMF_FILT_RESOLUTION; i--) { - buff[i] = buff[i - QMF_FILT_RESOLUTION]; - } - - for (i = QMF_FILT_RESOLUTION - 1; i >= 0; i--) { - buff[i] = input[QMF_FILT_RESOLUTION - 1 - i]; - } - - for (i = 0; i < 10 * QMF_FILT_RESOLUTION; i++) { - Z[i] = (FLOAT32)(buff[i] * qmf_filter_coeff[i]); - } - - for (i = 0; i < 2 * QMF_FILT_RESOLUTION; i++) { - Y[i] = 0.0f; - for (j = 0; j < 5; j++) { - Y[i] += Z[i + j * 2 * QMF_FILT_RESOLUTION]; - } - } - - for (i = 0; i < QMF_FILT_RESOLUTION; i++) { - output_real[i] = 0.0f; - output_imag[i] = 0.0f; - for (j = 0; j < 2 * QMF_FILT_RESOLUTION; j++) { - output_real[i] += (FLOAT32)(Y[j] * qmf_filt->ana_tab_real[i][j]); - output_imag[i] += (FLOAT32)(Y[j] * qmf_filt->ana_tab_imag[i][j]); - } - } -} - -static WORD32 impd_down_mix( - ia_drc_sel_proc_output_struct *uni_drc_sel_proc_output, - FLOAT32 **input_audio, WORD32 frame_len) { - WORD32 num_base_ch = uni_drc_sel_proc_output->base_channel_count; - WORD32 num_target_ch = uni_drc_sel_proc_output->target_channel_count; - WORD32 i, i_ch, o_ch; - FLOAT32 tmp_out[MAX_CHANNEL_COUNT]; - - if (num_target_ch > MAX_CHANNEL_COUNT) return -1; - - if (num_target_ch > num_base_ch) return -1; - - for (i = 0; i < frame_len; i++) { - for (o_ch = 0; o_ch < num_target_ch; o_ch++) { - tmp_out[o_ch] = 0.0f; - for (i_ch = 0; i_ch < num_base_ch; i_ch++) { - tmp_out[o_ch] += input_audio[i_ch][i] * - uni_drc_sel_proc_output->downmix_matrix[i_ch][o_ch]; - } - } - for (o_ch = 0; o_ch < num_target_ch; o_ch++) { - input_audio[o_ch][i] = tmp_out[o_ch]; - } - for (; o_ch < num_base_ch; o_ch++) { - input_audio[o_ch][i] = 0.0f; - } - } - - return 0; -} - -WORD32 impd_init_process_audio_main_td_qmf(ia_drc_api_struct *p_obj_drc) - -{ - WORD32 error, i, j, num_samples_per_channel; - FLOAT32 *input_buffer; - WORD16 *input_buffer16, *output_buffer16; - FLOAT32 *output_buffer; - FLOAT32 *audio_io_buf_real[10]; - FLOAT32 *audio_io_buf_imag[10]; - FLOAT32 *audio_in_out_buf[10]; - FLOAT32 *scratch_buffer; - WORD32 last_frame = 0; - error = 0; - scratch_buffer = (FLOAT32 *)p_obj_drc->pp_mem[1]; - input_buffer = (FLOAT32 *)p_obj_drc->pp_mem[2]; - output_buffer = (FLOAT32 *)p_obj_drc->pp_mem[3]; - - input_buffer16 = (WORD16 *)p_obj_drc->pp_mem[2]; - output_buffer16 = (WORD16 *)p_obj_drc->pp_mem[3]; - - if (p_obj_drc->p_state->ui_in_bytes <= 0) { - p_obj_drc->p_state->ui_out_bytes = 0; - return 0; - } - - if ((p_obj_drc->p_state->ui_in_bytes / p_obj_drc->str_config.num_ch_in / - (p_obj_drc->str_config.pcm_size >> 3)) < - (UWORD32)p_obj_drc->str_config.frame_size) - last_frame = 1; - - for (i = 0; i < p_obj_drc->str_config.num_ch_in; i++) { - audio_in_out_buf[i] = scratch_buffer; - scratch_buffer = scratch_buffer + (p_obj_drc->str_config.frame_size + 32); - audio_io_buf_real[i] = - scratch_buffer + - (p_obj_drc->str_config.frame_size * p_obj_drc->str_config.num_ch_in + - 512); - audio_io_buf_imag[i] = scratch_buffer + - 2 * (p_obj_drc->str_config.frame_size * - p_obj_drc->str_config.num_ch_in + - 512); - ; - for (j = 0; j < p_obj_drc->str_config.frame_size; j++) { - if (p_obj_drc->str_config.pcm_size == 16) { - audio_in_out_buf[i][j] = - ((FLOAT32)input_buffer16[j * p_obj_drc->str_config.num_ch_in + i]) / - 32767.0f; - } else { - audio_in_out_buf[i][j] = - input_buffer[j * p_obj_drc->str_config.num_ch_in + i]; - } - } - } - - error = impd_process_drc_bitstream_dec_gain( - p_obj_drc->str_payload.pstr_bitstream_dec, p_obj_drc->pstr_bit_buf, - p_obj_drc->str_payload.pstr_drc_config, - p_obj_drc->str_payload.pstr_drc_gain, - &p_obj_drc->str_bit_handler - .it_bit_buf[p_obj_drc->str_bit_handler.byte_index_bs], - p_obj_drc->str_bit_handler.num_bytes_bs, - p_obj_drc->str_bit_handler.num_bits_offset_bs, - &p_obj_drc->str_bit_handler.num_bits_read_bs); - - if (error > PROC_COMPLETE) return -1; - - p_obj_drc->str_bit_handler.num_bytes_read_bs = - (p_obj_drc->str_bit_handler.num_bits_read_bs >> 3); - p_obj_drc->str_bit_handler.num_bits_offset_bs = - (p_obj_drc->str_bit_handler.num_bits_read_bs & 7); - p_obj_drc->str_bit_handler.byte_index_bs += - p_obj_drc->str_bit_handler.num_bytes_read_bs; - if (p_obj_drc->str_bit_handler.gain_stream_flag == - 0) // ITTIAM: Flag for applying gain frame by frame - { - p_obj_drc->str_bit_handler.num_bytes_bs -= - p_obj_drc->str_bit_handler.num_bytes_read_bs; - } - if (p_obj_drc->str_config.bitstream_file_format == - BITSTREAM_FILE_FORMAT_SPLIT) { - /* shift over fill-bits for frame byte alignment */ - if (p_obj_drc->str_bit_handler.num_bits_offset_bs != 0) { - p_obj_drc->str_bit_handler.num_bits_read_bs = - p_obj_drc->str_bit_handler.num_bits_read_bs + 8 - - p_obj_drc->str_bit_handler.num_bits_offset_bs; - p_obj_drc->str_bit_handler.num_bytes_read_bs = - p_obj_drc->str_bit_handler.num_bytes_read_bs + 1; - p_obj_drc->str_bit_handler.num_bits_offset_bs = 0; - p_obj_drc->str_bit_handler.byte_index_bs = - p_obj_drc->str_bit_handler.byte_index_bs + 1; - if (p_obj_drc->str_bit_handler.gain_stream_flag == - 0) // ITTIAM: Flag for applying gain frame by frame - { - p_obj_drc->str_bit_handler.num_bytes_bs = - p_obj_drc->str_bit_handler.num_bytes_bs - 1; - } - } - } - - for (i = 0; i < p_obj_drc->str_config.num_ch_in; i++) { - for (j = 0; j < p_obj_drc->str_config.frame_size; j += 64) { - process_qmf_ana_filt_bank( - p_obj_drc->str_payload.pstr_qmf_filter, - p_obj_drc->str_payload.pstr_qmf_filter->ana_buff + - i * 4 * p_obj_drc->str_config.frame_size, - &(audio_in_out_buf[i][j]), &(audio_io_buf_real[i][j]), - &(audio_io_buf_imag[i][j])); - } - } - error = impd_drc_process_freq_domain( - p_obj_drc->str_payload.pstr_gain_dec[0], - p_obj_drc->str_payload.pstr_drc_config, - p_obj_drc->str_payload.pstr_drc_gain, audio_io_buf_real, - audio_io_buf_imag, p_obj_drc->str_payload.pstr_drc_sel_proc_output - ->loudness_normalization_gain_db, - p_obj_drc->str_payload.pstr_drc_sel_proc_output->boost, - p_obj_drc->str_payload.pstr_drc_sel_proc_output->compress, - p_obj_drc->str_payload.pstr_drc_sel_proc_output - ->drc_characteristic_target); - - if (error) return error; - - if (p_obj_drc->str_payload.pstr_drc_sel_proc_output->target_channel_count < - p_obj_drc->str_payload.pstr_drc_sel_proc_output->base_channel_count) { - error = impd_down_mix(p_obj_drc->str_payload.pstr_drc_sel_proc_output, - audio_io_buf_real, p_obj_drc->str_config.frame_size); - if (error) return error; - - error = impd_down_mix(p_obj_drc->str_payload.pstr_drc_sel_proc_output, - audio_io_buf_imag, p_obj_drc->str_config.frame_size); - if (error) return error; - } - - error = impd_drc_process_freq_domain( - p_obj_drc->str_payload.pstr_gain_dec[1], - p_obj_drc->str_payload.pstr_drc_config, - p_obj_drc->str_payload.pstr_drc_gain, audio_io_buf_real, - audio_io_buf_imag, p_obj_drc->str_payload.pstr_drc_sel_proc_output - ->loudness_normalization_gain_db, - p_obj_drc->str_payload.pstr_drc_sel_proc_output->boost, - p_obj_drc->str_payload.pstr_drc_sel_proc_output->compress, - p_obj_drc->str_payload.pstr_drc_sel_proc_output - ->drc_characteristic_target); - if (error) return -1; - for (i = 0; i < p_obj_drc->str_config.num_ch_out; i++) { - for (j = 0; j < p_obj_drc->str_config.frame_size; j += 64) { - process_qmf_syn_filt_bank( - p_obj_drc->str_payload.pstr_qmf_filter, - p_obj_drc->str_payload.pstr_qmf_filter->syn_buff + - i * 4 * p_obj_drc->str_config.frame_size, - &(audio_io_buf_real[i][j]), &(audio_io_buf_imag[i][j]), - &(audio_in_out_buf[i][j])); - } - } - - if (p_obj_drc->str_payload.pstr_drc_sel_proc_output - ->loudness_normalization_gain_db != 0.0f) { - FLOAT32 loudness_normalization_gain = - (FLOAT32)pow(10.0, p_obj_drc->str_payload.pstr_drc_sel_proc_output - ->loudness_normalization_gain_db / - 20.0); - for (i = 0; i < p_obj_drc->str_config.num_ch_out; i++) { - for (j = 0; j < p_obj_drc->str_config.frame_size; j++) { - audio_io_buf_real[i][j] *= loudness_normalization_gain; - audio_io_buf_imag[i][j] *= loudness_normalization_gain; - } - } - } - - num_samples_per_channel = p_obj_drc->str_config.frame_size; - - for (i = 0; i < p_obj_drc->str_config.num_ch_out; i++) { - for (j = 0; j < p_obj_drc->str_config.frame_size; j++) { - if (p_obj_drc->str_config.pcm_size == 16) { - output_buffer16[j * p_obj_drc->str_config.num_ch_out + i] = - (WORD16)(audio_in_out_buf[i][j] * 32767.0f); - } else { - output_buffer[j * p_obj_drc->str_config.num_ch_out + i] = - audio_in_out_buf[i][j]; - } - } - } - p_obj_drc->p_state->ui_out_bytes = - p_obj_drc->str_config.num_ch_out * - (p_obj_drc->p_state->ui_in_bytes / p_obj_drc->str_config.num_ch_in); - - if (p_obj_drc->str_config.bitstream_file_format != - BITSTREAM_FILE_FORMAT_SPLIT) { - error = impd_process_drc_bitstream_dec( - p_obj_drc->str_payload.pstr_bitstream_dec, p_obj_drc->pstr_bit_buf, - p_obj_drc->str_payload.pstr_drc_config, - p_obj_drc->str_payload.pstr_loudness_info, - &p_obj_drc->str_bit_handler - .it_bit_buf[p_obj_drc->str_bit_handler.byte_index_bs], - p_obj_drc->str_bit_handler.num_bytes_bs, - p_obj_drc->str_bit_handler.num_bits_offset_bs, - &p_obj_drc->str_bit_handler.num_bits_read_bs); - - if (error > PROC_COMPLETE) return -1; - - p_obj_drc->str_bit_handler.num_bytes_read_bs = - (p_obj_drc->str_bit_handler.num_bits_read_bs >> 3); - p_obj_drc->str_bit_handler.num_bits_offset_bs = - (p_obj_drc->str_bit_handler.num_bits_read_bs & 7); - p_obj_drc->str_bit_handler.byte_index_bs += - p_obj_drc->str_bit_handler.num_bytes_read_bs; - p_obj_drc->str_bit_handler.num_bytes_bs -= - p_obj_drc->str_bit_handler.num_bytes_read_bs; - } - - return error; -} diff --git a/decoder/drc_src/impd_drc_process.c b/decoder/drc_src/impd_drc_process.c index 15115a2..8000de2 100644 --- a/decoder/drc_src/impd_drc_process.c +++ b/decoder/drc_src/impd_drc_process.c @@ -176,183 +176,6 @@ WORD32 impd_apply_gains_and_add( return (0); } -/* subband-domain DRC: in-place application of DRC gains to audio frame */ -WORD32 -impd_apply_gains_subband(ia_drc_instructions_struct* pstr_drc_instruction_arr, - const WORD32 drc_instructions_index, - ia_drc_params_struct* ia_drc_params_struct, - ia_gain_buffer_struct* pstr_gain_buf, - ia_overlap_params_struct* pstr_overlap_params, - FLOAT32* deinterleaved_audio_delayed_re[], - FLOAT32* deinterleaved_audio_delayed_im[], - FLOAT32* deinterleaved_audio_re[], - FLOAT32* deinterleaved_audio_im[]) { - WORD32 c, b, g, m, s; - WORD32 gainIndexForGroup[CHANNEL_GROUP_COUNT_MAX]; - FLOAT32* lpcm_gains; - FLOAT32 gainSb, gainLr; - ia_drc_instructions_struct* str_drc_instruction_str; - WORD32 offset = 0, signalIndex = 0; - WORD32 drc_frame_sizeSb = 0; - WORD32 nDecoderSubbands = 0; - WORD32 L = 0; /* L: downsampling factor */ - WORD32 analysisDelay = 0; - switch (ia_drc_params_struct->sub_band_domain_mode) { - case SUBBAND_DOMAIN_MODE_QMF64: - nDecoderSubbands = AUDIO_CODEC_SUBBAND_COUNT_QMF64; - L = AUDIO_CODEC_SUBBAND_DOWNSAMPLING_FACTOR_QMF64; - analysisDelay = AUDIO_CODEC_SUBBAND_ANALYSE_DELAY_QMF64; - break; - case SUBBAND_DOMAIN_MODE_QMF71: - nDecoderSubbands = AUDIO_CODEC_SUBBAND_COUNT_QMF71; - L = AUDIO_CODEC_SUBBAND_DOWNSAMPLING_FACTOR_QMF71; - analysisDelay = AUDIO_CODEC_SUBBAND_ANALYSE_DELAY_QMF71; - break; - case SUBBAND_DOMAIN_MODE_STFT256: - nDecoderSubbands = AUDIO_CODEC_SUBBAND_COUNT_STFT256; - L = AUDIO_CODEC_SUBBAND_DOWNSAMPLING_FACTOR_STFT256; - analysisDelay = AUDIO_CODEC_SUBBAND_ANALYSE_DELAY_STFT256; - break; - default: - return -1; - break; - } - drc_frame_sizeSb = ia_drc_params_struct->drc_frame_size / L; - - if (drc_instructions_index >= 0) { - str_drc_instruction_str = - &(pstr_drc_instruction_arr[drc_instructions_index]); - { - if (str_drc_instruction_str->drc_set_id > 0) { - if (ia_drc_params_struct->delay_mode == DELAY_MODE_LOW_DELAY) { - offset = ia_drc_params_struct->drc_frame_size; - } - gainIndexForGroup[0] = 0; - for (g = 0; g < str_drc_instruction_str->num_drc_ch_groups - 1; g++) { - gainIndexForGroup[g + 1] = - gainIndexForGroup[g] + - str_drc_instruction_str - ->band_count_of_ch_group[g]; /* index of first gain sequence - in channel group */ - } - - for (c = 0; c < str_drc_instruction_str->audio_num_chan; c++) - - { - g = str_drc_instruction_str->channel_group_of_ch[c]; - if (g >= 0) { - for (m = 0; m < drc_frame_sizeSb; m++) { - if (str_drc_instruction_str->band_count_of_ch_group[g] > - 1) { /* multiband DRC */ - for (s = 0; s < nDecoderSubbands; s++) { - gainSb = 0.0f; - for (b = 0; - b < str_drc_instruction_str->band_count_of_ch_group[g]; - b++) { - if (str_drc_instruction_str - ->ch_group_parametric_drc_flag[g] == 0) { - lpcm_gains = - pstr_gain_buf - ->buf_interpolation[gainIndexForGroup[g] + b] - .lpcm_gains + - MAX_SIGNAL_DELAY - - ia_drc_params_struct->gain_delay_samples - - ia_drc_params_struct->audio_delay_samples + offset; - } else { - lpcm_gains = - pstr_gain_buf - ->buf_interpolation[gainIndexForGroup[g] + b] - .lpcm_gains + - MAX_SIGNAL_DELAY + - str_drc_instruction_str - ->parametric_drc_look_ahead_samples[g] - - ia_drc_params_struct->audio_delay_samples + - analysisDelay; - } - /* get gain for this timeslot by downsampling */ - gainLr = lpcm_gains[(m * L + (L - 1) / 2)]; - gainSb += pstr_overlap_params->str_group_overlap_params[g] - .str_band_overlap_params[b] - .overlap_weight[s] * - gainLr; - } - deinterleaved_audio_re[signalIndex][m * nDecoderSubbands + - s] = - gainSb * - deinterleaved_audio_delayed_re[signalIndex] - [m * nDecoderSubbands + s]; - if (ia_drc_params_struct->sub_band_domain_mode == - SUBBAND_DOMAIN_MODE_STFT256) { /* For STFT filterbank, the - real value of the - nyquist band is stored - at the imag value of the - first band */ - if (s != 0) - deinterleaved_audio_im[signalIndex][m * nDecoderSubbands + - s] = - gainSb * - deinterleaved_audio_delayed_im[signalIndex] - [m * nDecoderSubbands + - s]; - if (s == (nDecoderSubbands - 1)) - deinterleaved_audio_im[signalIndex][m * nDecoderSubbands + - 0] = - gainSb * - deinterleaved_audio_delayed_im[signalIndex] - [m * nDecoderSubbands + - 0]; - } else { - deinterleaved_audio_im[signalIndex][m * nDecoderSubbands + - s] = - gainSb * - deinterleaved_audio_delayed_im[signalIndex] - [m * nDecoderSubbands + - s]; - } - } - } else { /* single-band DRC */ - if (str_drc_instruction_str->ch_group_parametric_drc_flag[g] == - 0) { - lpcm_gains = - pstr_gain_buf->buf_interpolation[gainIndexForGroup[g]] - .lpcm_gains + - MAX_SIGNAL_DELAY - - ia_drc_params_struct->gain_delay_samples - - ia_drc_params_struct->audio_delay_samples + offset; - } else { - lpcm_gains = - pstr_gain_buf->buf_interpolation[gainIndexForGroup[g]] - .lpcm_gains + - MAX_SIGNAL_DELAY + - str_drc_instruction_str - ->parametric_drc_look_ahead_samples[g] - - ia_drc_params_struct->audio_delay_samples + analysisDelay; - } - /* get gain for this timeslot by downsampling */ - gainSb = lpcm_gains[(m * L + (L - 1) / 2)]; - for (s = 0; s < nDecoderSubbands; s++) { - deinterleaved_audio_re[signalIndex][m * nDecoderSubbands + - s] = - gainSb * - deinterleaved_audio_delayed_re[signalIndex] - [m * nDecoderSubbands + s]; - deinterleaved_audio_im[signalIndex][m * nDecoderSubbands + - s] = - gainSb * - deinterleaved_audio_delayed_im[signalIndex] - [m * nDecoderSubbands + s]; - } - } - } - } - signalIndex++; - } - } - } - } - return (0); -} - WORD32 impd_filter_banks_process(ia_drc_instructions_struct* pstr_drc_instruction_arr, const WORD32 drc_instructions_index, @@ -474,37 +297,6 @@ impd_store_audio_io_buffer_time(FLOAT32* audio_in_out_buf[], } WORD32 -impd_store_audio_io_buffer_freq(FLOAT32* audio_real_buff[], - FLOAT32* audio_imag_buff[], - ia_audio_in_out_buf* audio_io_buf_internal) { - WORD32 i, j; - - if (audio_io_buf_internal->audio_delay_sub_band_samples) { - for (i = 0; i < audio_io_buf_internal->audio_num_chan; i++) { - for (j = 0; j < audio_io_buf_internal->audio_sub_band_frame_size * - audio_io_buf_internal->audio_sub_band_count; - j++) { - audio_io_buf_internal->audio_buffer_delayed_real - [i][audio_io_buf_internal->audio_delay_sub_band_samples * - audio_io_buf_internal->audio_sub_band_count + - j] = audio_real_buff[i][j]; - audio_io_buf_internal->audio_buffer_delayed_imag - [i][audio_io_buf_internal->audio_delay_sub_band_samples * - audio_io_buf_internal->audio_sub_band_count + - j] = audio_imag_buff[i][j]; - } - } - } else { - audio_io_buf_internal->audio_buffer_delayed_real = audio_real_buff; - audio_io_buf_internal->audio_buffer_delayed_imag = audio_imag_buff; - audio_io_buf_internal->audio_real_buff = audio_real_buff; - audio_io_buf_internal->audio_imag_buff = audio_imag_buff; - } - - return 0; -} - -WORD32 impd_retrieve_audio_io_buffer_time(FLOAT32* audio_in_out_buf[], ia_audio_in_out_buf* audio_io_buf_internal) { WORD32 i, j; @@ -522,30 +314,6 @@ impd_retrieve_audio_io_buffer_time(FLOAT32* audio_in_out_buf[], } WORD32 -impd_retrieve_audio_buffer_freq(FLOAT32* audio_real_buff[], - FLOAT32* audio_imag_buff[], - ia_audio_in_out_buf* audio_io_buf_internal) { - WORD32 i, j; - - if (audio_io_buf_internal->audio_delay_sub_band_samples) { - for (i = 0; i < audio_io_buf_internal->audio_num_chan; i++) { - for (j = 0; j < audio_io_buf_internal->audio_sub_band_frame_size * - audio_io_buf_internal->audio_sub_band_count; - j++) { - audio_real_buff[i][j] = - audio_io_buf_internal->audio_buffer_delayed_real - [i][audio_io_buf_internal->audio_sub_band_count + j]; - audio_imag_buff[i][j] = - audio_io_buf_internal->audio_buffer_delayed_imag - [i][audio_io_buf_internal->audio_sub_band_count + j]; - } - } - } - - return 0; -} - -WORD32 impd_advance_audio_io_buffer_time(ia_audio_in_out_buf* audio_io_buf_internal) { WORD32 i; if (audio_io_buf_internal->audio_delay_samples) { @@ -560,27 +328,3 @@ impd_advance_audio_io_buffer_time(ia_audio_in_out_buf* audio_io_buf_internal) { return 0; } - -WORD32 -impd_advance_audio_buff_freq(ia_audio_in_out_buf* audio_io_buf_internal) { - WORD32 i; - if (audio_io_buf_internal->audio_delay_sub_band_samples) { - for (i = 0; i < audio_io_buf_internal->audio_num_chan; i++) { - memmove(audio_io_buf_internal->audio_buffer_delayed_real[i], - &audio_io_buf_internal->audio_buffer_delayed_real - [i][audio_io_buf_internal->audio_sub_band_frame_size * - audio_io_buf_internal->audio_sub_band_count], - sizeof(FLOAT32) * - audio_io_buf_internal->audio_delay_sub_band_samples * - audio_io_buf_internal->audio_sub_band_count); - memmove(audio_io_buf_internal->audio_buffer_delayed_imag[i], - &audio_io_buf_internal->audio_buffer_delayed_imag - [i][audio_io_buf_internal->audio_sub_band_frame_size * - audio_io_buf_internal->audio_sub_band_count], - sizeof(FLOAT32) * - audio_io_buf_internal->audio_delay_sub_band_samples * - audio_io_buf_internal->audio_sub_band_count); - } - } - return 0; -} diff --git a/decoder/drc_src/impd_drc_process_audio.h b/decoder/drc_src/impd_drc_process_audio.h index 9a60280..2b1f6d5 100644 --- a/decoder/drc_src/impd_drc_process_audio.h +++ b/decoder/drc_src/impd_drc_process_audio.h @@ -46,17 +46,6 @@ typedef struct { } ia_audio_in_out_buf; WORD32 -impd_apply_gains_subband(ia_drc_instructions_struct* pstr_drc_instruction_arr, - const WORD32 drc_instructions_index, - ia_drc_params_struct* ia_drc_params_struct, - ia_gain_buffer_struct* pstr_gain_buf, - ia_overlap_params_struct* pstr_overlap_params, - FLOAT32* deinterleaved_audio_delayed_re[], - FLOAT32* deinterleaved_audio_delayed_im[], - FLOAT32* deinterleaved_audio_re[], - FLOAT32* deinterleaved_audio_im[]); - -WORD32 impd_filter_banks_process(ia_drc_instructions_struct* pstr_drc_instruction_arr, const WORD32 drc_instructions_index, ia_drc_params_struct* ia_drc_params_struct, @@ -79,15 +68,8 @@ impd_retrieve_audio_io_buffer_time(FLOAT32* audio_in_out_buf[], ia_audio_in_out_buf* audio_io_buf_internal); WORD32 -impd_retrieve_audio_buffer_freq(FLOAT32* audio_real_buff[], - FLOAT32* audio_imag_buff[], - ia_audio_in_out_buf* audio_io_buf_internal); - -WORD32 impd_advance_audio_io_buffer_time(ia_audio_in_out_buf* audio_io_buf_internal); -WORD32 -impd_advance_audio_buff_freq(ia_audio_in_out_buf* audio_io_buf_internal); #ifdef __cplusplus } diff --git a/decoder/drc_src/impd_drc_tables.c b/decoder/drc_src/impd_drc_tables.c deleted file mode 100644 index b099b5e..0000000 --- a/decoder/drc_src/impd_drc_tables.c +++ /dev/null @@ -1,102 +0,0 @@ -/****************************************************************************** - * - * Copyright (C) 2015 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - ***************************************************************************** - * Originally developed and contributed by Ittiam Systems Pvt. Ltd, Bangalore -*/ -#include <stdio.h> -#include <math.h> - -#include "impd_type_def.h" -#include "impd_drc_uni_tables.h" -#include "impd_drc_uni_common.h" -#include "impd_drc_struct.h" -#include "impd_drc_filter_bank.h" -#include "impd_drc_rom.h" - -WORD32 impd_init_tbls(const WORD32 num_gain_max_values, - ia_tables_struct* str_tables) { - impd_gen_delta_time_code_tbl(num_gain_max_values, - str_tables->delta_time_code_table); - return (0); -} - -void impd_get_slope_code_tbl_and_size( - ia_slope_code_table_struct const** slope_code_tbl_entry, - WORD32* num_slope_code_tbl_entries) { - *slope_code_tbl_entry = &(slopeCodeTableEntryBySize[0]); - *num_slope_code_tbl_entries = kNumSlopeValuesTable; -} - -void impd_get_delta_gain_code_tbl( - const WORD32 gain_coding_profile, - ia_delta_gain_code_table_struct const** delta_time_code_tbl, - WORD32* num_entries) { - if (gain_coding_profile == GAIN_CODING_PROFILE_CLIPPING) { - *delta_time_code_tbl = deltaGainCodeTableProfile2BySize; - *num_entries = kNumDeltaGainValuesTableProfile2; - } else { - *delta_time_code_tbl = deltaGainCodeTableBySize; - *num_entries = kNumDeltaGainValuesTable; - } -} - -void impd_gen_delta_time_code_tbl( - const WORD32 num_gain_max_values, - ia_delta_time_code_table_entry_struct* delta_time_code_tbl_item) { - WORD32 n, k; - - WORD32 Z = 1; - while ((1 << Z) < 2 * num_gain_max_values) { - Z++; - } - - delta_time_code_tbl_item[0].size = -1; - delta_time_code_tbl_item[0].code = -1; - delta_time_code_tbl_item[0].value = -1; - - delta_time_code_tbl_item[1].size = 2; - delta_time_code_tbl_item[1].code = 0x0; - delta_time_code_tbl_item[1].value = 1; - for (n = 0; n < 4; n++) { - delta_time_code_tbl_item[n + 2].size = 4; - delta_time_code_tbl_item[n + 2].code = 0x4 + n; - delta_time_code_tbl_item[n + 2].value = n + 2; - } - for (n = 0; n < 8; n++) { - delta_time_code_tbl_item[n + 6].size = 5; - delta_time_code_tbl_item[n + 6].code = 0x10 + n; - delta_time_code_tbl_item[n + 6].value = n + 6; - } - - k = 2 * num_gain_max_values - 14 + 1; - for (n = 0; n < k; n++) { - delta_time_code_tbl_item[n + 14].size = 2 + Z; - delta_time_code_tbl_item[n + 14].code = (0x3 << Z) + n; - delta_time_code_tbl_item[n + 14].value = n + 14; - } -} - -WORD32 -impd_get_delta_tmin(const WORD32 sampling_rate) { - WORD32 lowerBound = (WORD32)(0.5f + 0.0005f * sampling_rate); - WORD32 result = 1; - if (sampling_rate < 1000) { - return (UNEXPECTED_ERROR); - } - while (result <= lowerBound) result = result << 1; - return result; -} diff --git a/decoder/drc_src/impd_drc_uni_common.h b/decoder/drc_src/impd_drc_uni_common.h deleted file mode 100644 index f661405..0000000 --- a/decoder/drc_src/impd_drc_uni_common.h +++ /dev/null @@ -1,162 +0,0 @@ -/****************************************************************************** - * - * Copyright (C) 2015 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - ***************************************************************************** - * Originally developed and contributed by Ittiam Systems Pvt. Ltd, Bangalore -*/ -#ifndef IMPD_DRC_UNI_COMMON_H -#define IMPD_DRC_UNI_COMMON_H - -#ifdef __cplusplus -extern "C" { -#endif - -#define AMD1_SYNTAX 0 -#define MPEG_D_DRC_EXTENSION_V1 0 -#define AMD1_PARAMETRIC_LIMITER 0 - -#define MPEG_H_SYNTAX 0 - -#define EQ_IS_SUPPORTED 1 - -#define MEASURE_AVERAGE_BITRATE 0 -#define DEBUG_NODES 0 - -#define DRC_GAIN_DEBUG_FILE 0 -#define DEBUG_BITSTREAM 0 -#define DEBUG_DRC_SELECTION 0 -#define DEBUG_WARNINGS 0 -#define ENABLE_ADDITIONAL_TESTS 1 - -#define SPEAKER_POS_COUNT_MAX 128 -#define DOWNMIX_COEFF_COUNT_MAX 32 * 32 -#define MAX_CHANNEL_COUNT 128 -#define BAND_COUNT_MAX 8 -#define SEQUENCE_COUNT_MAX 24 -#define GAIN_SET_COUNT_MAX SEQUENCE_COUNT_MAX -#define MEASUREMENT_COUNT_MAX 16 -#define DOWNMIX_INSTRUCTION_COUNT_MAX 16 -#define DRC_COEFF_COUNT_MAX 8 -#define DRC_INSTRUCTIONS_COUNT_MAX (DOWNMIX_INSTRUCTION_COUNT_MAX + 20) -#define LOUDNESS_INFO_COUNT_MAX (DOWNMIX_INSTRUCTION_COUNT_MAX + 20) -#define AUDIO_CODEC_FRAME_SIZE_MAX 4096 -#define DRC_CODEC_FRAME_SIZE_MAX (AUDIO_CODEC_FRAME_SIZE_MAX / 8) -#define NODE_COUNT_MAX DRC_CODEC_FRAME_SIZE_MAX -#define CHANNEL_GROUP_COUNT_MAX SEQUENCE_COUNT_MAX -#define SUB_DRC_COUNT 4 -#define SEL_DRC_COUNT 3 -#define DOWNMIX_ID_COUNT_MAX 8 -#define MAX_SIGNAL_DELAY 4500 - -#define DELAY_MODE_REGULAR_DELAY 0 -#define DELAY_MODE_LOW_DELAY 1 -#define DELAY_MODE_DEFAULT DELAY_MODE_REGULAR_DELAY - -#define FEATURE_REQUEST_COUNT_MAX 10 -#define EFFECT_TYPE_REQUEST_COUNT_MAX 10 - -#define SELECTION_CANDIDATE_COUNT_MAX 32 - -#define PROC_COMPLETE 1 -#define UNEXPECTED_ERROR 2 -#define PARAM_ERROR 3 -#define EXTERNAL_ERROR 4 -#define ERRORHANDLING 5 -#define BITSTREAM_ERROR 6 - -#define UNDEFINED_LOUDNESS_VALUE 1000.0f -#define ID_FOR_BASE_LAYOUT 0x0 -#define ID_FOR_ANY_DOWNMIX 0x7F -#define ID_FOR_NO_DRC 0x0 -#define ID_FOR_ANY_DRC 0x3F -#define ID_FOR_ANY_EQ 0x3F - -#define LOCATION_MP4_INSTREAM_UNIDRC 0x1 -#define LOCATION_MP4_DYN_RANGE_INFO 0x2 -#define LOCATION_MP4_COMPRESSION_VALUE 0x3 -#define LOCATION_SELECTED LOCATION_MP4_INSTREAM_UNIDRC - -#define AUDIO_CODEC_SUBBAND_COUNT_MAX 256 - -#define SUBBAND_DOMAIN_MODE_OFF 0 -#define SUBBAND_DOMAIN_MODE_QMF64 1 -#define SUBBAND_DOMAIN_MODE_QMF71 2 -#define SUBBAND_DOMAIN_MODE_STFT256 3 - -#define AUDIO_CODEC_SUBBAND_COUNT_QMF64 64 -#define AUDIO_CODEC_SUBBAND_DOWNSAMPLING_FACTOR_QMF64 64 -#define AUDIO_CODEC_SUBBAND_ANALYSE_DELAY_QMF64 320 - -#define AUDIO_CODEC_SUBBAND_COUNT_QMF71 71 -#define AUDIO_CODEC_SUBBAND_DOWNSAMPLING_FACTOR_QMF71 64 -#define AUDIO_CODEC_SUBBAND_ANALYSE_DELAY_QMF71 320 + 384 - -#define AUDIO_CODEC_SUBBAND_COUNT_STFT256 256 -#define AUDIO_CODEC_SUBBAND_DOWNSAMPLING_FACTOR_STFT256 256 -#define AUDIO_CODEC_SUBBAND_ANALYSE_DELAY_STFT256 256 - -#define MAX_NUM_DOWNMIX_ID_REQUESTS 15 -#define MAX_NUM_DRC_FEATURE_REQUESTS 7 -#define MAX_NUM_DRC_EFFECT_TYPE_REQUESTS 15 -#define MAX_SIGNATURE_DATA_LENGTH_PLUS_ONE 256 - -#define EXT_COUNT_MAX 2 -#define UNIDRCGAINEXT_TERM 0x0 -#define UNIDRCLOUDEXT_TERM 0x0 -#define UNIDRCCONFEXT_TERM 0x0 -#define UNIDRCINTERFACEEXT_TERM 0x0 - -#define MAXPACKETLOSSTIME 2.5f - -#define SLOPE_FACTOR_DB_TO_LINEAR 0.1151f - -#ifndef min -#define min(a, b) ((a) < (b) ? (a) : (b)) -#endif -#ifndef max -#define max(a, b) ((a) > (b) ? (a) : (b)) -#endif - -#ifndef bool -#define bool WORD32 -#endif - -typedef struct ia_drc_sel_proc_output_struct { - FLOAT32 output_peak_level_db; - FLOAT32 loudness_normalization_gain_db; - FLOAT32 output_loudness; - - WORD32 sel_drc_set_ids[SUB_DRC_COUNT]; - WORD32 sel_downmix_ids[SUB_DRC_COUNT]; - WORD32 num_sel_drc_sets; - - WORD32 active_downmix_id; - WORD32 base_channel_count; - WORD32 target_channel_count; - WORD32 target_layout; - WORD32 downmix_matrix_present; - FLOAT32 downmix_matrix[MAX_CHANNEL_COUNT][MAX_CHANNEL_COUNT]; - - FLOAT32 boost; - FLOAT32 compress; - WORD32 drc_characteristic_target; - -} ia_drc_sel_proc_output_struct; - -#ifdef __cplusplus -} -#endif -#endif |