Loading lib_dec/ivas_mct_dec_fx.c +6 −1 Original line number Diff line number Diff line Loading @@ -340,6 +340,7 @@ ivas_error ivas_mct_dec_fx( } /* Postprocessing for ACELP/MDCT core switching and synchronization */ #ifndef FIX_2280_REDUCTION_UNNECESSARY_SCALING2 Word16 output_mem_fx[L_FRAME48k]; IF( hCPE->output_mem_fx[1] != NULL ) { Loading @@ -349,7 +350,7 @@ ivas_error ivas_mct_dec_fx( { set16_fx( output_mem_fx, 0, NS2SA_FX2( sts[n]->output_Fs, 3125000 ) ); } #endif Word16 Q_synth = sub( 15, e_sig[n] ); move16(); Loading @@ -364,7 +365,11 @@ ivas_error ivas_mct_dec_fx( dirac_stereo_flag = 0; } #ifdef FIX_2280_REDUCTION_UNNECESSARY_SCALING2 IF( NE_32( ( error = core_switching_post_dec_fx( sts[n], synth_fx[n], output_fx[( cpe_id * CPE_CHANNELS ) + n], hCPE->output_mem_fx[1], 0, output_frame, 0 /*core_switching_flag*/, dirac_stereo_flag, -1, hCPE->last_element_mode, &Q_synth ) ), IVAS_ERR_OK ) ) #else IF( NE_32( ( error = core_switching_post_dec_fx( sts[n], synth_fx[n], output_fx[( cpe_id * CPE_CHANNELS ) + n], output_mem_fx, 0, output_frame, 0 /*core_switching_flag*/, dirac_stereo_flag, -1, hCPE->last_element_mode, &Q_synth ) ), IVAS_ERR_OK ) ) #endif { return error; } Loading Loading
lib_dec/ivas_mct_dec_fx.c +6 −1 Original line number Diff line number Diff line Loading @@ -340,6 +340,7 @@ ivas_error ivas_mct_dec_fx( } /* Postprocessing for ACELP/MDCT core switching and synchronization */ #ifndef FIX_2280_REDUCTION_UNNECESSARY_SCALING2 Word16 output_mem_fx[L_FRAME48k]; IF( hCPE->output_mem_fx[1] != NULL ) { Loading @@ -349,7 +350,7 @@ ivas_error ivas_mct_dec_fx( { set16_fx( output_mem_fx, 0, NS2SA_FX2( sts[n]->output_Fs, 3125000 ) ); } #endif Word16 Q_synth = sub( 15, e_sig[n] ); move16(); Loading @@ -364,7 +365,11 @@ ivas_error ivas_mct_dec_fx( dirac_stereo_flag = 0; } #ifdef FIX_2280_REDUCTION_UNNECESSARY_SCALING2 IF( NE_32( ( error = core_switching_post_dec_fx( sts[n], synth_fx[n], output_fx[( cpe_id * CPE_CHANNELS ) + n], hCPE->output_mem_fx[1], 0, output_frame, 0 /*core_switching_flag*/, dirac_stereo_flag, -1, hCPE->last_element_mode, &Q_synth ) ), IVAS_ERR_OK ) ) #else IF( NE_32( ( error = core_switching_post_dec_fx( sts[n], synth_fx[n], output_fx[( cpe_id * CPE_CHANNELS ) + n], output_mem_fx, 0, output_frame, 0 /*core_switching_flag*/, dirac_stereo_flag, -1, hCPE->last_element_mode, &Q_synth ) ), IVAS_ERR_OK ) ) #endif { return error; } Loading