Loading lib_rend/ivas_reverb_fx.c +20 −5 Original line number Diff line number Diff line Loading @@ -1415,7 +1415,9 @@ static ivas_error setup_FDN_branches_fx( { Word16 nr_coefs, branch_idx, channel_idx; ivas_error error; #ifndef FIX_1053_REVERB_RECONFIGURATION Word16 *pCoef_a, *pCoef_b; #endif error = IVAS_ERR_OK; /* initialize feedback branches */ Loading @@ -1439,6 +1441,7 @@ static ivas_error setup_FDN_branches_fx( { FOR( branch_idx = 0; branch_idx < pParams->nr_loops; branch_idx++ ) { #ifndef FIX_1053_REVERB_RECONFIGURATION pCoef_b = &pParams->pT60_filter_coeff_fx[shl( i_mult( nr_coefs, branch_idx ), 1 )]; /*Q14*/ pCoef_a = &pParams->pT60_filter_coeff_fx[add( shl( i_mult( nr_coefs, branch_idx ), 1 ), nr_coefs )]; /*Q14*/ Loading @@ -1446,7 +1449,7 @@ static ivas_error setup_FDN_branches_fx( { return error; } #endif IF( NE_32( ( error = set_feedback_delay_fx( hReverb, branch_idx, pParams->pLoop_delays[branch_idx] ) ), IVAS_ERR_OK ) ) { return error; Loading @@ -1468,12 +1471,20 @@ static ivas_error setup_FDN_branches_fx( return error; } #ifdef FIX_1053_REVERB_RECONFIGURATION /*------------------------------------------------------------------------- * ivas_reverb_open_fx() * * Allocate and initialize FDN reverberation handle *------------------------------------------------------------------------*/ #else /*------------------------------------------------------------------------- * ivas_reverb_open_fx() * * Allocate and initialize Crend reverberation handle *------------------------------------------------------------------------*/ #endif ivas_error ivas_reverb_open_fx( REVERB_HANDLE *hReverb, /* i/o: Reverberator handle */ #ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES Loading @@ -1487,7 +1498,11 @@ ivas_error ivas_reverb_open_fx( const int32_t output_Fs ) { ivas_error error; #ifdef FIX_1053_REVERB_RECONFIGURATION #else REVERB_HANDLE pState = NULL; #endif Word16 bin_idx, subframe_len, output_frame, predelay_bf_len, loop_idx, i; ivas_reverb_params_t params; Word32 pColor_target_l_fx[RV_LENGTH_NR_FC]; Loading Loading
lib_rend/ivas_reverb_fx.c +20 −5 Original line number Diff line number Diff line Loading @@ -1415,7 +1415,9 @@ static ivas_error setup_FDN_branches_fx( { Word16 nr_coefs, branch_idx, channel_idx; ivas_error error; #ifndef FIX_1053_REVERB_RECONFIGURATION Word16 *pCoef_a, *pCoef_b; #endif error = IVAS_ERR_OK; /* initialize feedback branches */ Loading @@ -1439,6 +1441,7 @@ static ivas_error setup_FDN_branches_fx( { FOR( branch_idx = 0; branch_idx < pParams->nr_loops; branch_idx++ ) { #ifndef FIX_1053_REVERB_RECONFIGURATION pCoef_b = &pParams->pT60_filter_coeff_fx[shl( i_mult( nr_coefs, branch_idx ), 1 )]; /*Q14*/ pCoef_a = &pParams->pT60_filter_coeff_fx[add( shl( i_mult( nr_coefs, branch_idx ), 1 ), nr_coefs )]; /*Q14*/ Loading @@ -1446,7 +1449,7 @@ static ivas_error setup_FDN_branches_fx( { return error; } #endif IF( NE_32( ( error = set_feedback_delay_fx( hReverb, branch_idx, pParams->pLoop_delays[branch_idx] ) ), IVAS_ERR_OK ) ) { return error; Loading @@ -1468,12 +1471,20 @@ static ivas_error setup_FDN_branches_fx( return error; } #ifdef FIX_1053_REVERB_RECONFIGURATION /*------------------------------------------------------------------------- * ivas_reverb_open_fx() * * Allocate and initialize FDN reverberation handle *------------------------------------------------------------------------*/ #else /*------------------------------------------------------------------------- * ivas_reverb_open_fx() * * Allocate and initialize Crend reverberation handle *------------------------------------------------------------------------*/ #endif ivas_error ivas_reverb_open_fx( REVERB_HANDLE *hReverb, /* i/o: Reverberator handle */ #ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES Loading @@ -1487,7 +1498,11 @@ ivas_error ivas_reverb_open_fx( const int32_t output_Fs ) { ivas_error error; #ifdef FIX_1053_REVERB_RECONFIGURATION #else REVERB_HANDLE pState = NULL; #endif Word16 bin_idx, subframe_len, output_frame, predelay_bf_len, loop_idx, i; ivas_reverb_params_t params; Word32 pColor_target_l_fx[RV_LENGTH_NR_FC]; Loading