From 7fd05ea4c83cfd1214743bde62f958d19b4bffb3 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Thu, 1 Sep 2022 17:20:21 +0200 Subject: [PATCH 1/7] [cleanup] accept FIX_WRONG_NBANDS_IN_ITD_ESTIMATION --- lib_com/options.h | 1 - lib_enc/ivas_stereo_dft_enc_itd.c | 15 --------------- 2 files changed, 16 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index 0a29689ddd..39db64b511 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -148,7 +148,6 @@ -#define FIX_WRONG_NBANDS_IN_ITD_ESTIMATION /* Issue 85: fix incorrect setting of nbands in calc_mean_E_ratio() if bwidth is limited on commandline*/ #define FIX_ADAP_STEFI_SHIFT /* Issue 89: fix bug in parameter shift of adaptive stereo filling */ diff --git a/lib_enc/ivas_stereo_dft_enc_itd.c b/lib_enc/ivas_stereo_dft_enc_itd.c index fd39db32d3..594137993e 100755 --- a/lib_enc/ivas_stereo_dft_enc_itd.c +++ b/lib_enc/ivas_stereo_dft_enc_itd.c @@ -446,9 +446,6 @@ static float calc_mean_E_ratio( ITD_DATA_HANDLE hItd, int16_t nbands, int16_t band_limits[], -#ifndef FIX_WRONG_NBANDS_IN_ITD_ESTIMATION - const int16_t NFFT, -#endif const float sfm, const float nrg_L[STEREO_DFT_N_32k_ENC / 2], const float nrg_R[STEREO_DFT_N_32k_ENC / 2], @@ -469,11 +466,7 @@ static float calc_mean_E_ratio( grand_sum_xcorr_img = 0.0f; /*take bands up to 32kHz bandwidth as ITD is always calculated at 32kHz sampling rate*/ -#ifdef FIX_WRONG_NBANDS_IN_ITD_ESTIMATION nbands -= ( band_limits[nbands] > STEREO_DFT_N_32k_ENC / 2 ); -#else - nbands -= ( NFFT > STEREO_DFT_N_32k_ENC ); -#endif sum_Er = 0; for ( b = 0; b < nbands; b++ ) @@ -1244,11 +1237,7 @@ void stereo_dft_enc_compute_itd( /*calculate mean E ratio of main to background signal for cohSNR*/ if ( hCPE->element_mode == IVAS_CPE_DFT ) { -#ifdef FIX_WRONG_NBANDS_IN_ITD_ESTIMATION mEr = calc_mean_E_ratio( hItd, hStereoDft->nbands, hStereoDft->band_limits, sfm_L, pNrgL, pNrgR, &total_mEr ); -#else - mEr = calc_mean_E_ratio( hItd, hStereoDft->nbands, hStereoDft->band_limits, hStereoDft->NFFT, sfm_L, pNrgL, pNrgR, &total_mEr ); -#endif } else { @@ -1257,11 +1246,7 @@ void stereo_dft_enc_compute_itd( set_s( band_limits, 0, STEREO_DFT_BAND_MAX + 1 ); set_band_limits( &nbands, band_limits, hCPE->hStereoMdct->hDft_ana->NFFT ); -#ifdef FIX_WRONG_NBANDS_IN_ITD_ESTIMATION mEr = calc_mean_E_ratio( hItd, nbands, band_limits, sfm_L, pNrgL, pNrgR, &total_mEr ); -#else - mEr = calc_mean_E_ratio( hItd, nbands, band_limits, hCPE->hStereoMdct->hDft_ana->NFFT, sfm_L, pNrgL, pNrgR, &total_mEr ); -#endif } /*calculate total cohSNR for frame in dB*/ -- GitLab From affead7d2e5bf01368a3a467bcef71276de66422 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Thu, 1 Sep 2022 17:21:14 +0200 Subject: [PATCH 2/7] [cleanup] accept FIX_I87 --- lib_com/options.h | 1 - lib_dec/ivas_output_init.c | 21 --------------------- 2 files changed, 22 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index 39db64b511..8bddce2948 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -151,7 +151,6 @@ #define FIX_ADAP_STEFI_SHIFT /* Issue 89: fix bug in parameter shift of adaptive stereo filling */ -#define FIX_I87 /* fix for issue 86: incorrect Ambisonics order set for head rotation in SBA */ #define SBA_ORDER_BITSTREAM /* issue 76: Use input sba order for bitstream coding */ /* NTT switches */ diff --git a/lib_dec/ivas_output_init.c b/lib_dec/ivas_output_init.c index fcaa6f9442..36d194a777 100644 --- a/lib_dec/ivas_output_init.c +++ b/lib_dec/ivas_output_init.c @@ -263,9 +263,7 @@ void ivas_renderer_select( AUDIO_CONFIG output_config; AUDIO_CONFIG transport_config; -#ifdef FIX_I87 int16_t nchan_internal; -#endif renderer_type = &( st_ivas->renderer_type ); internal_config = &( st_ivas->intern_config ); @@ -360,7 +358,6 @@ void ivas_renderer_select( if ( st_ivas->hDecoderConfig->Opt_Headrotation ) { -#ifdef FIX_I87 #ifdef SBA_ORDER_BITSTREAM nchan_internal = ivas_sba_get_nchan_metadata( st_ivas->sba_analysis_order ); #else @@ -382,24 +379,6 @@ void ivas_renderer_select( { st_ivas->hHeadTrackData->shd_rot_max_order = 3; } -#else - if ( st_ivas->nchan_transport == 2 ) - { - st_ivas->hHeadTrackData->shd_rot_max_order = 1; - } - else if ( st_ivas->nchan_transport == 4 || st_ivas->nchan_transport == 3 ) - { - st_ivas->hHeadTrackData->shd_rot_max_order = 0; - } - else if ( st_ivas->nchan_transport == 6 || st_ivas->nchan_transport == 5 ) - { - st_ivas->hHeadTrackData->shd_rot_max_order = 2; - } - else if ( st_ivas->nchan_transport == 8 || st_ivas->nchan_transport == 7 ) - { - st_ivas->hHeadTrackData->shd_rot_max_order = 3; - } -#endif } } else if ( st_ivas->ivas_format == MC_FORMAT ) -- GitLab From 7dcca215addcc42bb770a582629c142b1fc1a715 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Thu, 1 Sep 2022 17:23:10 +0200 Subject: [PATCH 3/7] [cleanup] accept SBA_ORDER_BITSTREAM --- lib_com/bitstream.c | 6 ------ lib_com/ivas_dirac_com.c | 8 -------- lib_com/ivas_prot.h | 6 ------ lib_com/ivas_sba_config.c | 2 -- lib_com/options.h | 1 - lib_dec/ivas_dirac_dec.c | 8 -------- lib_dec/ivas_init_dec.c | 22 ---------------------- lib_dec/ivas_output_init.c | 4 ---- lib_dec/ivas_sba_dec.c | 23 ----------------------- lib_dec/ivas_sba_rendering.c | 4 ---- lib_dec/ivas_spar_decoder.c | 8 -------- lib_dec/ivas_spar_md_dec.c | 4 ---- lib_dec/ivas_stat_dec.h | 2 -- lib_dec/lib_dec.c | 2 -- lib_enc/ivas_init_enc.c | 2 -- lib_enc/ivas_mct_enc.c | 20 -------------------- lib_enc/ivas_sba_enc.c | 14 -------------- lib_enc/ivas_spar_encoder.c | 29 ----------------------------- lib_enc/ivas_spar_md_enc.c | 36 ------------------------------------ lib_enc/ivas_stat_enc.h | 2 -- lib_enc/lib_enc.c | 2 -- 21 files changed, 205 deletions(-) diff --git a/lib_com/bitstream.c b/lib_com/bitstream.c index a186c3f41f..73547bbbe8 100755 --- a/lib_com/bitstream.c +++ b/lib_com/bitstream.c @@ -1981,15 +1981,9 @@ ivas_error preview_indices( st_ivas->sba_order = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_SBA + 2] == 1 ); st_ivas->sba_order += 2 * ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_SBA + 1] == 1 ); -#ifdef SBA_ORDER_BITSTREAM st_ivas->sba_analysis_order = ivas_sba_get_analysis_order( total_brate, st_ivas->sba_order ); -#endif -#ifdef SBA_ORDER_BITSTREAM ivas_sba_config( total_brate, st_ivas->sba_analysis_order, -1, &( st_ivas->nchan_transport ), st_ivas->sba_planar, &( st_ivas->nSCE ), &( st_ivas->nCPE ), &( st_ivas->element_mode_init ), st_ivas->sba_mode ); -#else - ivas_sba_config( total_brate, st_ivas->sba_order, -1, &( st_ivas->nchan_transport ), st_ivas->sba_planar, &( st_ivas->nSCE ), &( st_ivas->nCPE ), &( st_ivas->element_mode_init ), st_ivas->sba_mode ); -#endif } } diff --git a/lib_com/ivas_dirac_com.c b/lib_com/ivas_dirac_com.c index 849e889739..872c9bbba4 100644 --- a/lib_com/ivas_dirac_com.c +++ b/lib_com/ivas_dirac_com.c @@ -82,11 +82,7 @@ ivas_error ivas_dirac_config( nCPE = &( (Encoder_Struct *) st_ivas )->nCPE; element_mode = &( (Encoder_Struct *) st_ivas )->hEncoderConfig->element_mode_init; nchan_transport = &( (Encoder_Struct *) st_ivas )->nchan_transport; -#ifndef SBA_ORDER_BITSTREAM - sba_order = ( (Encoder_Struct *) st_ivas )->hEncoderConfig->sba_order; -#else sba_order = ( (Encoder_Struct *) st_ivas )->sba_analysis_order; -#endif sba_planar = ( (Encoder_Struct *) st_ivas )->hEncoderConfig->sba_planar; ivas_total_brate = ( (Encoder_Struct *) st_ivas )->hEncoderConfig->ivas_total_brate; Fs = ( (Encoder_Struct *) st_ivas )->hEncoderConfig->input_Fs; @@ -111,11 +107,7 @@ ivas_error ivas_dirac_config( nCPE = &( (Decoder_Struct *) st_ivas )->nCPE; element_mode = &( (Decoder_Struct *) st_ivas )->element_mode_init; nchan_transport = &( (Decoder_Struct *) st_ivas )->nchan_transport; -#ifndef SBA_ORDER_BITSTREAM - sba_order = ( (Decoder_Struct *) st_ivas )->sba_order; -#else sba_order = ( (Decoder_Struct *) st_ivas )->sba_analysis_order; -#endif sba_planar = ( (Decoder_Struct *) st_ivas )->sba_planar; ivas_total_brate = ( (Decoder_Struct *) st_ivas )->hDecoderConfig->ivas_total_brate; Fs = ( (Decoder_Struct *) st_ivas )->hDecoderConfig->output_Fs; diff --git a/lib_com/ivas_prot.h b/lib_com/ivas_prot.h index bf747a0de3..66e22573e9 100644 --- a/lib_com/ivas_prot.h +++ b/lib_com/ivas_prot.h @@ -3039,13 +3039,11 @@ int16_t ivas_sba_get_order( const int16_t sba_planar /* i : SBA planar flag */ ); -#ifdef SBA_ORDER_BITSTREAM /*! r: Ambisonic (SBA) order used for analysis and coding */ int16_t ivas_sba_get_analysis_order( const int32_t ivas_total_brate, /* i : IVAS total bitrate */ const int16_t sba_order /* i : Ambisonic (SBA) order */ ); -#endif int16_t ivas_sba_get_order_transport( const int16_t nchan_transport /* i : Number of transport channels */ @@ -3868,10 +3866,8 @@ void ivas_spar_dec_upmixer( ivas_error ivas_spar_md_enc_open( ivas_spar_md_enc_state_t **hMdEnc, /* i/o: SPAR MD encoder handle */ const ENCODER_CONFIG_HANDLE hEncoderConfig /* i : configuration structure */ -#ifdef SBA_ORDER_BITSTREAM , const int16_t sba_order /* i : Ambisonic (SBA) order */ -#endif ); void ivas_spar_md_enc_close( @@ -3884,10 +3880,8 @@ ivas_error ivas_spar_md_enc_process( ivas_spar_md_enc_in_buf_t *pIn_buf, BSTR_ENC_HANDLE hMetaData, /* i/o: MetaData handle */ const int16_t dtx_silence_mode -#ifdef SBA_ORDER_BITSTREAM , const int16_t sba_order /* i : Ambisonic (SBA) order */ -#endif ); void ivas_compute_spar_params( diff --git a/lib_com/ivas_sba_config.c b/lib_com/ivas_sba_config.c index 313c025eb6..2ea07710bc 100644 --- a/lib_com/ivas_sba_config.c +++ b/lib_com/ivas_sba_config.c @@ -183,7 +183,6 @@ int16_t ivas_sba_get_order( } -#ifdef SBA_ORDER_BITSTREAM /*-------------------------------------------------------------------* * ivas_sba_get_analysis_order() * @@ -208,7 +207,6 @@ int16_t ivas_sba_get_analysis_order( return sba_analysis_order; } -#endif /*-------------------------------------------------------------------* diff --git a/lib_com/options.h b/lib_com/options.h index 8bddce2948..3b69769495 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -151,7 +151,6 @@ #define FIX_ADAP_STEFI_SHIFT /* Issue 89: fix bug in parameter shift of adaptive stereo filling */ -#define SBA_ORDER_BITSTREAM /* issue 76: Use input sba order for bitstream coding */ /* NTT switches */ #define NTT_UPDATE_ITD_SW /* contribution 4: Update of ITD switch in stereo downmix for EVS */ diff --git a/lib_dec/ivas_dirac_dec.c b/lib_dec/ivas_dirac_dec.c index 8cf0d025c0..8dd47fe774 100755 --- a/lib_dec/ivas_dirac_dec.c +++ b/lib_dec/ivas_dirac_dec.c @@ -186,11 +186,7 @@ ivas_error ivas_dirac_dec_config( nchan_transport_orig = st_ivas->nchan_transport; if ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->sba_mode == SBA_MODE_SPAR && !( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM ) ) { -#ifdef SBA_ORDER_BITSTREAM st_ivas->nchan_transport = ivas_sba_get_nchan_metadata( st_ivas->sba_analysis_order ); -#else - st_ivas->nchan_transport = ivas_sba_get_nchan_metadata( st_ivas->sba_order ); -#endif } nchan_transport = st_ivas->nchan_transport; @@ -202,11 +198,7 @@ ivas_error ivas_dirac_dec_config( if ( flag_config == DIRAC_RECONFIGURE && st_ivas->ivas_format == SBA_FORMAT ) { int16_t tmp1, tmp2, tmp3; -#ifdef SBA_ORDER_BITSTREAM ivas_sba_config( st_ivas->hDecoderConfig->last_ivas_total_brate, st_ivas->sba_analysis_order, -1, &nchan_transport_old, st_ivas->sba_planar, &tmp1, &tmp2, &tmp3, SBA_MODE_DIRAC ); -#else - ivas_sba_config( st_ivas->hDecoderConfig->last_ivas_total_brate, st_ivas->sba_order, -1, &nchan_transport_old, st_ivas->sba_planar, &tmp1, &tmp2, &tmp3, SBA_MODE_DIRAC ); -#endif } /*-----------------------------------------------------------------* diff --git a/lib_dec/ivas_init_dec.c b/lib_dec/ivas_init_dec.c index a7692c2791..2bdaec1b7b 100755 --- a/lib_dec/ivas_init_dec.c +++ b/lib_dec/ivas_init_dec.c @@ -122,10 +122,8 @@ ivas_error ivas_dec_setup( st_ivas->sba_order = st_ivas->bit_stream[num_bits_read + 1]; st_ivas->sba_order += 2 * st_ivas->bit_stream[num_bits_read]; -#ifdef SBA_ORDER_BITSTREAM /* set Ambisonic (SBA) order used for analysis and coding */ st_ivas->sba_analysis_order = ivas_sba_get_analysis_order( ivas_total_brate, st_ivas->sba_order ); -#endif num_bits_read += SBA_ORDER_BITS; if ( st_ivas->ini_frame > 0 && ivas_total_brate != st_ivas->hDecoderConfig->last_ivas_total_brate && ivas_total_brate > IVAS_SID_4k4 ) @@ -137,11 +135,7 @@ ivas_error ivas_dec_setup( } else { -#ifndef SBA_ORDER_BITSTREAM - ivas_sba_config( ivas_total_brate, st_ivas->sba_order, -1, &( st_ivas->nchan_transport ), st_ivas->sba_planar, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->element_mode_init, st_ivas->sba_mode ); -#else ivas_sba_config( ivas_total_brate, st_ivas->sba_analysis_order, -1, &( st_ivas->nchan_transport ), st_ivas->sba_planar, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->element_mode_init, st_ivas->sba_mode ); -#endif } } else if ( st_ivas->ivas_format == MASA_FORMAT ) @@ -419,17 +413,10 @@ static ivas_error ivas_read_format( idx = st_ivas->bit_stream[tc_mode_offset]; // TBD: needs more work for HOA -#ifndef SBA_ORDER_BITSTREAM - if ( st_ivas->sba_order == 0 ) - { - st_ivas->sba_order = 1; - } -#else if ( st_ivas->sba_analysis_order == 0 ) { st_ivas->sba_analysis_order = 1; } -#endif if ( idx == 0 ) { @@ -872,13 +859,8 @@ ivas_error ivas_init_decoder( } } -#ifndef SBA_ORDER_BITSTREAM - if ( ( error = ivas_dirac_sba_config( st_ivas->hQMetaData, &st_ivas->nchan_transport, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->element_mode_init, ivas_total_brate, st_ivas->sba_order, st_ivas->sba_planar, - st_ivas->sba_mode, IVAS_MAX_NUM_BANDS - SPAR_DIRAC_SPLIT_START_BAND ) ) != IVAS_ERR_OK ) -#else if ( ( error = ivas_dirac_sba_config( st_ivas->hQMetaData, &st_ivas->nchan_transport, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->element_mode_init, ivas_total_brate, st_ivas->sba_analysis_order, st_ivas->sba_planar, st_ivas->sba_mode, IVAS_MAX_NUM_BANDS - SPAR_DIRAC_SPLIT_START_BAND ) ) != IVAS_ERR_OK ) -#endif { return error; } @@ -907,11 +889,7 @@ ivas_error ivas_init_decoder( } else { -#ifndef SBA_ORDER_BITSTREAM - if ( ( error = ivas_dirac_sba_config( st_ivas->hQMetaData, &st_ivas->nchan_transport, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->element_mode_init, ivas_total_brate, st_ivas->sba_order, st_ivas->sba_planar, st_ivas->sba_mode, -1 ) ) != IVAS_ERR_OK ) -#else if ( ( error = ivas_dirac_sba_config( st_ivas->hQMetaData, &st_ivas->nchan_transport, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->element_mode_init, ivas_total_brate, st_ivas->sba_analysis_order, st_ivas->sba_planar, st_ivas->sba_mode, -1 ) ) != IVAS_ERR_OK ) -#endif { return error; } diff --git a/lib_dec/ivas_output_init.c b/lib_dec/ivas_output_init.c index 36d194a777..2a5cc02682 100644 --- a/lib_dec/ivas_output_init.c +++ b/lib_dec/ivas_output_init.c @@ -358,11 +358,7 @@ void ivas_renderer_select( if ( st_ivas->hDecoderConfig->Opt_Headrotation ) { -#ifdef SBA_ORDER_BITSTREAM nchan_internal = ivas_sba_get_nchan_metadata( st_ivas->sba_analysis_order ); -#else - nchan_internal = ivas_sba_get_nchan_metadata( st_ivas->sba_order ); -#endif if ( nchan_internal == 2 ) { st_ivas->hHeadTrackData->shd_rot_max_order = 1; diff --git a/lib_dec/ivas_sba_dec.c b/lib_dec/ivas_sba_dec.c index e3b35c0d82..2eebf6967a 100644 --- a/lib_dec/ivas_sba_dec.c +++ b/lib_dec/ivas_sba_dec.c @@ -273,11 +273,7 @@ int16_t ivas_sba_remapTCs( if ( st_ivas->sba_mode != SBA_MODE_SPAR ) { -#ifndef SBA_ORDER_BITSTREAM - ivas_sba_zero_vert_comp( sba_data, st_ivas->sba_order, st_ivas->sba_planar, output_frame ); -#else ivas_sba_zero_vert_comp( sba_data, st_ivas->sba_analysis_order, st_ivas->sba_planar, output_frame ); -#endif } return ( nchan_remapped ); @@ -490,15 +486,9 @@ ivas_error ivas_sba_dec_reconfigure( nchan_transport_old = st_ivas->nchan_transport; sba_dirac_stereo_flag_old = st_ivas->sba_dirac_stereo_flag; -#ifdef SBA_ORDER_BITSTREAM st_ivas->sba_analysis_order = ivas_sba_get_analysis_order( ivas_total_brate, st_ivas->sba_order ); -#endif -#ifndef SBA_ORDER_BITSTREAM - ivas_sba_config( sba_total_brate, st_ivas->sba_order, -1, &nchan_transport, st_ivas->sba_planar, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->element_mode_init, st_ivas->sba_mode ); -#else ivas_sba_config( sba_total_brate, st_ivas->sba_analysis_order, -1, &nchan_transport, st_ivas->sba_planar, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->element_mode_init, st_ivas->sba_mode ); -#endif st_ivas->nchan_transport = nchan_transport; /* renderer might have changed */ @@ -514,11 +504,7 @@ ivas_error ivas_sba_dec_reconfigure( if ( st_ivas->sba_mode != SBA_MODE_SPAR ) { st_ivas->sba_dirac_stereo_flag = ( st_ivas->nchan_transport == 1 && st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_STEREO ); -#ifndef SBA_ORDER_BITSTREAM - if ( ( error = ivas_dirac_sba_config( st_ivas->hQMetaData, &st_ivas->nchan_transport, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->element_mode_init, ivas_total_brate, st_ivas->sba_order, st_ivas->sba_planar, st_ivas->sba_mode, -1 ) ) != IVAS_ERR_OK ) -#else if ( ( error = ivas_dirac_sba_config( st_ivas->hQMetaData, &st_ivas->nchan_transport, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->element_mode_init, ivas_total_brate, st_ivas->sba_analysis_order, st_ivas->sba_planar, st_ivas->sba_mode, -1 ) ) != IVAS_ERR_OK ) -#endif { return error; } @@ -527,20 +513,11 @@ ivas_error ivas_sba_dec_reconfigure( { int16_t sba_order_internal; -#ifndef SBA_ORDER_BITSTREAM - sba_order_internal = min( st_ivas->sba_order, IVAS_MAX_SBA_ORDER ); -#else sba_order_internal = min( st_ivas->sba_analysis_order, IVAS_MAX_SBA_ORDER ); -#endif ivas_spar_config( st_ivas->hDecoderConfig->ivas_total_brate, sba_order_internal, &st_ivas->nchan_transport, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->hSpar->core_nominal_brate, st_ivas->sid_format ); -#ifndef SBA_ORDER_BITSTREAM - if ( ( error = ivas_dirac_sba_config( st_ivas->hQMetaData, &st_ivas->nchan_transport, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->element_mode_init, st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->sba_order, st_ivas->sba_planar, - st_ivas->sba_mode, IVAS_MAX_NUM_BANDS - SPAR_DIRAC_SPLIT_START_BAND ) ) != IVAS_ERR_OK ) -#else if ( ( error = ivas_dirac_sba_config( st_ivas->hQMetaData, &st_ivas->nchan_transport, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->element_mode_init, st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->sba_analysis_order, st_ivas->sba_planar, st_ivas->sba_mode, IVAS_MAX_NUM_BANDS - SPAR_DIRAC_SPLIT_START_BAND ) ) != IVAS_ERR_OK ) -#endif { return error; } diff --git a/lib_dec/ivas_sba_rendering.c b/lib_dec/ivas_sba_rendering.c index 3bcf4d3884..3bbcac4ac6 100755 --- a/lib_dec/ivas_sba_rendering.c +++ b/lib_dec/ivas_sba_rendering.c @@ -221,11 +221,7 @@ void ivas_sba_upmixer_renderer( wmops_sub_start( "ivas_sba_upmixer_renderer" ); -#ifndef SBA_ORDER_BITSTREAM - nchan_internal = ivas_sba_get_nchan_metadata( st_ivas->sba_order ); -#else nchan_internal = ivas_sba_get_nchan_metadata( st_ivas->sba_analysis_order ); -#endif #ifndef SPAR_SCALING_HARMONIZATION nchan_out = st_ivas->hDecoderConfig->nchan_out; diff --git a/lib_dec/ivas_spar_decoder.c b/lib_dec/ivas_spar_decoder.c index 001f14c91c..c781fa862c 100755 --- a/lib_dec/ivas_spar_decoder.c +++ b/lib_dec/ivas_spar_decoder.c @@ -71,11 +71,7 @@ ivas_error ivas_spar_dec_open( int32_t output_Fs; error = IVAS_ERR_OK; -#ifndef SBA_ORDER_BITSTREAM - sba_order_internal = min( st_ivas->sba_order, IVAS_MAX_SBA_ORDER ); -#else sba_order_internal = min( st_ivas->sba_analysis_order, IVAS_MAX_SBA_ORDER ); -#endif num_channels_internal = ivas_sba_get_nchan_metadata( sba_order_internal ); /* SPAR decoder handle */ @@ -624,11 +620,7 @@ static void ivas_spar_dec_MD( * Initialization *---------------------------------------------------------------------*/ -#ifndef SBA_ORDER_BITSTREAM - sba_order = min( st_ivas->sba_order, IVAS_MAX_SBA_ORDER ); -#else sba_order = min( st_ivas->sba_analysis_order, IVAS_MAX_SBA_ORDER ); -#endif bfi = st_ivas->bfi; ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate; num_channels = ivas_sba_get_nchan_metadata( sba_order ); diff --git a/lib_dec/ivas_spar_md_dec.c b/lib_dec/ivas_spar_md_dec.c index 712801661d..6d6c1ca427 100644 --- a/lib_dec/ivas_spar_md_dec.c +++ b/lib_dec/ivas_spar_md_dec.c @@ -2578,11 +2578,7 @@ void ivas_spar_to_dirac( int16_t *dirac_to_spar_md_bands; int16_t enc_param_start_band; -#ifndef SBA_ORDER_BITSTREAM - sba_order_internal = min( st_ivas->sba_order, IVAS_MAX_SBA_ORDER ); -#else sba_order_internal = min( st_ivas->sba_analysis_order, IVAS_MAX_SBA_ORDER ); -#endif start_band = 0; end_band = min( num_bands_out, SPAR_DIRAC_SPLIT_START_BAND ); diff --git a/lib_dec/ivas_stat_dec.h b/lib_dec/ivas_stat_dec.h index 9b51b1299a..fff17c0366 100644 --- a/lib_dec/ivas_stat_dec.h +++ b/lib_dec/ivas_stat_dec.h @@ -1980,9 +1980,7 @@ typedef struct Decoder_Struct MC_MODE mc_mode; /* MC format mode */ int16_t sba_order; /* Ambisonic (SBA) order */ int16_t sba_planar; /* Ambisonic (SBA) planar flag */ -#ifdef SBA_ORDER_BITSTREAM int16_t sba_analysis_order; /* Ambisonic (SBA) order used for analysis and coding */ -#endif int16_t sba_dirac_stereo_flag; /* flag indicating stereo output for SBA DirAC modes with 1 TC */ /* rendering modules */ diff --git a/lib_dec/lib_dec.c b/lib_dec/lib_dec.c index 036cab190d..d3fa68ced7 100755 --- a/lib_dec/lib_dec.c +++ b/lib_dec/lib_dec.c @@ -179,9 +179,7 @@ ivas_error IVAS_DEC_Open( hIvasDec->st_ivas->sba_order = 0; hIvasDec->st_ivas->sba_planar = 0; -#ifdef SBA_ORDER_BITSTREAM hIvasDec->st_ivas->sba_analysis_order = 0; -#endif return IVAS_ERR_OK; } diff --git a/lib_enc/ivas_init_enc.c b/lib_enc/ivas_init_enc.c index d3fc621c1a..5eadb0f1eb 100644 --- a/lib_enc/ivas_init_enc.c +++ b/lib_enc/ivas_init_enc.c @@ -423,9 +423,7 @@ ivas_error ivas_init_encoder( { st_ivas->sba_mode = ivas_sba_mode_select( ivas_total_brate ); -#ifdef SBA_ORDER_BITSTREAM st_ivas->sba_analysis_order = ivas_sba_get_analysis_order( ivas_total_brate, st_ivas->hEncoderConfig->sba_order ); -#endif if ( st_ivas->sba_mode == SBA_MODE_SPAR ) { diff --git a/lib_enc/ivas_mct_enc.c b/lib_enc/ivas_mct_enc.c index 20a2856654..bcf5482da9 100644 --- a/lib_enc/ivas_mct_enc.c +++ b/lib_enc/ivas_mct_enc.c @@ -195,21 +195,13 @@ ivas_error create_mct_enc( } else if ( ivas_format == SBA_FORMAT && st_ivas->hSpar ) { -#ifndef SBA_ORDER_BITSTREAM - hMCT->nchan_out_woLFE = ivas_get_spar_num_TCs( ivas_total_brate, st_ivas->hEncoderConfig->sba_order ); -#else hMCT->nchan_out_woLFE = ivas_get_spar_num_TCs( ivas_total_brate, st_ivas->sba_analysis_order ); -#endif hMCT->num_lfe = FALSE; } else if ( ivas_format == SBA_FORMAT && st_ivas->hDirAC ) { -#ifndef SBA_ORDER_BITSTREAM - hMCT->nchan_out_woLFE = ivas_dirac_getNumTransportChannels( ivas_total_brate, st_ivas->hEncoderConfig->sba_order, st_ivas->hEncoderConfig->sba_planar ); -#else hMCT->nchan_out_woLFE = ivas_dirac_getNumTransportChannels( ivas_total_brate, st_ivas->sba_analysis_order, st_ivas->hEncoderConfig->sba_planar ); -#endif hMCT->num_lfe = FALSE; } else if ( ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_PARAMMC ) @@ -219,11 +211,7 @@ ivas_error create_mct_enc( } else if ( ivas_format == SBA_FORMAT ) { -#ifndef SBA_ORDER_BITSTREAM - hMCT->nchan_out_woLFE = ivas_sba_get_nchan( st_ivas->hEncoderConfig->sba_order, st_ivas->hEncoderConfig->sba_planar ); -#else hMCT->nchan_out_woLFE = ivas_sba_get_nchan( st_ivas->sba_analysis_order, st_ivas->hEncoderConfig->sba_planar ); -#endif hMCT->num_lfe = FALSE; } else @@ -351,20 +339,12 @@ ivas_error mct_enc_reconfigure( } else if ( ivas_format == SBA_FORMAT && st_ivas->hDirAC ) { -#ifndef SBA_ORDER_BITSTREAM - hMCT->nchan_out_woLFE = ivas_dirac_getNumTransportChannels( ivas_total_brate, st_ivas->hEncoderConfig->sba_order, st_ivas->hEncoderConfig->sba_planar ); -#else hMCT->nchan_out_woLFE = ivas_dirac_getNumTransportChannels( ivas_total_brate, st_ivas->sba_analysis_order, st_ivas->hEncoderConfig->sba_planar ); -#endif hMCT->num_lfe = FALSE; } else if ( ivas_format == SBA_FORMAT ) { -#ifndef SBA_ORDER_BITSTREAM - hMCT->nchan_out_woLFE = ivas_sba_get_nchan( st_ivas->hEncoderConfig->sba_order, st_ivas->hEncoderConfig->sba_planar ); -#else hMCT->nchan_out_woLFE = ivas_sba_get_nchan( st_ivas->sba_analysis_order, st_ivas->hEncoderConfig->sba_planar ); -#endif hMCT->num_lfe = FALSE; } else diff --git a/lib_enc/ivas_sba_enc.c b/lib_enc/ivas_sba_enc.c index 856a02e4dc..62fc6d0667 100644 --- a/lib_enc/ivas_sba_enc.c +++ b/lib_enc/ivas_sba_enc.c @@ -63,19 +63,11 @@ void ivas_sba_getTCs( const int16_t input_frame /* i : frame length */ ) { -#ifndef SBA_ORDER_BITSTREAM - ivas_sba_zero_vert_comp( sba_data, st_ivas->hEncoderConfig->sba_order, st_ivas->hEncoderConfig->sba_planar, input_frame ); -#else ivas_sba_zero_vert_comp( sba_data, st_ivas->sba_analysis_order, st_ivas->hEncoderConfig->sba_planar, input_frame ); -#endif if ( st_ivas->sba_mode == SBA_MODE_SPAR ) { -#ifndef SBA_ORDER_BITSTREAM - st_ivas->nchan_transport = ivas_get_spar_num_TCs( st_ivas->hEncoderConfig->ivas_total_brate, st_ivas->hEncoderConfig->sba_order ); -#else st_ivas->nchan_transport = ivas_get_spar_num_TCs( st_ivas->hEncoderConfig->ivas_total_brate, st_ivas->sba_analysis_order ); -#endif if ( st_ivas->nchan_transport >= 3 ) { /*convert WYZX downmix to WYXZ*/ @@ -91,11 +83,7 @@ void ivas_sba_getTCs( } else { -#ifndef SBA_ORDER_BITSTREAM - st_ivas->nchan_transport = ivas_dirac_getNumTransportChannels( st_ivas->hEncoderConfig->ivas_total_brate, st_ivas->hEncoderConfig->sba_order, st_ivas->hEncoderConfig->sba_planar ); -#else st_ivas->nchan_transport = ivas_dirac_getNumTransportChannels( st_ivas->hEncoderConfig->ivas_total_brate, st_ivas->sba_analysis_order, st_ivas->hEncoderConfig->sba_planar ); -#endif ivas_sba_dmx_enc( sba_data, st_ivas->nchan_transport, input_frame ); } @@ -251,9 +239,7 @@ ivas_error ivas_sba_enc_reconfigure( nSCE_old = st_ivas->nSCE; ind_list_metadata = NULL; -#ifdef SBA_ORDER_BITSTREAM st_ivas->sba_analysis_order = ivas_sba_get_analysis_order( ivas_total_brate, st_ivas->hEncoderConfig->sba_order ); -#endif ivas_dirac_enc_reconfigure( st_ivas ); ntransport = st_ivas->nchan_transport; diff --git a/lib_enc/ivas_spar_encoder.c b/lib_enc/ivas_spar_encoder.c index abe392c390..debb2c1eb7 100644 --- a/lib_enc/ivas_spar_encoder.c +++ b/lib_enc/ivas_spar_encoder.c @@ -79,11 +79,7 @@ ivas_error ivas_spar_enc_open( } input_Fs = hEncoderConfig->input_Fs; -#ifndef SBA_ORDER_BITSTREAM - sba_order_internal = min( hEncoderConfig->sba_order, IVAS_MAX_SBA_ORDER ); -#else sba_order_internal = min( st_ivas->sba_analysis_order, IVAS_MAX_SBA_ORDER ); -#endif nchan_inp = ivas_sba_get_nchan_metadata( sba_order_internal ); assert( nchan_inp <= hEncoderConfig->nchan_inp ); ivas_total_brate = hEncoderConfig->ivas_total_brate; @@ -94,11 +90,7 @@ ivas_error ivas_spar_enc_open( // ivas_set_bitrate_config(&hSpar->hMdEnc->spar_md_cfg, table_idx); /* MD handle */ -#ifndef SBA_ORDER_BITSTREAM - if ( ( error = ivas_spar_md_enc_open( &( hSpar->hMdEnc ), hEncoderConfig ) ) != IVAS_ERR_OK ) -#else if ( ( error = ivas_spar_md_enc_open( &( hSpar->hMdEnc ), hEncoderConfig, sba_order_internal ) ) != IVAS_ERR_OK ) -#endif { return error; } @@ -150,13 +142,8 @@ ivas_error ivas_spar_enc_open( * Configuration - set SPAR high-level parameters *-----------------------------------------------------------------*/ -#ifdef SBA_ORDER_BITSTREAM ivas_spar_config( hEncoderConfig->ivas_total_brate, min( st_ivas->sba_analysis_order, IVAS_MAX_SBA_ORDER ), &st_ivas->nchan_transport, &st_ivas->nSCE, &st_ivas->nCPE, &hSpar->core_nominal_brate, -1 ); -#else - ivas_spar_config( hEncoderConfig->ivas_total_brate, min( hEncoderConfig->sba_order, IVAS_MAX_SBA_ORDER ), - &st_ivas->nchan_transport, &st_ivas->nSCE, &st_ivas->nCPE, &hSpar->core_nominal_brate, -1 ); -#endif if ( st_ivas->nchan_transport == 1 ) { @@ -315,11 +302,7 @@ ivas_error ivas_spar_enc( if ( hEncoderConfig->sba_planar ) { -#ifndef SBA_ORDER_BITSTREAM - ivas_sba_zero_vert_comp( data_f, hEncoderConfig->sba_order, hEncoderConfig->sba_planar, input_frame ); -#else ivas_sba_zero_vert_comp( data_f, st_ivas->sba_analysis_order, hEncoderConfig->sba_planar, input_frame ); -#endif } if ( ( error = ivas_spar_enc_process( st_ivas, hEncoderConfig, hMetaData, st_ivas->hSpar->front_vad_flag, data_f ) ) != IVAS_ERR_OK ) @@ -329,11 +312,7 @@ ivas_error ivas_spar_enc( if ( hEncoderConfig->sba_planar ) { -#ifndef SBA_ORDER_BITSTREAM - ivas_sba_zero_vert_comp( data_f, hEncoderConfig->sba_order, hEncoderConfig->sba_planar, input_frame ); // TODO tmu: do we need a second call to this function ? -#else ivas_sba_zero_vert_comp( data_f, st_ivas->sba_analysis_order, hEncoderConfig->sba_planar, input_frame ); // TODO tmu: do we need a second call to this function ? -#endif } *nb_bits_metadata = hMetaData->nb_bits_tot; @@ -459,11 +438,7 @@ static ivas_error ivas_spar_enc_process( num_del_samples = hSpar->hFbMixer->fb_cfg->fb_latency; input_frame = (int16_t) ( input_Fs / FRAMES_PER_SEC ); -#ifndef SBA_ORDER_BITSTREAM - sba_order = min( hEncoderConfig->sba_order, IVAS_MAX_SBA_ORDER ); -#else sba_order = min( st_ivas->sba_analysis_order, IVAS_MAX_SBA_ORDER ); -#endif nchan_inp = ivas_sba_get_nchan_metadata( sba_order ); assert( nchan_inp <= hEncoderConfig->nchan_inp ); @@ -702,11 +677,7 @@ static ivas_error ivas_spar_enc_process( md_in_buf.num_bands = min( md_in_buf.num_bands, SPAR_DIRAC_SPLIT_START_BAND ); md_in_buf.dtx_vad = dtx_vad; -#ifndef SBA_ORDER_BITSTREAM - ivas_spar_md_enc_process( hSpar->hMdEnc, hEncoderConfig, &md_in_buf, hMetaData, dtx_silence_mode ); -#else ivas_spar_md_enc_process( hSpar->hMdEnc, hEncoderConfig, &md_in_buf, hMetaData, dtx_silence_mode, sba_order ); -#endif if ( st_ivas->sba_mode == SBA_MODE_SPAR ) { diff --git a/lib_enc/ivas_spar_md_enc.c b/lib_enc/ivas_spar_md_enc.c index 37245affc3..9325a737ef 100644 --- a/lib_enc/ivas_spar_md_enc.c +++ b/lib_enc/ivas_spar_md_enc.c @@ -85,10 +85,8 @@ static void ivas_store_prior_coeffs( ivas_spar_md_enc_state_t *hMdEnc, const int static void ivas_write_parameter_bitstream( ivas_spar_md_enc_state_t *hMdEnc, const int16_t nB, const int16_t bands_bw, BSTR_ENC_HANDLE hMetaData, const int32_t ivas_total_brate, const int16_t dtx_silence_mode, const int16_t strat, const int16_t qsi, const int16_t planarCP ); static ivas_error ivas_spar_md_enc_init( ivas_spar_md_enc_state_t *pState, const ENCODER_CONFIG_HANDLE hEncoderConfig -#ifdef SBA_ORDER_BITSTREAM , const int16_t sba_order -#endif ); static void ivas_spar_quant_pred_coeffs_dtx( ivas_spar_md_t *pSpar_md, float **ppValues, const int16_t ndm, int16_t **ppIndex, const int16_t dim1, float **ppQuant ); @@ -113,23 +111,14 @@ static void ivas_quant_pred_coeffs_per_band( ivas_band_coeffs_t *pband_coeffs, i ivas_error ivas_spar_md_enc_open( ivas_spar_md_enc_state_t **hMdEnc_in, /* i/o: SPAR MD encoder handle */ const ENCODER_CONFIG_HANDLE hEncoderConfig /* i : configuration structure */ -#ifdef SBA_ORDER_BITSTREAM , const int16_t sba_order /* i : Ambisonic (SBA) order */ -#endif ) { ivas_spar_md_enc_state_t *hMdEnc; ivas_error error; -#ifndef SBA_ORDER_BITSTREAM - int16_t num_channels, i, j, order; -#else int16_t num_channels, i, j; -#endif -#ifndef SBA_ORDER_BITSTREAM - order = min( hEncoderConfig->sba_order, IVAS_MAX_SBA_ORDER ); -#endif error = IVAS_ERR_OK; if ( ( hMdEnc = (ivas_spar_md_enc_state_t *) count_malloc( sizeof( ivas_spar_md_enc_state_t ) ) ) == NULL ) @@ -137,11 +126,7 @@ ivas_error ivas_spar_md_enc_open( return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR MD encoder" ); } -#ifndef SBA_ORDER_BITSTREAM - num_channels = 2 * order + 2; -#else num_channels = 2 * sba_order + 2; -#endif if ( ( hMdEnc->spar_md.band_coeffs = (ivas_band_coeffs_t *) count_malloc( IVAS_MAX_NUM_BANDS * sizeof( ivas_band_coeffs_t ) ) ) == NULL ) { @@ -223,11 +208,7 @@ ivas_error ivas_spar_md_enc_open( } } -#ifndef SBA_ORDER_BITSTREAM - if ( ( error = ivas_spar_md_enc_init( hMdEnc, hEncoderConfig ) ) != IVAS_ERR_OK ) -#else if ( ( error = ivas_spar_md_enc_init( hMdEnc, hEncoderConfig, sba_order ) ) != IVAS_ERR_OK ) -#endif { return error; } @@ -333,23 +314,15 @@ void ivas_spar_md_enc_close( static ivas_error ivas_spar_md_enc_init( ivas_spar_md_enc_state_t *pState, /* o : MD encoder handle */ const ENCODER_CONFIG_HANDLE hEncoderConfig /* i : configuration structure */ -#ifdef SBA_ORDER_BITSTREAM , const int16_t sba_order /* i : Ambisonic (SBA) order */ -#endif ) { float pFC[IVAS_MAX_NUM_BANDS]; int16_t table_idx; float PR_minmax[2]; -#ifndef SBA_ORDER_BITSTREAM - int16_t sba_order; -#endif int16_t num_channels, i, j, k; -#ifndef SBA_ORDER_BITSTREAM - sba_order = min( hEncoderConfig->sba_order, IVAS_MAX_SBA_ORDER ); -#endif num_channels = ivas_sba_get_nchan_metadata( sba_order ); table_idx = ivas_get_spar_table_idx( hEncoderConfig->ivas_total_brate, sba_order, SPAR_CONFIG_BW, NULL, NULL ); @@ -590,10 +563,8 @@ ivas_error ivas_spar_md_enc_process( ivas_spar_md_enc_in_buf_t *pIn_buf, BSTR_ENC_HANDLE hMetaData, /* i/o: MetaData handle */ const int16_t dtx_silence_mode -#ifdef SBA_ORDER_BITSTREAM , const int16_t sba_order /* i : Ambisonic (SBA) order */ -#endif ) { float pred_coeffs_re[IVAS_SPAR_MAX_CH - 1][IVAS_MAX_NUM_BANDS]; @@ -603,11 +574,7 @@ ivas_error ivas_spar_md_enc_process( int16_t j, planarCP; int16_t num_bands = pIn_buf->num_bands; int16_t dtx_vad = pIn_buf->dtx_vad; -#ifndef SBA_ORDER_BITSTREAM - int16_t active_w, nchan_transport, dmx_switch, strat, sba_order; -#else int16_t active_w, nchan_transport, dmx_switch, strat; -#endif int16_t nB, bands_bw, packed_ok = 0; ivas_strats_t cs[MAX_CODING_STRATS]; int16_t code_strat; @@ -618,9 +585,6 @@ ivas_error ivas_spar_md_enc_process( ivas_spar_md_enc_state_t *pState = hMdEnc; int16_t num_quant_strats = pState->spar_md_cfg.num_quant_strats; -#ifndef SBA_ORDER_BITSTREAM - sba_order = min( hEncoderConfig->sba_order, IVAS_MAX_SBA_ORDER ); -#endif num_ch = ivas_sba_get_nchan_metadata( sba_order ); active_w = pState->spar_md_cfg.active_w; nchan_transport = pState->spar_md_cfg.nchan_transport; diff --git a/lib_enc/ivas_stat_enc.h b/lib_enc/ivas_stat_enc.h index f3f74c002e..2ed6a0ff91 100644 --- a/lib_enc/ivas_stat_enc.h +++ b/lib_enc/ivas_stat_enc.h @@ -1040,9 +1040,7 @@ typedef struct /* high-level encoder parameters */ int16_t nchan_transport; /* number of transport channels */ -#ifdef SBA_ORDER_BITSTREAM int16_t sba_analysis_order; /* Ambisonic (SBA) order used for analysis and coding */ -#endif int16_t codec_mode; /* Mode1 or Mode2 of core codec */ int16_t last_codec_mode; /* previous frame Mode 1 or 2 */ diff --git a/lib_enc/lib_enc.c b/lib_enc/lib_enc.c index 1ffe8007f4..883f3684fc 100755 --- a/lib_enc/lib_enc.c +++ b/lib_enc/lib_enc.c @@ -158,9 +158,7 @@ ivas_error IVAS_ENC_Open( st_ivas->mc_mode = MC_MODE_NONE; st_ivas->ism_mode = ISM_MODE_NONE; st_ivas->sba_mode = SBA_MODE_NONE; -#ifdef SBA_ORDER_BITSTREAM st_ivas->sba_analysis_order = 0; -#endif init_encoder_config( st_ivas->hEncoderConfig ); -- GitLab From bb24565a4dc22a7349fecd0899a0957d5756b15d Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Thu, 1 Sep 2022 17:26:56 +0200 Subject: [PATCH 4/7] [cleanup] accept NTT_UPDATE_ITD_SW --- lib_com/options.h | 1 - lib_enc/ivas_stereo_dmx_evs.c | 15 --------------- 2 files changed, 16 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index 3b69769495..822bf7112a 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -153,7 +153,6 @@ /* NTT switches */ -#define NTT_UPDATE_ITD_SW /* contribution 4: Update of ITD switch in stereo downmix for EVS */ #define NTT_REMOVE_EPS_ROM /* contribution 4: Reduction of ROM size in stereo downmix for EVS */ #define SPAR_SCALING_HARMONIZATION /* issue 80: Changes to harmonize scaling in spar */ diff --git a/lib_enc/ivas_stereo_dmx_evs.c b/lib_enc/ivas_stereo_dmx_evs.c index 409b7b0d56..aab2a4f2a6 100644 --- a/lib_enc/ivas_stereo_dmx_evs.c +++ b/lib_enc/ivas_stereo_dmx_evs.c @@ -445,20 +445,6 @@ static float find_poc_peak( } } -#ifndef NTT_UPDATE_ITD_SW - if ( on[0] && prev_off[0] ) - { - *itd = (float) itdLR[0]; - } - else if ( on[1] && prev_off[1] ) - { - *itd = (float) itdLR[1]; - } - else - { - *itd = ( *itd > 0 ) ? (float) itdLR[0] : (float) itdLR[1]; - } -#else if ( ( on[0] && prev_off[0] ) && ( on[1] && prev_off[1] ) ) /*if both channels have newly detected as active (possibility of preceding), select channel by peakness Q[] of POC */ { *itd = ( Q[0] > Q[1] ) ? (float) itdLR[0] : (float) itdLR[1]; @@ -487,7 +473,6 @@ static float find_poc_peak( { *itd = ( *itd > 0 ) ? (float) itdLR[0] : (float) itdLR[1]; } -#endif cconfidence = sqrtf( fabsf( Q[0] - Q[1] ) ); /*higher value indicates higher confidence for one preceding channel*/ -- GitLab From 52ea3b9e879b38941a56f977026d6343c6e2b27d Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Thu, 1 Sep 2022 17:31:20 +0200 Subject: [PATCH 5/7] [cleanup] accept NTT_REMOVE_EPS_ROM --- lib_com/options.h | 1 - lib_enc/ivas_rom_enc.c | 154 ---------------------------------- lib_enc/ivas_rom_enc.h | 5 -- lib_enc/ivas_stereo_dmx_evs.c | 50 ----------- 4 files changed, 210 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index 822bf7112a..567f131a89 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -153,7 +153,6 @@ /* NTT switches */ -#define NTT_REMOVE_EPS_ROM /* contribution 4: Reduction of ROM size in stereo downmix for EVS */ #define SPAR_SCALING_HARMONIZATION /* issue 80: Changes to harmonize scaling in spar */ /* ################## End DEVELOPMENT switches ######################### */ diff --git a/lib_enc/ivas_rom_enc.c b/lib_enc/ivas_rom_enc.c index e8048b8f1a..ebc4ee6bc3 100644 --- a/lib_enc/ivas_rom_enc.c +++ b/lib_enc/ivas_rom_enc.c @@ -534,160 +534,6 @@ const float ari_bit_estimate_s17_LC[RANGE_N_CONTEXT][RANGE_N_SYMBOLS] = * Stereo downmix to EVS ROM tables *----------------------------------------------------------------------------------*/ -#ifndef NTT_REMOVE_EPS_ROM -const float Stereo_dmx_s_wnd_coef_eps_16k[L_FRAME16k * 3 / 4] = { - 0.00000000f, 0.000385506690f, 0.000770864717f, 0.00115592557f, 0.00154054083f, 0.00192456215f, 0.00230784155f, 0.00269023119f, 0.00307158381f, 0.00345175178f, - 0.00383058959f, 0.00420795102f, 0.00458368938f, 0.00495766103f, 0.00532972161f, 0.00569972629f, 0.00606753491f, 0.00643300405f, 0.00679599261f, 0.00715636183f, - 0.00751397246f, 0.00786868576f, 0.00822036527f, 0.00856887549f, 0.00891408324f, 0.00925585348f, 0.00959405676f, 0.00992856082f, 0.0102592362f, 0.0105859563f, - 0.0109085962f, 0.0112270303f, 0.0115411365f, 0.0118507938f, 0.0121558821f, 0.0124562839f, 0.0127518829f, 0.0130425673f, 0.0133282226f, 0.0136087397f, - 0.0138840098f, 0.0141539266f, 0.0144183896f, 0.0146772927f, 0.0149305379f, 0.0151780248f, 0.0154196629f, 0.0156553555f, 0.0158850122f, 0.0161085464f, - 0.0163258687f, 0.0165368970f, 0.0167415515f, 0.0169397499f, 0.0171314199f, 0.0173164830f, 0.0174948741f, 0.0176665168f, 0.0178313497f, 0.0179893095f, - 0.0181403328f, 0.0182843637f, 0.0184213445f, 0.0185512230f, 0.0186739527f, 0.0187894795f, 0.0188977662f, 0.0189987645f, 0.0190924387f, 0.0191787537f, - 0.0192576759f, 0.0193291716f, 0.0193932168f, 0.0194497835f, 0.0194988549f, 0.0195404068f, 0.0195744261f, 0.0196008999f, 0.0196198169f, 0.0196311697f, - 0.0196349546f, 0.0196311697f, 0.0196198169f, 0.0196008999f, 0.0195744261f, 0.0195404068f, 0.0194988549f, 0.0194497835f, 0.0193932150f, 0.0193291716f, - 0.0192576740f, 0.0191787537f, 0.0190924387f, 0.0189987645f, 0.0188977644f, 0.0187894795f, 0.0186739508f, 0.0185512230f, 0.0184213426f, 0.0182843637f, - 0.0181403328f, 0.0179893095f, 0.0178313479f, 0.0176665168f, 0.0174948722f, 0.0173164830f, 0.0171314199f, 0.0169397499f, 0.0167415496f, 0.0165368970f, - 0.0163258687f, 0.0161085445f, 0.0158850104f, 0.0156553555f, 0.0154196629f, 0.0151780220f, 0.0149305360f, 0.0146772927f, 0.0144183887f, 0.0141539248f, - 0.0138840098f, 0.0136087388f, 0.0133282207f, 0.0130425654f, 0.0127518829f, 0.0124562830f, 0.0121558802f, 0.0118507929f, 0.0115411356f, 0.0112270294f, - 0.0109085953f, 0.0105859553f, 0.0102592343f, 0.00992855709f, 0.00959405396f, 0.00925585162f, 0.00891408045f, 0.00856887735f, 0.00822036248f, 0.00786868297f, - 0.00751396874f, 0.00715636322f, 0.00679598982f, 0.00643300032f, 0.00606753537f, 0.00569972722f, 0.00532971695f, 0.00495765638f, 0.00458368938f, 0.00420795055f, - 0.00383058493f, 0.00345175178f, 0.00307158334f, 0.00269023073f, 0.00230784062f, 0.00192456122f, 0.00154053967f, 0.00115592428f, 0.000770863262f, 0.000385505118f, - -1.71654224e-09f, -0.000385508552f, -0.000770866696f, -0.00115592312f, -0.00154053851f, -0.00192456460f, -0.00230784412f, -0.00269023376f, -0.00307158637f, -0.00345175504f, - -0.00383058819f, -0.00420794915f, -0.00458368799f, -0.00495766429f, -0.00532972487f, -0.00569973048f, -0.00606753910f, -0.00643300358f, -0.00679599261f, -0.00715636183f, - -0.00751397153f, -0.00786868948f, -0.00822036993f, -0.00856888015f, -0.00891408417f, -0.00925585441f, -0.00959405676f, -0.00992856082f, -0.0102592362f, -0.0105859619f, - -0.0109086009f, -0.0112270284f, -0.0115411393f, -0.0118507957f, -0.0121558839f, -0.0124562858f, -0.0127518848f, -0.0130425720f, -0.0133282207f, -0.0136087369f, - -0.0138840117f, -0.0141539304f, -0.0144183915f, -0.0146772945f, -0.0149305388f, -0.0151780248f, -0.0154196648f, -0.0156553555f, -0.0158850141f, -0.0161085445f, - -0.0163258705f, -0.0165369026f, -0.0167415477f, -0.0169397499f, -0.0171314217f, -0.0173164848f, -0.0174948759f, -0.0176665168f, -0.0178313479f, -0.0179893095f, - -0.0181403328f, -0.0182843637f, -0.0184213463f, -0.0185512248f, -0.0186739527f, -0.0187894795f, -0.0188977644f, -0.0189987663f, -0.0190924387f, -0.0191787556f, - -0.0192576759f, -0.0193291716f, -0.0193932150f, -0.0194497835f, -0.0194988549f, -0.0195404068f, -0.0195744261f, -0.0196008999f, -0.0196198169f, -0.0196311697f -}; - -const float Stereo_dmx_s_wnd_coef_eps_32k[L_FRAME32k * 3 / 4] = { - 0.00000000f, 9.63813145e-05f, 0.000192753345f, 0.000289106771f, 0.000385432359f, 0.000481720810f, 0.000577962783f, 0.000674149080f, 0.000770270417f, 0.000866317423f, - 0.000962281076f, 0.00105815195f, 0.00115392078f, 0.00124957843f, 0.00134511560f, 0.00144052308f, 0.00153579190f, 0.00163091265f, 0.00172587589f, 0.00182067312f, - 0.00191529479f, 0.00200973195f, 0.00210397551f, 0.00219801581f, 0.00229184469f, 0.00238545262f, 0.00247883052f, 0.00257196953f, 0.00266486080f, 0.00275749480f, - 0.00284986314f, 0.00294195698f, 0.00303376745f, 0.00312528526f, 0.00321650202f, 0.00330740865f, 0.00339799630f, 0.00348825660f, 0.00357818091f, 0.00366776017f, - 0.00375698623f, 0.00384584931f, 0.00393434288f, 0.00402245624f, 0.00411018264f, 0.00419751229f, 0.00428443775f, 0.00437095016f, 0.00445704162f, 0.00454270327f, - 0.00462792674f, 0.00471270457f, 0.00479702838f, 0.00488088885f, 0.00496428041f, 0.00504719233f, 0.00512961810f, 0.00521154935f, 0.00529297814f, 0.00537389703f, - 0.00545429811f, 0.00553417346f, 0.00561351515f, 0.00569231622f, 0.00577056827f, 0.00584826432f, 0.00592539692f, 0.00600195816f, 0.00607794104f, 0.00615333812f, - 0.00622814195f, 0.00630234554f, 0.00637594145f, 0.00644892361f, 0.00652128365f, 0.00659301504f, 0.00666411128f, 0.00673456443f, 0.00680436986f, 0.00687351823f, - 0.00694200490f, 0.00700982194f, 0.00707696332f, 0.00714342389f, 0.00720919482f, 0.00727427099f, 0.00733864633f, 0.00740231434f, 0.00746526895f, 0.00752750318f, - 0.00758901238f, 0.00764979096f, 0.00770983147f, 0.00776912877f, 0.00782767776f, 0.00788547192f, 0.00794250611f, 0.00799877476f, 0.00805427320f, 0.00810899399f, - 0.00816293433f, 0.00821608771f, 0.00826844852f, 0.00832001306f, 0.00837077573f, 0.00842073187f, 0.00846987497f, 0.00851820316f, 0.00856570993f, 0.00861239061f, - 0.00865824148f, 0.00870325882f, 0.00874743704f, 0.00879077055f, 0.00883325841f, 0.00887489505f, 0.00891567487f, 0.00895559601f, 0.00899465475f, 0.00903284643f, - 0.00907016639f, 0.00910661276f, 0.00914218184f, 0.00917686895f, 0.00921067223f, 0.00924358703f, 0.00927561149f, 0.00930674188f, 0.00933697633f, 0.00936630927f, - 0.00939473975f, 0.00942226499f, 0.00944888312f, 0.00947458949f, 0.00949938223f, 0.00952325948f, 0.00954621937f, 0.00956825912f, 0.00958937686f, 0.00960957073f, - 0.00962883793f, 0.00964717567f, 0.00966458581f, 0.00968106277f, 0.00969660841f, 0.00971121807f, 0.00972489174f, 0.00973762851f, 0.00974942744f, 0.00976028573f, - 0.00977020338f, 0.00977917947f, 0.00978721306f, 0.00979430322f, 0.00980044995f, 0.00980565138f, 0.00980990846f, 0.00981321931f, 0.00981558487f, 0.00981700420f, - 0.00981747732f, 0.00981700420f, 0.00981558487f, 0.00981321931f, 0.00980990846f, 0.00980565138f, 0.00980044995f, 0.00979430322f, 0.00978721306f, 0.00977917947f, - 0.00977020338f, 0.00976028573f, 0.00974942744f, 0.00973762851f, 0.00972489174f, 0.00971121807f, 0.00969660748f, 0.00968106277f, 0.00966458581f, 0.00964717567f, - 0.00962883700f, 0.00960956980f, 0.00958937686f, 0.00956825912f, 0.00954621937f, 0.00952325948f, 0.00949938223f, 0.00947458856f, 0.00944888219f, 0.00942226499f, - 0.00939473975f, 0.00936630927f, 0.00933697540f, 0.00930674188f, 0.00927561149f, 0.00924358703f, 0.00921067130f, 0.00917686801f, 0.00914218184f, 0.00910661276f, - 0.00907016639f, 0.00903284550f, 0.00899465475f, 0.00895559601f, 0.00891567394f, 0.00887489505f, 0.00883325841f, 0.00879077055f, 0.00874743611f, 0.00870325882f, - 0.00865824148f, 0.00861238968f, 0.00856570993f, 0.00851820316f, 0.00846987497f, 0.00842073094f, 0.00837077480f, 0.00832001306f, 0.00826844852f, 0.00821608678f, - 0.00816293433f, 0.00810899399f, 0.00805427227f, 0.00799877476f, 0.00794250518f, 0.00788547192f, 0.00782767776f, 0.00776912784f, 0.00770983147f, 0.00764979003f, - 0.00758901099f, 0.00752750272f, 0.00746526802f, 0.00740231294f, 0.00733864633f, 0.00727427006f, 0.00720919436f, 0.00714342296f, 0.00707696239f, 0.00700982334f, - 0.00694200490f, 0.00687351730f, 0.00680436939f, 0.00673456397f, 0.00666411035f, 0.00659301365f, 0.00652128272f, 0.00644892408f, 0.00637594145f, 0.00630234415f, - 0.00622814149f, 0.00615333673f, 0.00607794011f, 0.00600195862f, 0.00592539646f, 0.00584826525f, 0.00577056780f, 0.00569231436f, 0.00561351469f, 0.00553417206f, - 0.00545429764f, 0.00537389750f, 0.00529297767f, 0.00521154935f, 0.00512961717f, 0.00504719047f, 0.00496427855f, 0.00488088885f, 0.00479702698f, 0.00471270457f, - 0.00462792581f, 0.00454270281f, 0.00445704022f, 0.00437094783f, 0.00428443868f, 0.00419751182f, 0.00411018124f, 0.00402245624f, 0.00393434148f, 0.00384584907f, - 0.00375698437f, 0.00366775948f, 0.00357818161f, 0.00348825636f, 0.00339799491f, 0.00330740795f, 0.00321650016f, 0.00312528457f, 0.00303376769f, 0.00294195651f, - 0.00284986361f, 0.00275749387f, 0.00266485848f, 0.00257196836f, 0.00247882819f, 0.00238545146f, 0.00229184469f, 0.00219801464f, 0.00210397528f, 0.00200973079f, - 0.00191529247f, 0.00182067417f, 0.00172587589f, 0.00163091114f, 0.00153579167f, 0.00144052168f, 0.00134511536f, 0.00124957680f, 0.00115392031f, 0.00105815264f, - 0.000962280610f, 0.000866315851f, 0.000770269835f, 0.000674147333f, 0.000577962142f, 0.000481721276f, 0.000385431631f, 0.000289107207f, 0.000192752559f, 9.63793209e-05f, - -8.58271121e-10f, -9.63833809e-05f, -0.000192754276f, -0.000289106567f, -0.000385433348f, -0.000481720665f, -0.000577961560f, -0.000674149022f, -0.000770269253f, -0.000866317481f, - -0.000962282298f, -0.00105815206f, -0.00115392206f, -0.00124957855f, -0.00134511688f, -0.00144052564f, -0.00153579318f, -0.00163091510f, -0.00172587752f, -0.00182067591f, - -0.00191529409f, -0.00200973242f, -0.00210397458f, -0.00219801627f, -0.00229184399f, -0.00238545309f, -0.00247883215f, -0.00257196999f, -0.00266486243f, -0.00275749573f, - -0.00284986524f, -0.00294196024f, -0.00303376955f, -0.00312528410f, -0.00321650179f, -0.00330740749f, -0.00339799630f, -0.00348825776f, -0.00357818091f, -0.00366776134f, - -0.00375698577f, -0.00384585070f, -0.00393434474f, -0.00402245764f, -0.00411018496f, -0.00419751368f, -0.00428444007f, -0.00437094970f, -0.00445704209f, -0.00454270234f, - -0.00462792721f, -0.00471270364f, -0.00479702838f, -0.00488089072f, -0.00496428041f, -0.00504719326f, -0.00512961810f, -0.00521155121f, -0.00529298093f, -0.00537389843f, - -0.00545430044f, -0.00553417299f, -0.00561351422f, -0.00569231622f, -0.00577056967f, -0.00584826432f, -0.00592539785f, -0.00600195816f, -0.00607794197f, -0.00615333952f, - -0.00622814288f, -0.00630234741f, -0.00637594238f, -0.00644892501f, -0.00652128598f, -0.00659301504f, -0.00666411035f, -0.00673456537f, -0.00680436846f, -0.00687351823f, - -0.00694200583f, -0.00700982241f, -0.00707696518f, -0.00714342389f, -0.00720919576f, -0.00727427332f, -0.00733864726f, -0.00740231574f, -0.00746526942f, -0.00752750272f, - -0.00758901238f, -0.00764979143f, -0.00770983240f, -0.00776912784f, -0.00782767776f, -0.00788547192f, -0.00794250704f, -0.00799877662f, -0.00805427227f, -0.00810899492f, - -0.00816293526f, -0.00821608957f, -0.00826845132f, -0.00832001399f, -0.00837077387f, -0.00842073094f, -0.00846987497f, -0.00851820316f, -0.00856571086f, -0.00861239061f, - -0.00865824241f, -0.00870325882f, -0.00874743797f, -0.00879077241f, -0.00883325841f, -0.00887489505f, -0.00891567394f, -0.00895559601f, -0.00899465475f, -0.00903284643f, - -0.00907016639f, -0.00910661276f, -0.00914218184f, -0.00917686988f, -0.00921067316f, -0.00924358703f, -0.00927561242f, -0.00930674374f, -0.00933697633f, -0.00936631020f, - -0.00939473975f, -0.00942226499f, -0.00944888219f, -0.00947458949f, -0.00949938316f, -0.00952326041f, -0.00954621937f, -0.00956825912f, -0.00958937779f, -0.00960957073f, - -0.00962883793f, -0.00964717567f, -0.00966458581f, -0.00968106370f, -0.00969660748f, -0.00971121807f, -0.00972489174f, -0.00973762851f, -0.00974942744f, -0.00976028573f, - -0.00977020338f, -0.00977917947f, -0.00978721306f, -0.00979430322f, -0.00980044995f, -0.00980565138f, -0.00980990846f, -0.00981321931f, -0.00981558487f, -0.00981700420f -}; - -const float Stereo_dmx_s_wnd_coef_eps_48k[L_FRAME48k * 3 / 4] = { - 0.00000000f, 4.28365238e-05f, 8.56712068e-05f, 0.000128502230f, 0.000171327745f, 0.000214145897f, 0.000256954925f, 0.000299752894f, 0.000342538056f, 0.000385308522f, - 0.000428062514f, 0.000470798172f, 0.000513513631f, 0.000556207087f, 0.000598876737f, 0.000641520717f, 0.000684137223f, 0.000726724451f, 0.000769280537f, 0.000811803620f, - 0.000854292011f, 0.000896743732f, 0.000939157035f, 0.000981530058f, 0.00102386123f, 0.00106614840f, 0.00110838993f, 0.00115058408f, 0.00119272876f, 0.00123482244f, - 0.00127686327f, 0.00131884927f, 0.00136077893f, 0.00140265026f, 0.00144446141f, 0.00148621085f, 0.00152789650f, 0.00156951661f, 0.00161106954f, 0.00165255368f, - 0.00169396668f, 0.00173530739f, 0.00177657383f, 0.00181776390f, 0.00185887620f, 0.00189990876f, 0.00194086006f, 0.00198172848f, 0.00202251156f, 0.00206320849f, - 0.00210381625f, 0.00214433460f, 0.00218476099f, 0.00222509354f, 0.00226533110f, 0.00230547134f, 0.00234551285f, 0.00238545402f, 0.00242529274f, 0.00246502785f, - 0.00250465749f, 0.00254417956f, 0.00258359266f, 0.00262289518f, 0.00266208523f, 0.00270116120f, 0.00274012191f, 0.00277896458f, 0.00281768874f, 0.00285629183f, - 0.00289477292f, 0.00293312967f, 0.00297136116f, 0.00300946506f, 0.00304743997f, 0.00308528449f, 0.00312299700f, 0.00316057540f, 0.00319801876f, 0.00323532475f, - 0.00327249244f, 0.00330952019f, 0.00334640569f, 0.00338314800f, 0.00341974548f, 0.00345619628f, 0.00349249900f, 0.00352865248f, 0.00356465438f, 0.00360050355f, - 0.00363619882f, 0.00367173832f, 0.00370712043f, 0.00374234351f, 0.00377740664f, 0.00381230796f, 0.00384704559f, 0.00388161885f, 0.00391602563f, 0.00395026430f, - 0.00398433441f, 0.00401823362f, 0.00405196054f, 0.00408551423f, 0.00411889236f, 0.00415209495f, 0.00418511871f, 0.00421796367f, 0.00425062794f, 0.00428310968f, - 0.00431540888f, 0.00434752228f, 0.00437944988f, 0.00441118982f, 0.00444274070f, 0.00447410159f, 0.00450527016f, 0.00453624642f, 0.00456702849f, 0.00459761405f, - 0.00462800311f, 0.00465819426f, 0.00468818564f, 0.00471797585f, 0.00474756397f, 0.00477694906f, 0.00480613019f, 0.00483510410f, 0.00486387173f, 0.00489243073f, - 0.00492078019f, 0.00494891917f, 0.00497684581f, 0.00500455918f, 0.00503205787f, 0.00505934143f, 0.00508640893f, 0.00511325756f, 0.00513988733f, 0.00516629731f, - 0.00519248564f, 0.00521845184f, 0.00524419453f, 0.00526971230f, 0.00529500423f, 0.00532006938f, 0.00534490682f, 0.00536951516f, 0.00539389346f, 0.00541804079f, - 0.00544195622f, 0.00546563789f, 0.00548908627f, 0.00551229948f, 0.00553527568f, 0.00555801531f, 0.00558051746f, 0.00560277933f, 0.00562480185f, 0.00564658362f, - 0.00566812325f, 0.00568941981f, 0.00571047375f, 0.00573128136f, 0.00575184496f, 0.00577216130f, 0.00579223083f, 0.00581205217f, 0.00583162485f, 0.00585094700f, - 0.00587001862f, 0.00588883879f, 0.00590740750f, 0.00592572242f, 0.00594378356f, 0.00596159045f, 0.00597914122f, 0.00599643635f, 0.00601347443f, 0.00603025546f, - 0.00604677759f, 0.00606304128f, 0.00607904466f, 0.00609478820f, 0.00611026958f, 0.00612549018f, 0.00614044815f, 0.00615514303f, 0.00616957434f, 0.00618374115f, - 0.00619764347f, 0.00621127989f, 0.00622465089f, 0.00623775460f, 0.00625059102f, 0.00626316015f, 0.00627546059f, 0.00628749235f, 0.00629925495f, 0.00631074747f, - 0.00632196991f, 0.00633292133f, 0.00634360174f, 0.00635401066f, 0.00636414625f, 0.00637401035f, 0.00638360064f, 0.00639291806f, 0.00640196120f, 0.00641073054f, - 0.00641922513f, 0.00642744405f, 0.00643538870f, 0.00644305674f, 0.00645044958f, 0.00645756535f, 0.00646440545f, 0.00647096802f, 0.00647725351f, 0.00648326147f, - 0.00648899190f, 0.00649444386f, 0.00649961783f, 0.00650451379f, 0.00650913082f, 0.00651346892f, 0.00651752809f, 0.00652130833f, 0.00652480870f, 0.00652803015f, - 0.00653097173f, 0.00653363345f, 0.00653601484f, 0.00653811684f, 0.00653993897f, 0.00654148031f, 0.00654274225f, 0.00654372340f, 0.00654442422f, 0.00654484471f, - 0.00654498488f, 0.00654484471f, 0.00654442422f, 0.00654372340f, 0.00654274225f, 0.00654148031f, 0.00653993897f, 0.00653811684f, 0.00653601484f, 0.00653363345f, - 0.00653097173f, 0.00652802968f, 0.00652480870f, 0.00652130833f, 0.00651752809f, 0.00651346892f, 0.00650913082f, 0.00650451332f, 0.00649961783f, 0.00649444386f, - 0.00648899190f, 0.00648326147f, 0.00647725351f, 0.00647096802f, 0.00646440499f, 0.00645756535f, 0.00645044912f, 0.00644305674f, 0.00643538870f, 0.00642744405f, - 0.00641922466f, 0.00641073054f, 0.00640196120f, 0.00639291806f, 0.00638360064f, 0.00637400988f, 0.00636414625f, 0.00635401020f, 0.00634360174f, 0.00633292086f, - 0.00632196991f, 0.00631074747f, 0.00629925495f, 0.00628749235f, 0.00627546012f, 0.00626315968f, 0.00625059055f, 0.00623775413f, 0.00622465042f, 0.00621127989f, - 0.00619764347f, 0.00618374115f, 0.00616957434f, 0.00615514303f, 0.00614044769f, 0.00612549018f, 0.00611027004f, 0.00609478774f, 0.00607904419f, 0.00606304081f, - 0.00604677759f, 0.00603025500f, 0.00601347489f, 0.00599643635f, 0.00597914122f, 0.00596158998f, 0.00594378309f, 0.00592572149f, 0.00590740703f, 0.00588883879f, - 0.00587001862f, 0.00585094653f, 0.00583162392f, 0.00581205124f, 0.00579223037f, 0.00577216130f, 0.00575184496f, 0.00573128182f, 0.00571047282f, 0.00568941981f, - 0.00566812325f, 0.00564658316f, 0.00562480185f, 0.00560277933f, 0.00558051653f, 0.00555801531f, 0.00553527661f, 0.00551229948f, 0.00548908627f, 0.00546563789f, - 0.00544195622f, 0.00541804079f, 0.00539389299f, 0.00536951469f, 0.00534490682f, 0.00532006891f, 0.00529500330f, 0.00526971091f, 0.00524419360f, 0.00521845091f, - 0.00519248564f, 0.00516629778f, 0.00513988733f, 0.00511325756f, 0.00508640800f, 0.00505934190f, 0.00503205787f, 0.00500455871f, 0.00497684488f, 0.00494891871f, - 0.00492077926f, 0.00489242980f, 0.00486387173f, 0.00483510457f, 0.00480612973f, 0.00477694906f, 0.00474756444f, 0.00471797585f, 0.00468818471f, 0.00465819333f, - 0.00462800311f, 0.00459761359f, 0.00456702709f, 0.00453624595f, 0.00450526970f, 0.00447410066f, 0.00444273977f, 0.00441119028f, 0.00437944988f, 0.00434752181f, - 0.00431540795f, 0.00428310968f, 0.00425062748f, 0.00421796273f, 0.00418511871f, 0.00415209448f, 0.00411889143f, 0.00408551283f, 0.00405196007f, 0.00401823269f, - 0.00398433302f, 0.00395026430f, 0.00391602563f, 0.00388161885f, 0.00384704513f, 0.00381230796f, 0.00377740664f, 0.00374234305f, 0.00370711950f, 0.00367173809f, - 0.00363619835f, 0.00360050285f, 0.00356465275f, 0.00352865178f, 0.00349249784f, 0.00345619605f, 0.00341974595f, 0.00338314800f, 0.00334640522f, 0.00330951903f, - 0.00327249290f, 0.00323532452f, 0.00319801806f, 0.00316057424f, 0.00312299654f, 0.00308528380f, 0.00304743880f, 0.00300946319f, 0.00297135999f, 0.00293312967f, - 0.00289477245f, 0.00285629253f, 0.00281768874f, 0.00277896435f, 0.00274012075f, 0.00270116120f, 0.00266208476f, 0.00262289424f, 0.00258359103f, 0.00254417886f, - 0.00250465632f, 0.00246502645f, 0.00242529227f, 0.00238545449f, 0.00234551262f, 0.00230547064f, 0.00226533134f, 0.00222509331f, 0.00218476006f, 0.00214433344f, - 0.00210381625f, 0.00206320756f, 0.00202251016f, 0.00198172801f, 0.00194085937f, 0.00189990760f, 0.00185887585f, 0.00181776448f, 0.00177657383f, 0.00173530704f, - 0.00169396598f, 0.00165255368f, 0.00161106919f, 0.00156951568f, 0.00152789650f, 0.00148621027f, 0.00144446036f, 0.00140264863f, 0.00136077835f, 0.00131884834f, - 0.00127686316f, 0.00123482186f, 0.00119272911f, 0.00115058396f, 0.00110838923f, 0.00106614875f, 0.00102386111f, 0.000981529476f, 0.000939155812f, 0.000896743557f, - 0.000854291196f, 0.000811802340f, 0.000769278675f, 0.000726723636f, 0.000684137398f, 0.000641520426f, 0.000598877436f, 0.000556207204f, 0.000513513223f, 0.000470797240f, - 0.000428062631f, 0.000385308114f, 0.000342537096f, 0.000299751409f, 0.000256954430f, 0.000214144908f, 0.000171326188f, 0.000128500149f, 8.56717088e-05f, 4.28364874e-05f, - -5.72180747e-10f, -4.28360690e-05f, -8.56712868e-05f, -0.000128502856f, -0.000171328895f, -0.000214146057f, -0.000256955565f, -0.000299754087f, -0.000342539803f, -0.000385309249f, - -0.000428063737f, -0.000470799918f, -0.000513512816f, -0.000556206855f, -0.000598876970f, -0.000641521532f, -0.000684137049f, -0.000726724742f, -0.000769281352f, -0.000811805017f, - -0.000854292419f, -0.000896744605f, -0.000939158490f, -0.000981530524f, -0.00102386216f, -0.00106614991f, -0.00110839040f, -0.00115058350f, -0.00119272876f, -0.00123482291f, - -0.00127686432f, -0.00131884939f, -0.00136077951f, -0.00140265131f, -0.00144446141f, -0.00148621143f, -0.00152789755f, -0.00156951835f, -0.00161107024f, -0.00165255321f, - -0.00169396691f, -0.00173530797f, -0.00177657336f, -0.00181776413f, -0.00185887702f, -0.00189990853f, -0.00194086053f, -0.00198172918f, -0.00202251296f, -0.00206320873f, - -0.00210381718f, -0.00214433600f, -0.00218476262f, -0.00222509308f, -0.00226533087f, -0.00230547180f, -0.00234551216f, -0.00238545402f, -0.00242529344f, -0.00246502901f, - -0.00250465726f, -0.00254418002f, -0.00258359360f, -0.00262289657f, -0.00266208570f, -0.00270116236f, -0.00274012331f, -0.00277896388f, -0.00281768828f, -0.00285629206f, - -0.00289477338f, -0.00293312944f, -0.00297136139f, -0.00300946552f, -0.00304744113f, -0.00308528473f, -0.00312299770f, -0.00316057657f, -0.00319802039f, -0.00323532545f, - -0.00327249360f, -0.00330952019f, -0.00334640499f, -0.00338314800f, -0.00341974548f, -0.00345619721f, -0.00349249900f, -0.00352865248f, -0.00356465508f, -0.00360050471f, - -0.00363619928f, -0.00367173925f, -0.00370712159f, -0.00374234398f, -0.00377740758f, -0.00381230772f, -0.00384704629f, -0.00388161838f, -0.00391602563f, -0.00395026524f, - -0.00398433534f, -0.00401823409f, -0.00405196147f, -0.00408551469f, -0.00411889283f, -0.00415209495f, -0.00418511964f, -0.00421796506f, -0.00425062841f, -0.00428310968f, - -0.00431540888f, -0.00434752274f, -0.00437944988f, -0.00441119028f, -0.00444274163f, -0.00447410159f, -0.00450527063f, -0.00453624688f, -0.00456702895f, -0.00459761452f, - -0.00462800404f, -0.00465819519f, -0.00468818611f, -0.00471797585f, -0.00474756444f, -0.00477694953f, -0.00480612973f, -0.00483510410f, -0.00486387173f, -0.00489243167f, - -0.00492078019f, -0.00494891917f, -0.00497684628f, -0.00500456011f, -0.00503205974f, -0.00505934376f, -0.00508640893f, -0.00511325803f, -0.00513988826f, -0.00516629638f, - -0.00519248517f, -0.00521845184f, -0.00524419453f, -0.00526971230f, -0.00529500470f, -0.00532007031f, -0.00534490822f, -0.00536951516f, -0.00539389392f, -0.00541804126f, - -0.00544195529f, -0.00546563743f, -0.00548908627f, -0.00551229948f, -0.00553527614f, -0.00555801624f, -0.00558051793f, -0.00560278073f, -0.00562480185f, -0.00564658362f, - -0.00566812325f, -0.00568942074f, -0.00571047375f, -0.00573128276f, -0.00575184450f, -0.00577216130f, -0.00579223130f, -0.00581205264f, -0.00583162485f, -0.00585094653f, - -0.00587001862f, -0.00588883925f, -0.00590740610f, -0.00592572149f, -0.00594378309f, -0.00596158998f, -0.00597914122f, -0.00599643681f, -0.00601347489f, -0.00603025593f, - -0.00604677759f, -0.00606304081f, -0.00607904466f, -0.00609478820f, -0.00611027051f, -0.00612549065f, -0.00614044908f, -0.00615514303f, -0.00616957434f, -0.00618374161f, - -0.00619764347f, -0.00621128036f, -0.00622465089f, -0.00623775553f, -0.00625059241f, -0.00626316015f, -0.00627546106f, -0.00628749281f, -0.00629925542f, -0.00631074747f, - -0.00632197037f, -0.00633292180f, -0.00634360127f, -0.00635400973f, -0.00636414625f, -0.00637400988f, -0.00638360064f, -0.00639291806f, -0.00640196120f, -0.00641073007f, - -0.00641922466f, -0.00642744405f, -0.00643538870f, -0.00644305721f, -0.00645045005f, -0.00645756582f, -0.00646440592f, -0.00647096802f, -0.00647725351f, -0.00648326147f, - -0.00648899190f, -0.00649444433f, -0.00649961829f, -0.00650451379f, -0.00650913082f, -0.00651346892f, -0.00651752809f, -0.00652130833f, -0.00652480870f, -0.00652803015f, - -0.00653097173f, -0.00653363345f, -0.00653601484f, -0.00653811684f, -0.00653993897f, -0.00654148031f, -0.00654274225f, -0.00654372340f, -0.00654442422f, -0.00654484471f -}; -#endif const float Stereo_dmx_s_wnd_coef_16k[L_FRAME16k >> 4] = { 0.00154133327f, 0.0138150426f, 0.0380602330f, 0.0736799166f, 0.119797014f, 0.175276011f, 0.238750681f, 0.308658302f, 0.383277327f, 0.460770488f, diff --git a/lib_enc/ivas_rom_enc.h b/lib_enc/ivas_rom_enc.h index 2a4f71b8b9..8bcad95506 100644 --- a/lib_enc/ivas_rom_enc.h +++ b/lib_enc/ivas_rom_enc.h @@ -120,11 +120,6 @@ extern const uint16_t ECSQ_tab_vals[ECSQ_PARAM_COUNT - 1][1 + ECSQ_TAB_VALS_SIZE * Stereo downmix to EVS ROM tables *----------------------------------------------------------------------------------*/ -#ifndef NTT_REMOVE_EPS_ROM -extern const float Stereo_dmx_s_wnd_coef_eps_16k[L_FRAME16k * 3 / 4]; -extern const float Stereo_dmx_s_wnd_coef_eps_32k[L_FRAME32k * 3 / 4]; -extern const float Stereo_dmx_s_wnd_coef_eps_48k[L_FRAME48k * 3 / 4]; -#endif extern const float Stereo_dmx_s_wnd_coef_16k[L_FRAME16k >> 4]; extern const float Stereo_dmx_s_wnd_coef_32k[L_FRAME32k >> 4]; extern const float Stereo_dmx_s_wnd_coef_48k[L_FRAME48k >> 4]; diff --git a/lib_enc/ivas_stereo_dmx_evs.c b/lib_enc/ivas_stereo_dmx_evs.c index aab2a4f2a6..a6773bc64c 100644 --- a/lib_enc/ivas_stereo_dmx_evs.c +++ b/lib_enc/ivas_stereo_dmx_evs.c @@ -152,9 +152,6 @@ static void calc_poc( { int16_t i, n1, n2; int16_t n0, *itdLR; -#ifndef NTT_REMOVE_EPS_ROM - const float *c; -#endif const float *s; float *P; float tmp1, tmp2, Lr, Li, Rr, Ri, gamma, igamma, iN; @@ -162,18 +159,13 @@ static void calc_poc( float tmpPOC1[L_FRAME48k], tmpPOC2[L_FRAME48k]; float rfft_buf[L_FRAME48k]; int16_t step, bias; -#ifdef NTT_REMOVE_EPS_ROM int16_t i_for; int16_t cos_step, cos_max; float eps_cos, eps_sin, EPS; -#endif /* Initialization */ iN = 1.0f / (float) input_frame; -#ifndef NTT_REMOVE_EPS_ROM - c = hPOC->sin + ( input_frame >> 2 ); -#endif s = hPOC->sin; P = hPOC->P; n0 = input_frame / 2; @@ -195,7 +187,6 @@ static void calc_poc( specPOr[0] = sign( specLr[0] ) * sign( specRr[0] ) * wnd[bias]; specPOi[0] = 0.0f; -#ifdef NTT_REMOVE_EPS_ROM EPS = hPOC->eps; if ( input_frame == L_FRAME16k ) @@ -252,28 +243,6 @@ static void calc_poc( specPOi[i] = ( Lr * Ri - Li * Rr ) * tmp1; gamma -= igamma; } - // end NTT_REMOVE_EPS_ROM -#else - for ( i = 1; i < n0; i++ ) - { - Lr = specLr[i]; - Li = specLi[i]; - Rr = specRr[i]; - Ri = specRi[i]; - - Lr += ( specRr[i] * c[i] + specRi[i] * s[i] ); - Li += ( -specRr[i] * s[i] + specRi[i] * c[i] ); - Rr += ( specLr[i] * c[i] + specLi[i] * s[i] ); - Ri += ( -specLr[i] * s[i] + specLi[i] * c[i] ); - - tmp1 = wnd[i * step + bias] * gamma / ( sqrtf( ( ( Lr * Lr + Li * Li ) ) * ( ( Rr * Rr + Ri * Ri ) ) ) + hPOC->eps ); - - specPOr[i] = ( Lr * Rr + Li * Ri ) * tmp1; - specPOi[i] = ( Lr * Ri - Li * Rr ) * tmp1; - - gamma -= igamma; - } -#endif // end !NTT_REMOVE_EPS_ROM specPOr[n0] = sign( specLr[i] ) * sign( specRr[i] ) * wnd[i * step + bias] * gamma; @@ -853,7 +822,6 @@ ivas_error stereo_dmx_evs_init_encoder( } hStereoDmxEVS->hPOC->eps = 2.0f * EVS_PI / ( (float) input_frame ); -#ifdef NTT_REMOVE_EPS_ROM if ( input_frame == L_FRAME16k ) { hStereoDmxEVS->hPOC->sin = dft_trigo_32k; @@ -870,24 +838,6 @@ ivas_error stereo_dmx_evs_init_encoder( { return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "invalid frame length\n" ); } -#else - if ( input_frame == L_FRAME16k ) - { - hStereoDmxEVS->hPOC->sin = Stereo_dmx_s_wnd_coef_eps_16k; - } - else if ( input_frame == L_FRAME32k ) - { - hStereoDmxEVS->hPOC->sin = Stereo_dmx_s_wnd_coef_eps_32k; - } - else if ( input_frame == L_FRAME48k ) - { - hStereoDmxEVS->hPOC->sin = Stereo_dmx_s_wnd_coef_eps_48k; - } - else - { - return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "invalid frame length\n" ); - } -#endif hStereoDmxEVS->hPOC->confidence = 0.0f; -- GitLab From 9e081fd88e9c889c660100ab9942b41b3ff33a65 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Thu, 1 Sep 2022 17:48:05 +0200 Subject: [PATCH 6/7] formatting --- lib_dec/ivas_sba_rendering.c | 6 +++--- lib_dec/ivas_stat_dec.h | 8 ++++---- lib_enc/ivas_spar_md_enc.c | 19 +++++++------------ lib_enc/ivas_stereo_dft_enc.c | 2 +- 4 files changed, 15 insertions(+), 20 deletions(-) mode change 100755 => 100644 lib_dec/ivas_sba_rendering.c mode change 100755 => 100644 lib_enc/ivas_stereo_dft_enc.c diff --git a/lib_dec/ivas_sba_rendering.c b/lib_dec/ivas_sba_rendering.c old mode 100755 new mode 100644 index 3bbcac4ac6..5f451a5d55 --- a/lib_dec/ivas_sba_rendering.c +++ b/lib_dec/ivas_sba_rendering.c @@ -203,12 +203,12 @@ static void ivas_sba_mtx_mult( *-------------------------------------------------------------------*/ void ivas_sba_upmixer_renderer( - Decoder_Struct *st_ivas, /* i/o: IVAS decoder struct */ - float output[][L_FRAME48k], /* i/o: transport/output audio channels */ + Decoder_Struct *st_ivas, /* i/o: IVAS decoder struct */ + float output[][L_FRAME48k], /* i/o: transport/output audio channels */ #ifndef SPAR_SCALING_HARMONIZATION const int16_t nchan_remapped, /* i : num channels after remapping of TCs */ #endif - const int16_t output_frame /* i : output frame length */ + const int16_t output_frame /* i : output frame length */ ) { #ifdef SPAR_SCALING_HARMONIZATION diff --git a/lib_dec/ivas_stat_dec.h b/lib_dec/ivas_stat_dec.h index fff17c0366..a2c0e21dcb 100644 --- a/lib_dec/ivas_stat_dec.h +++ b/lib_dec/ivas_stat_dec.h @@ -1906,10 +1906,10 @@ typedef struct decoder_config_structure int32_t output_Fs; /* output signal sampling frequency in Hz */ int16_t nchan_out; /* number of output audio channels */ AUDIO_CONFIG output_config; /* output audio configuration */ - int16_t Opt_LsCustom; /* indicates whether loudspeaker custom setup is used */ - int16_t Opt_HRTF_binary; /* indicates whether HRTF binary file is used */ - int16_t Opt_Headrotation; /* indicates whether head-rotation is used */ - int16_t orientation_tracking; /* indicates orientation tracking type */ + int16_t Opt_LsCustom; /* indicates whether loudspeaker custom setup is used */ + int16_t Opt_HRTF_binary; /* indicates whether HRTF binary file is used */ + int16_t Opt_Headrotation; /* indicates whether head-rotation is used */ + int16_t orientation_tracking; /* indicates orientation tracking type */ float no_diegetic_pan; int16_t Opt_AMR_WB; /* flag indicating AMR-WB IO mode */ diff --git a/lib_enc/ivas_spar_md_enc.c b/lib_enc/ivas_spar_md_enc.c index 9325a737ef..ef7f7c5b63 100644 --- a/lib_enc/ivas_spar_md_enc.c +++ b/lib_enc/ivas_spar_md_enc.c @@ -84,10 +84,7 @@ static void ivas_store_prior_coeffs( ivas_spar_md_enc_state_t *hMdEnc, const int static void ivas_write_parameter_bitstream( ivas_spar_md_enc_state_t *hMdEnc, const int16_t nB, const int16_t bands_bw, BSTR_ENC_HANDLE hMetaData, const int32_t ivas_total_brate, const int16_t dtx_silence_mode, const int16_t strat, const int16_t qsi, const int16_t planarCP ); -static ivas_error ivas_spar_md_enc_init( ivas_spar_md_enc_state_t *pState, const ENCODER_CONFIG_HANDLE hEncoderConfig - , - const int16_t sba_order -); +static ivas_error ivas_spar_md_enc_init( ivas_spar_md_enc_state_t *pState, const ENCODER_CONFIG_HANDLE hEncoderConfig, const int16_t sba_order ); static void ivas_spar_quant_pred_coeffs_dtx( ivas_spar_md_t *pSpar_md, float **ppValues, const int16_t ndm, int16_t **ppIndex, const int16_t dim1, float **ppQuant ); @@ -112,7 +109,7 @@ ivas_error ivas_spar_md_enc_open( ivas_spar_md_enc_state_t **hMdEnc_in, /* i/o: SPAR MD encoder handle */ const ENCODER_CONFIG_HANDLE hEncoderConfig /* i : configuration structure */ , - const int16_t sba_order /* i : Ambisonic (SBA) order */ + const int16_t sba_order /* i : Ambisonic (SBA) order */ ) { ivas_spar_md_enc_state_t *hMdEnc; @@ -312,10 +309,9 @@ void ivas_spar_md_enc_close( *-----------------------------------------------------------------------------------------*/ static ivas_error ivas_spar_md_enc_init( - ivas_spar_md_enc_state_t *pState, /* o : MD encoder handle */ - const ENCODER_CONFIG_HANDLE hEncoderConfig /* i : configuration structure */ - , - const int16_t sba_order /* i : Ambisonic (SBA) order */ + ivas_spar_md_enc_state_t *pState, /* o : MD encoder handle */ + const ENCODER_CONFIG_HANDLE hEncoderConfig, /* i : configuration structure */ + const int16_t sba_order /* i : Ambisonic (SBA) order */ ) { float pFC[IVAS_MAX_NUM_BANDS]; @@ -561,9 +557,8 @@ 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 */ - const int16_t dtx_silence_mode - , + BSTR_ENC_HANDLE hMetaData, /* i/o: MetaData handle */ + const int16_t dtx_silence_mode, const int16_t sba_order /* i : Ambisonic (SBA) order */ ) { diff --git a/lib_enc/ivas_stereo_dft_enc.c b/lib_enc/ivas_stereo_dft_enc.c old mode 100755 new mode 100644 index 343d83ec12..79f6b04803 --- a/lib_enc/ivas_stereo_dft_enc.c +++ b/lib_enc/ivas_stereo_dft_enc.c @@ -2944,7 +2944,7 @@ 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; + 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 ); -- GitLab From 75afb880d01603c9475c2b9fb334b7418d4f9d70 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Thu, 1 Sep 2022 17:52:34 +0200 Subject: [PATCH 7/7] correct file permissions --- apps/encoder.c | 0 lib_com/bitstream.c | 0 lib_com/ivas_entropy_coder_common.c | 0 lib_com/ivas_mdft_imdft.c | 0 lib_com/ivas_spar_com.c | 0 lib_debug/sba_debug.c | 0 lib_dec/acelp_core_dec.c | 0 lib_dec/evs_dec.c | 0 lib_dec/ivas_core_dec.c | 0 lib_dec/ivas_dirac_dec.c | 0 lib_dec/ivas_init_dec.c | 0 lib_dec/ivas_reverb.c | 0 lib_dec/ivas_reverb_filter_design.c | 0 lib_dec/ivas_reverb_utils.c | 0 lib_dec/ivas_spar_decoder.c | 0 lib_dec/ivas_stereo_switching_dec.c | 0 lib_dec/lib_dec.c | 0 lib_dec/swb_tbe_dec.c | 0 lib_enc/ivas_enc.c | 0 lib_enc/ivas_mct_core_enc.c | 0 lib_enc/ivas_stereo_dft_enc_itd.c | 0 lib_enc/lib_enc.c | 0 22 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 apps/encoder.c mode change 100755 => 100644 lib_com/bitstream.c mode change 100755 => 100644 lib_com/ivas_entropy_coder_common.c mode change 100755 => 100644 lib_com/ivas_mdft_imdft.c mode change 100755 => 100644 lib_com/ivas_spar_com.c mode change 100755 => 100644 lib_debug/sba_debug.c mode change 100755 => 100644 lib_dec/acelp_core_dec.c mode change 100755 => 100644 lib_dec/evs_dec.c mode change 100755 => 100644 lib_dec/ivas_core_dec.c mode change 100755 => 100644 lib_dec/ivas_dirac_dec.c mode change 100755 => 100644 lib_dec/ivas_init_dec.c mode change 100755 => 100644 lib_dec/ivas_reverb.c mode change 100755 => 100644 lib_dec/ivas_reverb_filter_design.c mode change 100755 => 100644 lib_dec/ivas_reverb_utils.c mode change 100755 => 100644 lib_dec/ivas_spar_decoder.c mode change 100755 => 100644 lib_dec/ivas_stereo_switching_dec.c mode change 100755 => 100644 lib_dec/lib_dec.c mode change 100755 => 100644 lib_dec/swb_tbe_dec.c mode change 100755 => 100644 lib_enc/ivas_enc.c mode change 100755 => 100644 lib_enc/ivas_mct_core_enc.c mode change 100755 => 100644 lib_enc/ivas_stereo_dft_enc_itd.c mode change 100755 => 100644 lib_enc/lib_enc.c diff --git a/apps/encoder.c b/apps/encoder.c old mode 100755 new mode 100644 diff --git a/lib_com/bitstream.c b/lib_com/bitstream.c old mode 100755 new mode 100644 diff --git a/lib_com/ivas_entropy_coder_common.c b/lib_com/ivas_entropy_coder_common.c old mode 100755 new mode 100644 diff --git a/lib_com/ivas_mdft_imdft.c b/lib_com/ivas_mdft_imdft.c old mode 100755 new mode 100644 diff --git a/lib_com/ivas_spar_com.c b/lib_com/ivas_spar_com.c old mode 100755 new mode 100644 diff --git a/lib_debug/sba_debug.c b/lib_debug/sba_debug.c old mode 100755 new mode 100644 diff --git a/lib_dec/acelp_core_dec.c b/lib_dec/acelp_core_dec.c old mode 100755 new mode 100644 diff --git a/lib_dec/evs_dec.c b/lib_dec/evs_dec.c old mode 100755 new mode 100644 diff --git a/lib_dec/ivas_core_dec.c b/lib_dec/ivas_core_dec.c old mode 100755 new mode 100644 diff --git a/lib_dec/ivas_dirac_dec.c b/lib_dec/ivas_dirac_dec.c old mode 100755 new mode 100644 diff --git a/lib_dec/ivas_init_dec.c b/lib_dec/ivas_init_dec.c old mode 100755 new mode 100644 diff --git a/lib_dec/ivas_reverb.c b/lib_dec/ivas_reverb.c old mode 100755 new mode 100644 diff --git a/lib_dec/ivas_reverb_filter_design.c b/lib_dec/ivas_reverb_filter_design.c old mode 100755 new mode 100644 diff --git a/lib_dec/ivas_reverb_utils.c b/lib_dec/ivas_reverb_utils.c old mode 100755 new mode 100644 diff --git a/lib_dec/ivas_spar_decoder.c b/lib_dec/ivas_spar_decoder.c old mode 100755 new mode 100644 diff --git a/lib_dec/ivas_stereo_switching_dec.c b/lib_dec/ivas_stereo_switching_dec.c old mode 100755 new mode 100644 diff --git a/lib_dec/lib_dec.c b/lib_dec/lib_dec.c old mode 100755 new mode 100644 diff --git a/lib_dec/swb_tbe_dec.c b/lib_dec/swb_tbe_dec.c old mode 100755 new mode 100644 diff --git a/lib_enc/ivas_enc.c b/lib_enc/ivas_enc.c old mode 100755 new mode 100644 diff --git a/lib_enc/ivas_mct_core_enc.c b/lib_enc/ivas_mct_core_enc.c old mode 100755 new mode 100644 diff --git a/lib_enc/ivas_stereo_dft_enc_itd.c b/lib_enc/ivas_stereo_dft_enc_itd.c old mode 100755 new mode 100644 diff --git a/lib_enc/lib_enc.c b/lib_enc/lib_enc.c old mode 100755 new mode 100644 -- GitLab