From b13940c90ccd009fdbdb2d1f96109d4ca3aa8a6b Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Sat, 10 Sep 2022 20:52:39 +0200 Subject: [PATCH 1/2] [cleanup] accept FIX_ADAP_STEFI_SHIFT --- lib_com/options.h | 1 - lib_enc/ivas_stereo_dft_enc.c | 8 -------- 2 files changed, 9 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index 6a9861f02e..e32fc62d37 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -146,7 +146,6 @@ /*#define FIX_IVAS_185_MDCT_ST_PLC_FADEOUT*/ /* IVAS-185 fix bug in TCX-PLC fadeout for MDCT-Stereo and improve fadeout by fading to background noise instead of white noise */ /*#define FIX_I1_113*/ /* under review : MCT bit distribution optimization for SBA high bitrates*/ -#define FIX_ADAP_STEFI_SHIFT /* Issue 89: fix bug in parameter shift of adaptive stereo filling */ #define SPAR_SCALING_HARMONIZATION /* Issue 80: Changes to harmonize scaling in spar */ diff --git a/lib_enc/ivas_stereo_dft_enc.c b/lib_enc/ivas_stereo_dft_enc.c index 79f6b04803..2e81bd99bc 100644 --- a/lib_enc/ivas_stereo_dft_enc.c +++ b/lib_enc/ivas_stereo_dft_enc.c @@ -2943,15 +2943,11 @@ static void stereo_dft_enc_compute_prm( /* parameters for bred0 <= b < bpred1 are estimated from parameters of the remaining bands with ptrans0 <= b < btrans1. */ -#ifdef FIX_ADAP_STEFI_SHIFT bpred1 = ( hStereoDft->nbands > 10 ) ? STEREO_DFT_RES_PRED_BAND_MAX - 2 : hStereoDft->nbands; if ( hStereoDft->band_res[k_offset] == STEREO_DFT_BAND_RES_LOW ) { bpred1 = min( bpred1, 6 ); } -#else - bpred1 = ( hStereoDft->nbands > 10 ) ? hStereoDft->nbands - 2 : hStereoDft->nbands; -#endif bpred0 = bpred1 - STEREO_DFT_RES_PRED_BAND_MIN_CONST; /* get estimate (currently the maximal index) */ @@ -2971,11 +2967,7 @@ static void stereo_dft_enc_compute_prm( if ( hStereoDft->reverb_flag && hStereoDft->nbands > 10 ) /*SWB and FB*/ { -#ifdef FIX_ADAP_STEFI_SHIFT for ( b = STEREO_DFT_RES_PRED_BAND_MAX - 1; b >= STEREO_DFT_RES_PRED_BAND_MAX - 2; b-- ) -#else - for ( b = hStereoDft->nbands - 1; b >= hStereoDft->nbands - 2; b-- ) -#endif { hStereoDft->res_pred_index_EC[b - STEREO_DFT_RES_PRED_BAND_MIN_CONST] = hStereoDft->res_pred_index_EC[b]; } -- GitLab From 8e5bb642e7dfbdf1d31a546698416a4ad637b0a9 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Sat, 10 Sep 2022 20:59:27 +0200 Subject: [PATCH 2/2] formatting --- lib_dec/ivas_init_dec.c | 2 +- lib_dec/ivas_objectRenderer_hrFilt.c | 2 +- lib_dec/ivas_spar_md_dec.c | 10 +++++----- lib_enc/ivas_mcmasa_enc.c | 3 +-- lib_enc/ivas_spar_encoder.c | 2 +- lib_enc/ivas_spar_md_enc.c | 6 +++--- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/lib_dec/ivas_init_dec.c b/lib_dec/ivas_init_dec.c index d8c14257bd..5235413411 100644 --- a/lib_dec/ivas_init_dec.c +++ b/lib_dec/ivas_init_dec.c @@ -524,7 +524,7 @@ ivas_error ivas_init_decoder_front( st_ivas->sba_mode = SBA_MODE_NONE; st_ivas->sba_dirac_stereo_flag = 0; - + /* HRTF binauralization latency in ns */ st_ivas->binaural_latency_ns = 0; diff --git a/lib_dec/ivas_objectRenderer_hrFilt.c b/lib_dec/ivas_objectRenderer_hrFilt.c index bb8f4f6ff4..b665f409ae 100644 --- a/lib_dec/ivas_objectRenderer_hrFilt.c +++ b/lib_dec/ivas_objectRenderer_hrFilt.c @@ -1330,7 +1330,7 @@ static float GreatCircleAngleDeg( { return acosf( sinf( El1 * PI_OVER_180 ) * sinf( El2 * PI_OVER_180 ) + cosf( El1 * PI_OVER_180 ) * cosf( El2 * PI_OVER_180 ) * - cosf( fabsf( Az1 - Az2 ) * PI_OVER_180 ) ) * + cosf( fabsf( Az1 - Az2 ) * PI_OVER_180 ) ) * PI_OVER_180; } #endif diff --git a/lib_dec/ivas_spar_md_dec.c b/lib_dec/ivas_spar_md_dec.c index e597ced274..cdc6ab57a6 100644 --- a/lib_dec/ivas_spar_md_dec.c +++ b/lib_dec/ivas_spar_md_dec.c @@ -668,7 +668,7 @@ void ivas_spar_md_dec_process( #endif /* SPAR to DirAC and DirAC to SPAR conversion */ // VE2DB: -> "DirAC to SPAR conversion" only? - if ( st_ivas->sba_mode == SBA_MODE_SPAR ) // VE2DB: this looks obsolete + if ( st_ivas->sba_mode == SBA_MODE_SPAR ) // VE2DB: this looks obsolete { ivas_spar_to_dirac( st_ivas, hMdDec, dtx_vad, num_bands_out ); @@ -2240,10 +2240,10 @@ static void ivas_spar_md_fill_invalid_bands( /*-----------------------------------------------------------------------------------------* -* Function ivas_spar_dec_compute_ramp_down_post_matrix() -* -* -*-----------------------------------------------------------------------------------------*/ + * Function ivas_spar_dec_compute_ramp_down_post_matrix() + * + * + *-----------------------------------------------------------------------------------------*/ static void ivas_spar_dec_compute_ramp_down_post_matrix( ivas_spar_md_dec_state_t *hMdDec, diff --git a/lib_enc/ivas_mcmasa_enc.c b/lib_enc/ivas_mcmasa_enc.c index 8be1836de5..a281ec4760 100644 --- a/lib_enc/ivas_mcmasa_enc.c +++ b/lib_enc/ivas_mcmasa_enc.c @@ -70,8 +70,7 @@ static void ivas_mcmasa_dmx( MCMASA_ENC_HANDLE hMcMasa, float data_f[][L_FRAME48 static void compute_cov_mtx( float sr[MCMASA_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX], float si[MCMASA_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX], const int16_t freq, const int16_t N, CovarianceMatrix *COVls ); -static void computeIntensityVector_enc( const int16_t *band_grouping, float Cldfb_RealBuffer[DIRAC_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX], float Cldfb_ImagBuffer[DIRAC_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX], - const int16_t enc_param_start_band, const int16_t num_frequency_bands, float intensity_real[DIRAC_NUM_DIMS][MASA_FREQUENCY_BANDS] ); +static void computeIntensityVector_enc( const int16_t *band_grouping, float Cldfb_RealBuffer[DIRAC_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX], float Cldfb_ImagBuffer[DIRAC_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX], const int16_t enc_param_start_band, const int16_t num_frequency_bands, float intensity_real[DIRAC_NUM_DIMS][MASA_FREQUENCY_BANDS] ); static void computeVerticalDiffuseness( float **buffer_intensity, const float *buffer_energy, const int16_t averaging_length, const int16_t num_freq_bands, float *diffuseness ); diff --git a/lib_enc/ivas_spar_encoder.c b/lib_enc/ivas_spar_encoder.c index bb97dadbd1..6e05d741ad 100644 --- a/lib_enc/ivas_spar_encoder.c +++ b/lib_enc/ivas_spar_encoder.c @@ -679,7 +679,7 @@ static ivas_error ivas_spar_enc_process( md_in_buf.dtx_vad = dtx_vad; ivas_spar_md_enc_process( hSpar->hMdEnc, hEncoderConfig, &md_in_buf, hMetaData, dtx_silence_mode, sba_order ); - if ( st_ivas->sba_mode == SBA_MODE_SPAR ) // VE2DB: this looks obsolete + if ( st_ivas->sba_mode == SBA_MODE_SPAR ) // VE2DB: this looks obsolete { float azi_dirac[IVAS_MAX_NUM_BANDS][MAX_PARAM_SPATIAL_SUBFRAMES]; float ele_dirac[IVAS_MAX_NUM_BANDS][MAX_PARAM_SPATIAL_SUBFRAMES]; diff --git a/lib_enc/ivas_spar_md_enc.c b/lib_enc/ivas_spar_md_enc.c index a63f3af172..de0c37c925 100644 --- a/lib_enc/ivas_spar_md_enc.c +++ b/lib_enc/ivas_spar_md_enc.c @@ -556,9 +556,9 @@ ivas_error ivas_spar_md_enc_process( ivas_spar_md_enc_state_t *hMdEnc, /* i/o: SPAR MD encoder handle */ const ENCODER_CONFIG_HANDLE hEncoderConfig, /* i : configuration structure */ ivas_spar_md_enc_in_buf_t *pIn_buf, - BSTR_ENC_HANDLE hMetaData, /* i/o: MetaData handle */ + BSTR_ENC_HANDLE hMetaData, /* i/o: MetaData handle */ const int16_t dtx_silence_mode, - const int16_t sba_order /* i : Ambisonic (SBA) order */ + const int16_t sba_order /* i : Ambisonic (SBA) order */ ) { float pred_coeffs_re[IVAS_SPAR_MAX_CH - 1][IVAS_MAX_NUM_BANDS]; @@ -576,7 +576,7 @@ ivas_error ivas_spar_md_enc_process( BSTR_ENC_DATA hMetaData_tmp; Indice ind_list_tmp[MAX_BITS_METADATA]; // IVAS_fmToDo: size to be optimized float Wscale[IVAS_MAX_NUM_BANDS]; - + num_quant_strats = hMdEnc->spar_md_cfg.num_quant_strats; num_ch = ivas_sba_get_nchan_metadata( sba_order ); active_w = hMdEnc->spar_md_cfg.active_w; -- GitLab