diff --git a/lib_com/ivas_cnst.h b/lib_com/ivas_cnst.h index 9cbe57f1072993ac8ba31b0908c36ec6543cfc55..af3fbb8932bb904455e26504b079a7415eaed9d7 100755 --- a/lib_com/ivas_cnst.h +++ b/lib_com/ivas_cnst.h @@ -1556,9 +1556,7 @@ typedef enum #define MAX_SPLIT_MD_SUBFRAMES 1 #define COMPLEX_MD_BAND_THRESH MAX_SPLIT_REND_MD_BANDS #define COMPLEX_MD_BAND_THRESH_LOW 5 -#ifdef SPLIT_REND_HF_TUNING #define SPLIT_REND_RO_MD_BAND_THRESH 4 -#endif #define IVAS_SPLIT_REND_NUM_QUANT_STRATS 4 #define IVAS_SPLIT_REND_PRED_63QUANT_PNTS 63 diff --git a/lib_com/options.h b/lib_com/options.h index 743d9db9d2dac38fe848dd2f683e9d8bb2cc77b0..8c731ec94bca736c7974ff43c8c843ec751e9fd0 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -172,12 +172,6 @@ #define NONBE_FIX_935_EARLY_REFLECTIONS_WRONG_ORDER /* Qualcomm: issue 953: fix order or ER channels in LC mode*/ #define NONBE_FIX_949_MC_5MS_FRAMING /* Dlb: issue 949: fix for issue 949, distorted output in MC mode with 5ms framing*/ -#ifdef SPLIT_REND_WITH_HEAD_ROT -#define SPLIT_REND_HF_TUNING /* Dlb: issue 950: split rendering MD tuning change at high frequencies*/ -#define SPLIT_REND_MC_FIX_LFE /* Dlb: issue 950: split rendering LFE fix for 7.1 and 5.1 MC mode*/ -#define SPLIT_EXT_REND_FIX_LIMITER_POS /* Dlb: issue 950: fixing limiter position in split rendering mode in external renderer*/ -#endif - /* ##################### End NON-BE switches ########################### */ /* ################## End DEVELOPMENT switches ######################### */ diff --git a/lib_dec/ivas_binRenderer_internal.c b/lib_dec/ivas_binRenderer_internal.c index 77e9095c9ee84ed1032ba0e0bd0b33b1027eb4cc..ce06e369306bc19989c5dfba83b876bb8d6000ca 100644 --- a/lib_dec/ivas_binRenderer_internal.c +++ b/lib_dec/ivas_binRenderer_internal.c @@ -1535,9 +1535,7 @@ void ivas_binaural_add_LFE( { int16_t render_lfe, idx_lfe; float gain; -#ifdef SPLIT_REND_MC_FIX_LFE float lfe_tc[L_FRAME48k]; -#endif if ( st_ivas->hBinRenderer != NULL ) { @@ -1561,17 +1559,10 @@ void ivas_binaural_add_LFE( for ( idx_lfe = 0; idx_lfe < st_ivas->hIntSetup.num_lfe; idx_lfe++ ) { -#ifdef SPLIT_REND_MC_FIX_LFE v_multc( input_f[st_ivas->hIntSetup.index_lfe[idx_lfe]], gain, lfe_tc, output_frame ); /* copy LFE to left and right channels */ v_add( output_f[0], lfe_tc, output_f[0], output_frame ); v_add( output_f[1], lfe_tc, output_f[1], output_frame ); -#else - v_multc( input_f[st_ivas->hIntSetup.index_lfe[idx_lfe]], gain, input_f[st_ivas->hIntSetup.index_lfe[idx_lfe]], output_frame ); - /* copy LFE to left and right channels */ - v_add( output_f[0], input_f[st_ivas->hIntSetup.index_lfe[idx_lfe]], output_f[0], output_frame ); - v_add( output_f[1], input_f[st_ivas->hIntSetup.index_lfe[idx_lfe]], output_f[1], output_frame ); -#endif } } diff --git a/lib_dec/ivas_objectRenderer_internal.c b/lib_dec/ivas_objectRenderer_internal.c index 0f6159baf884da9af9ebdf32ae2ef968e7b81344..d405df50b07be0cfbf1b2a6d6f6b1f20fb1e8e62 100644 --- a/lib_dec/ivas_objectRenderer_internal.c +++ b/lib_dec/ivas_objectRenderer_internal.c @@ -343,7 +343,6 @@ ivas_error ivas_td_binaural_renderer_sf_splitBinaural( return error; } -#ifdef SPLIT_REND_MC_FIX_LFE if ( st_ivas->ivas_format == MC_FORMAT ) { float *p_tc[MAX_TRANSPORT_CHANNELS]; @@ -353,7 +352,6 @@ ivas_error ivas_td_binaural_renderer_sf_splitBinaural( } ivas_binaural_add_LFE( st_ivas, nSamplesRendered, p_tc, p_bin_output ); } -#endif } for ( i = 0; i < pMultiBinPoseData->num_poses * BINAURAL_CHANNELS; i++ ) diff --git a/lib_dec/lib_dec.c b/lib_dec/lib_dec.c index 644a4b06eaaf3c9cf949461e9eae82495da25958..5ed7a54eae39d84096efb9577303b1ccc5eaf6d1 100644 --- a/lib_dec/lib_dec.c +++ b/lib_dec/lib_dec.c @@ -1054,9 +1054,7 @@ ivas_error IVAS_DEC_GetSplitBinauralBitstream( int16_t pcm_out_flag; int16_t td_input; int16_t numPoses; -#ifdef SPLIT_REND_HF_TUNING int16_t ro_md_flag; -#endif error = IVAS_ERR_OK; st_ivas = hIvasDec->st_ivas; @@ -1159,7 +1157,6 @@ ivas_error IVAS_DEC_GetSplitBinauralBitstream( pcm_out_flag = ( output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ? 1 : 0; td_input = st_ivas->renderer_type != RENDERER_BINAURAL_FASTCONV && st_ivas->renderer_type != RENDERER_BINAURAL_PARAMETRIC && st_ivas->renderer_type != RENDERER_BINAURAL_PARAMETRIC_ROOM && st_ivas->renderer_type != RENDERER_STEREO_PARAMETRIC; -#ifdef SPLIT_REND_HF_TUNING if ( st_ivas->hBinRendererTd != NULL ) { ro_md_flag = 1; @@ -1178,17 +1175,6 @@ ivas_error IVAS_DEC_GetSplitBinauralBitstream( hSplitBinRend->hMultiBinCldfbData->Cldfb_RealBuffer_Binaural, hSplitBinRend->hMultiBinCldfbData->Cldfb_ImagBuffer_Binaural, max_band, pOutput, 1, !td_input, pcm_out_flag, ro_md_flag ) ) != IVAS_ERR_OK ) -#else - if ( ( error = ivas_renderMultiBinToSplitBinaural( &hSplitBinRend->splitrend, - st_ivas->hHeadTrackData->Quaternions[0], - st_ivas->hRenderConfig->split_rend_config.splitRendBitRate, - st_ivas->hRenderConfig->split_rend_config.codec, - st_ivas->hRenderConfig->split_rend_config.codec_frame_size_ms, - hSplitBinRend->hSplitRendBits, - hSplitBinRend->hMultiBinCldfbData->Cldfb_RealBuffer_Binaural, - hSplitBinRend->hMultiBinCldfbData->Cldfb_ImagBuffer_Binaural, - max_band, pOutput, 1, !td_input, pcm_out_flag ) ) != IVAS_ERR_OK ) -#endif { return error; } diff --git a/lib_rend/ivas_prot_rend.h b/lib_rend/ivas_prot_rend.h index bb120dcafa050a70ee9e0095a5acd8f41fb07b6f..53d48eaa4956a432f4bcb625bc7e3945e6c118ff 100644 --- a/lib_rend/ivas_prot_rend.h +++ b/lib_rend/ivas_prot_rend.h @@ -1554,7 +1554,6 @@ void ivas_renderSplitUpdateNoCorrectionPoseData( MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData ); -#ifdef SPLIT_REND_HF_TUNING ivas_error ivas_renderMultiBinToSplitBinaural( SPLIT_REND_WRAPPER *hSplitBin, const IVAS_QUATERNION headPosition, @@ -1571,25 +1570,7 @@ ivas_error ivas_renderMultiBinToSplitBinaural( const int16_t pcm_out_flag, const int16_t ro_md_flag ); -#else -ivas_error ivas_renderMultiBinToSplitBinaural( - SPLIT_REND_WRAPPER *hSplitBin, - const IVAS_QUATERNION headPosition, - const int32_t SplitRendBitRate, - IVAS_SPLIT_REND_CODEC splitCodec, - int16_t codec_frame_size_ms, - IVAS_SPLIT_REND_BITS_HANDLE pBits, - float Cldfb_In_BinReal[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], - float Cldfb_In_BinImag[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], - const int16_t max_bands, - float *output[], - const int16_t low_res_pre_rend_rot, - const int16_t cldfb_in_flag, - const int16_t pcm_out_flag -); -#endif -#ifdef SPLIT_REND_HF_TUNING void ivas_rend_CldfbSplitPreRendProcess( const BIN_HR_SPLIT_PRE_REND_HANDLE hBinHrSplitPreRend, const IVAS_QUATERNION headPosition, @@ -1601,18 +1582,6 @@ void ivas_rend_CldfbSplitPreRendProcess( const int16_t low_res_pre_rend_rot, const int16_t ro_md_flag ); -#else -void ivas_rend_CldfbSplitPreRendProcess( - const BIN_HR_SPLIT_PRE_REND_HANDLE hBinHrSplitPreRend, - const IVAS_QUATERNION headPosition, - MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData, - float Cldfb_In_BinReal[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], - float Cldfb_In_BinImag[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], - IVAS_SPLIT_REND_BITS_HANDLE pBits, - const int32_t target_md_bits, - const int16_t low_res_pre_rend_rot -); -#endif void ivas_rend_CldfbSplitPostRendProcess( BIN_HR_SPLIT_POST_REND_HANDLE hBinHrSplitPostRend, @@ -1685,7 +1654,6 @@ void ivas_log_cldfb2wav_data( ); #endif -#ifdef SPLIT_REND_HF_TUNING void ivas_SplitRenderer_GetRotMd( BIN_HR_SPLIT_PRE_REND_HANDLE hBinHrSplitPreRend, /* i/o: binaural renderer handle */ MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData, @@ -1694,15 +1662,6 @@ void ivas_SplitRenderer_GetRotMd( const int16_t low_res, const int16_t ro_md_flag ); -#else -void ivas_SplitRenderer_GetRotMd( - BIN_HR_SPLIT_PRE_REND_HANDLE hBinHrSplitPreRend, /* i/o: binaural renderer handle */ - MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData, - float Cldfb_RealBuffer_Ref_Binaural[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* o : Reference Binaural signals */ - float Cldfb_ImagBuffer_Ref_Binaural[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* o : Reference Binaural signals */ - const int16_t low_res -); -#endif void ivas_SplitRenderer_PostRenderer( BIN_HR_SPLIT_POST_REND_HANDLE hBinPostRenderer, /* i/o: binaural renderer handle */ diff --git a/lib_rend/ivas_splitRendererPre.c b/lib_rend/ivas_splitRendererPre.c index 973432ec50f157b6f5a5b58ecb4c62f9c9a69938..fb818cc851288b8acf8a104120c5560dd0fcaff5 100644 --- a/lib_rend/ivas_splitRendererPre.c +++ b/lib_rend/ivas_splitRendererPre.c @@ -584,7 +584,6 @@ static void ComputeCoeffs( } else { -#ifdef SPLIT_REND_HF_TUNING if ( real_only ) { float gd_tmp[BINAURAL_CHANNELS]; @@ -609,7 +608,6 @@ static void ComputeCoeffs( } else { -#endif cov_norm_fact = GetNormFact( cov_ii_re, cov_ii_im, cov_io_re, cov_io_im, cov_oo_re ); /* normalize the covariance */ @@ -742,9 +740,7 @@ static void ComputeCoeffs( hMd->pred_mat_im[i][1] *= gr2; } } -#ifdef SPLIT_REND_HF_TUNING } -#endif } return; @@ -1352,7 +1348,6 @@ static void ivas_SplitRenderer_quant_code( * *------------------------------------------------------------------------*/ -#ifdef SPLIT_REND_HF_TUNING void ivas_SplitRenderer_GetRotMd( BIN_HR_SPLIT_PRE_REND_HANDLE hBinHrSplitPreRend, /* i/o: binaural renderer handle */ MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData, @@ -1360,14 +1355,6 @@ void ivas_SplitRenderer_GetRotMd( float Cldfb_ImagBuffer_Ref_Binaural[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* o : Reference Binaural signals */ const int16_t low_res, const int16_t ro_md_flag ) -#else -void ivas_SplitRenderer_GetRotMd( - BIN_HR_SPLIT_PRE_REND_HANDLE hBinHrSplitPreRend, /* i/o: binaural renderer handle */ - MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData, - float Cldfb_RealBuffer_Ref_Binaural[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* o : Reference Binaural signals */ - float Cldfb_ImagBuffer_Ref_Binaural[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* o : Reference Binaural signals */ - const int16_t low_res ) -#endif { float cov_ii_re[BINAURAL_CHANNELS][BINAURAL_CHANNELS]; float cov_oo_re[BINAURAL_CHANNELS][BINAURAL_CHANNELS]; @@ -1402,11 +1389,7 @@ void ivas_SplitRenderer_GetRotMd( start_slot_idx = sf_idx * num_slots; for ( b = 0; b < num_md_bands; b++ ) { -#ifndef SPLIT_REND_HF_TUNING - if ( b < COMPLEX_MD_BAND_THRESH ) -#else if ( ( b < SPLIT_REND_RO_MD_BAND_THRESH ) || ( !ro_md_flag && b < COMPLEX_MD_BAND_THRESH ) ) -#endif { real_only = 0; } @@ -1442,7 +1425,6 @@ void ivas_SplitRenderer_GetRotMd( * *------------------------------------------------------------------------*/ -#ifdef SPLIT_REND_HF_TUNING void ivas_rend_CldfbSplitPreRendProcess( const BIN_HR_SPLIT_PRE_REND_HANDLE hBinHrSplitPreRend, const IVAS_QUATERNION headPosition, @@ -1453,25 +1435,10 @@ void ivas_rend_CldfbSplitPreRendProcess( const int32_t target_md_bits, const int16_t low_res_pre_rend_rot, const int16_t ro_md_flag ) -#else -void ivas_rend_CldfbSplitPreRendProcess( - const BIN_HR_SPLIT_PRE_REND_HANDLE hBinHrSplitPreRend, - const IVAS_QUATERNION headPosition, - MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData, - float Cldfb_In_BinReal[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], - float Cldfb_In_BinImag[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], - IVAS_SPLIT_REND_BITS_HANDLE pBits, - const int32_t target_md_bits, - const int16_t low_res_pre_rend_rot ) -#endif { push_wmops( "ivas_rend_CldfbSplitPreRendProcess" ); -#ifdef SPLIT_REND_HF_TUNING ivas_SplitRenderer_GetRotMd( hBinHrSplitPreRend, pMultiBinPoseData, Cldfb_In_BinReal, Cldfb_In_BinImag, low_res_pre_rend_rot, ro_md_flag ); -#else - ivas_SplitRenderer_GetRotMd( hBinHrSplitPreRend, pMultiBinPoseData, Cldfb_In_BinReal, Cldfb_In_BinImag, low_res_pre_rend_rot ); -#endif ivas_SplitRenderer_quant_code( hBinHrSplitPreRend, headPosition, pMultiBinPoseData, pBits, low_res_pre_rend_rot, target_md_bits ); @@ -2168,7 +2135,6 @@ static ivas_error splitRendLc3plusEncodeAndWrite( * *------------------------------------------------------------------------*/ -#ifdef SPLIT_REND_HF_TUNING static ivas_error ivas_renderMultiTDBinToSplitBinaural( SPLIT_REND_WRAPPER *hSplitBin, const IVAS_QUATERNION headPosition, @@ -2180,18 +2146,6 @@ static ivas_error ivas_renderMultiTDBinToSplitBinaural( const int16_t low_res_pre_rend_rot, const int16_t pcm_out_flag, const int16_t ro_md_flag ) -#else -static ivas_error ivas_renderMultiTDBinToSplitBinaural( - SPLIT_REND_WRAPPER *hSplitBin, - const IVAS_QUATERNION headPosition, - const int32_t SplitRendBitRate, - const int16_t codec_frame_size_ms, - IVAS_SPLIT_REND_BITS_HANDLE pBits, - const int16_t max_bands, - float *in[], - const int16_t low_res_pre_rend_rot, - const int16_t pcm_out_flag ) -#endif { ivas_error error; int32_t bit_len, available_bits, target_md_bits, actual_md_bits; @@ -2275,11 +2229,8 @@ static ivas_error ivas_renderMultiTDBinToSplitBinaural( target_md_bits = ivas_get_split_rend_md_target_brate( SplitRendBitRate, pcm_out_flag ) * L_FRAME48k / 48000; actual_md_bits = pBits->bits_written; -#ifdef SPLIT_REND_HF_TUNING + ivas_rend_CldfbSplitPreRendProcess( hSplitBin->hBinHrSplitPreRend, headPosition, &hSplitBin->multiBinPoseData, Cldfb_In_BinReal, Cldfb_In_BinImag, pBits, target_md_bits, low_res_pre_rend_rot, ro_md_flag ); -#else - ivas_rend_CldfbSplitPreRendProcess( hSplitBin->hBinHrSplitPreRend, headPosition, &hSplitBin->multiBinPoseData, Cldfb_In_BinReal, Cldfb_In_BinImag, pBits, target_md_bits, low_res_pre_rend_rot ); -#endif } if ( pcm_out_flag == 0 ) @@ -2407,7 +2358,6 @@ static void lc3plusTimeAlignCldfbPoseCorr( * *------------------------------------------------------------------------*/ -#ifdef SPLIT_REND_HF_TUNING ivas_error ivas_renderMultiBinToSplitBinaural( SPLIT_REND_WRAPPER *hSplitBin, const IVAS_QUATERNION headPosition, @@ -2423,22 +2373,6 @@ ivas_error ivas_renderMultiBinToSplitBinaural( const int16_t cldfb_in_flag, const int16_t pcm_out_flag, const int16_t ro_md_flag ) -#else -ivas_error ivas_renderMultiBinToSplitBinaural( - SPLIT_REND_WRAPPER *hSplitBin, - const IVAS_QUATERNION headPosition, - const int32_t SplitRendBitRate, - IVAS_SPLIT_REND_CODEC splitCodec, - int16_t codec_frame_size_ms, - IVAS_SPLIT_REND_BITS_HANDLE pBits, - float Cldfb_In_BinReal[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], - float Cldfb_In_BinImag[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], - const int16_t max_bands, - float *output[], - const int16_t low_res_pre_rend_rot, - const int16_t cldfb_in_flag, - const int16_t pcm_out_flag ) -#endif { ivas_error error; int32_t bit_len, target_md_bits, actual_md_bits, available_bits; @@ -2464,11 +2398,7 @@ ivas_error ivas_renderMultiBinToSplitBinaural( { /*TD input*/ /*if CLDFB handles have been allocated then assume valid multi binaural input in out[][] buffer and perform CLDFB analysis*/ -#ifdef SPLIT_REND_HF_TUNING error = ivas_renderMultiTDBinToSplitBinaural( hSplitBin, headPosition, SplitRendBitRate, codec_frame_size_ms, pBits, max_bands, output, low_res_pre_rend_rot, pcm_out_flag, ro_md_flag ); -#else - error = ivas_renderMultiTDBinToSplitBinaural( hSplitBin, headPosition, SplitRendBitRate, codec_frame_size_ms, pBits, max_bands, output, low_res_pre_rend_rot, pcm_out_flag ); -#endif pop_wmops(); return error; @@ -2486,11 +2416,8 @@ ivas_error ivas_renderMultiBinToSplitBinaural( target_md_bits = ivas_get_split_rend_md_target_brate( SplitRendBitRate, pcm_out_flag ) * L_FRAME48k / 48000; actual_md_bits = pBits->bits_written; -#ifdef SPLIT_REND_HF_TUNING + ivas_rend_CldfbSplitPreRendProcess( hSplitBin->hBinHrSplitPreRend, headPosition, &hSplitBin->multiBinPoseData, Cldfb_In_BinReal, Cldfb_In_BinImag, pBits, target_md_bits, low_res_pre_rend_rot, ro_md_flag ); -#else - ivas_rend_CldfbSplitPreRendProcess( hSplitBin->hBinHrSplitPreRend, headPosition, &hSplitBin->multiBinPoseData, Cldfb_In_BinReal, Cldfb_In_BinImag, pBits, target_md_bits, low_res_pre_rend_rot ); -#endif } if ( pcm_out_flag == 0 ) diff --git a/lib_rend/lib_rend.c b/lib_rend/lib_rend.c index 947889e8372ca0ff33f7dd97a6da2cd7b0214124..fd0f7193fbe689afee48947df7ccf71a00b4dfa3 100644 --- a/lib_rend/lib_rend.c +++ b/lib_rend/lib_rend.c @@ -6739,11 +6739,8 @@ static ivas_error renderMcToSplitBinaural( /* copy input for in-place rotation */ -#ifdef SPLIT_REND_MC_FIX_LFE set_zero( tmpRotBuffer.data, tmpRotBuffer.config.numSamplesPerChannel * tmpRotBuffer.config.numChannels ); -#else - mvr2r( mcInput->base.inputBuffer.data, tmpRotBuffer.data, tmpRotBuffer.config.numChannels * tmpRotBuffer.config.numSamplesPerChannel ); -#endif + /* perform rotation in source format to tmpRotBuffer */ pCombinedOrientationDataLocal = &combinedOrientationDataLocal; if ( ( error = rotateFrameMc( mcInput->base.inputBuffer, mcInput->base.inConfig, &mcInput->customLsInput, mcInput->base.ctx.pHeadRotData, &pCombinedOrientationDataLocal, mcInput->rot_gains_prev[pos_idx], mcInput->efapInWrapper.hEfap, tmpRotBuffer ) ) != IVAS_ERR_OK ) @@ -6779,18 +6776,13 @@ static ivas_error renderMcToSplitBinaural( free( tmpRotBuffer.data ); } -#ifdef SPLIT_REND_MC_FIX_LFE accumulate2dArrayToBuffer( tmpSplitBinauralBuffer, &outAudio ); -#endif if ( ( error = renderLfeToBinaural( mcInput, outConfig, outAudio ) ) != IVAS_ERR_OK ) { return error; } -#ifndef SPLIT_REND_MC_FIX_LFE - accumulate2dArrayToBuffer( tmpSplitBinauralBuffer, &outAudio ); -#endif pop_wmops(); return IVAS_ERR_OK; } @@ -8406,18 +8398,6 @@ static ivas_error getSamplesInternal( { return error; } -#ifndef SPLIT_EXT_REND_FIX_LIMITER_POS - - if ( outAudio.config.is_cldfb == 0 ) - { -#ifndef DISABLE_LIMITER -#ifdef DEBUGGING - hIvasRend->numClipping += -#endif - limitRendererOutput( hIvasRend->hLimiter, outAudio.data, outAudio.config.numSamplesPerChannel, IVAS_LIMITER_THRESHOLD ); -#endif - } -#endif #else #ifndef DISABLE_LIMITER @@ -8436,9 +8416,7 @@ static ivas_error getSamplesInternal( float Cldfb_RealBuffer_Binaural[MAX_HEAD_ROT_POSES * BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX]; float Cldfb_ImagBuffer_Binaural[MAX_HEAD_ROT_POSES * BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX]; int16_t ch; -#ifdef SPLIT_REND_HF_TUNING int16_t i, ro_md_flag; -#endif float *tmpBinaural[MAX_HEAD_ROT_POSES * BINAURAL_CHANNELS], tmpBinaural_buff[MAX_HEAD_ROT_POSES * BINAURAL_CHANNELS][L_FRAME48k]; for ( ch = 0; ch < MAX_OUTPUT_CHANNELS; ch++ ) @@ -8460,7 +8438,6 @@ static ivas_error getSamplesInternal( /* Encode split rendering bitstream */ convertBitsBufferToInternalBitsBuff( *hBits, &bits ); -#ifdef SPLIT_REND_HF_TUNING ro_md_flag = 0; for ( i = 0; i < RENDERER_MAX_ISM_INPUTS; ++i ) { @@ -8473,10 +8450,6 @@ static ivas_error getSamplesInternal( if ( ( error = ivas_renderMultiBinToSplitBinaural( &hIvasRend->splitRendWrapper, hIvasRend->headRotData.headPositions[0], hIvasRend->hRendererConfig->split_rend_config.splitRendBitRate, hIvasRend->hRendererConfig->split_rend_config.codec, hIvasRend->hRendererConfig->split_rend_config.codec_frame_size_ms, &bits, Cldfb_RealBuffer_Binaural, Cldfb_ImagBuffer_Binaural, ( const int16_t )( ( BINAURAL_MAXBANDS * hIvasRend->sampleRateOut ) / 48000 ), tmpBinaural, 1, cldfb_in_flag, ( hIvasRend->outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ? 1 : 0, ro_md_flag ) ) != IVAS_ERR_OK ) -#else - if ( ( error = ivas_renderMultiBinToSplitBinaural( &hIvasRend->splitRendWrapper, hIvasRend->headRotData.headPositions[0], hIvasRend->hRendererConfig->split_rend_config.splitRendBitRate, hIvasRend->hRendererConfig->split_rend_config.codec, hIvasRend->hRendererConfig->split_rend_config.codec_frame_size_ms, - &bits, Cldfb_RealBuffer_Binaural, Cldfb_ImagBuffer_Binaural, ( const int16_t )( ( BINAURAL_MAXBANDS * hIvasRend->sampleRateOut ) / 48000 ), tmpBinaural, 1, cldfb_in_flag, ( hIvasRend->outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ? 1 : 0 ) ) != IVAS_ERR_OK ) -#endif { return error; } @@ -8493,7 +8466,7 @@ static ivas_error getSamplesInternal( } #endif -#ifdef SPLIT_EXT_REND_FIX_LIMITER_POS +#ifdef SPLIT_REND_WITH_HEAD_ROT if ( outAudio.config.is_cldfb == 0 ) { #ifndef DISABLE_LIMITER