Loading lib_dec/ivas_mc_param_dec.c +4 −28 Original line number Diff line number Diff line Loading @@ -1331,25 +1331,16 @@ void ivas_param_mc_dec_digest_tc( ) { PARAM_MC_DEC_HANDLE hParamMC; int16_t ch; #ifndef OBJ_EDITING_API int16_t i; #endif int16_t i, ch; #ifdef FIX_835_PARAMMC_BUFFER_VALUES int16_t is_next_band, skip_next_band; #endif int16_t slot_idx, param_band_idx; int16_t nchan_transport; #ifndef OBJ_EDITING_API int16_t nchan_out_transport, nchan_out_cldfb; int16_t nchan_transport, nchan_out_transport, nchan_out_cldfb; int16_t nchan_out_cov; #endif /*CLDFB*/ #ifdef FIX_835_PARAMMC_BUFFER_VALUES #ifndef OBJ_EDITING_API float *pCx, *pCx_imag; #endif float cx[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS]; float cx_imag[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS]; float cx_next_band[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS]; Loading @@ -1358,27 +1349,18 @@ void ivas_param_mc_dec_digest_tc( float cx[PARAM_MC_MAX_PARAMETER_BANDS][PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS]; float cx_imag[PARAM_MC_MAX_PARAMETER_BANDS][PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS]; #endif #ifndef OBJ_EDITING_API float real_part, imag_part; /* format converter */ IVAS_OUTPUT_SETUP *hSynthesisOutputSetup; int16_t channel_active[MAX_OUTPUT_CHANNELS]; #endif IVAS_OUTPUT_SETUP *hSynthesisOutputSetup; hParamMC = st_ivas->hParamMC; assert( hParamMC ); push_wmops( "param_mc_dec_digest_tc" ); #ifndef OBJ_EDITING_API set_s( channel_active, 0, MAX_CICP_CHANNELS ); #endif nchan_transport = st_ivas->nchan_transport; #ifndef OBJ_EDITING_API nchan_out_transport = st_ivas->hTransSetup.nchan_out_woLFE + st_ivas->hTransSetup.num_lfe; if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) Loading Loading @@ -1423,7 +1405,7 @@ void ivas_param_mc_dec_digest_tc( mvs2s( hParamMC->subframe_nbslots, st_ivas->hTcBuffer->subframe_nbslots, hParamMC->nb_subframes ); ivas_param_mc_dec_compute_interpolator( hParamMC->hMetadataPMC->bAttackPresent, hParamMC->hMetadataPMC->attackIndex, nCldfbSlots, hParamMC->h_output_synthesis_params.interpolator ); #endif #ifdef FIX_835_PARAMMC_BUFFER_VALUES /* loop over two bands at a time */ Loading Loading @@ -1495,7 +1477,6 @@ void ivas_param_mc_dec_digest_tc( #endif } } #ifndef OBJ_EDITING_API /* map from complex input covariance to real values */ #ifdef FIX_835_PARAMMC_BUFFER_VALUES Loading Loading @@ -1585,11 +1566,6 @@ void ivas_param_mc_dec_digest_tc( nchan_out_cov ); #ifdef FIX_835_PARAMMC_BUFFER_VALUES } #endif #endif #ifdef FIX_835_PARAMMC_BUFFER_VALUES } #endif Loading Loading
lib_dec/ivas_mc_param_dec.c +4 −28 Original line number Diff line number Diff line Loading @@ -1331,25 +1331,16 @@ void ivas_param_mc_dec_digest_tc( ) { PARAM_MC_DEC_HANDLE hParamMC; int16_t ch; #ifndef OBJ_EDITING_API int16_t i; #endif int16_t i, ch; #ifdef FIX_835_PARAMMC_BUFFER_VALUES int16_t is_next_band, skip_next_band; #endif int16_t slot_idx, param_band_idx; int16_t nchan_transport; #ifndef OBJ_EDITING_API int16_t nchan_out_transport, nchan_out_cldfb; int16_t nchan_transport, nchan_out_transport, nchan_out_cldfb; int16_t nchan_out_cov; #endif /*CLDFB*/ #ifdef FIX_835_PARAMMC_BUFFER_VALUES #ifndef OBJ_EDITING_API float *pCx, *pCx_imag; #endif float cx[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS]; float cx_imag[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS]; float cx_next_band[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS]; Loading @@ -1358,27 +1349,18 @@ void ivas_param_mc_dec_digest_tc( float cx[PARAM_MC_MAX_PARAMETER_BANDS][PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS]; float cx_imag[PARAM_MC_MAX_PARAMETER_BANDS][PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS]; #endif #ifndef OBJ_EDITING_API float real_part, imag_part; /* format converter */ IVAS_OUTPUT_SETUP *hSynthesisOutputSetup; int16_t channel_active[MAX_OUTPUT_CHANNELS]; #endif IVAS_OUTPUT_SETUP *hSynthesisOutputSetup; hParamMC = st_ivas->hParamMC; assert( hParamMC ); push_wmops( "param_mc_dec_digest_tc" ); #ifndef OBJ_EDITING_API set_s( channel_active, 0, MAX_CICP_CHANNELS ); #endif nchan_transport = st_ivas->nchan_transport; #ifndef OBJ_EDITING_API nchan_out_transport = st_ivas->hTransSetup.nchan_out_woLFE + st_ivas->hTransSetup.num_lfe; if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) Loading Loading @@ -1423,7 +1405,7 @@ void ivas_param_mc_dec_digest_tc( mvs2s( hParamMC->subframe_nbslots, st_ivas->hTcBuffer->subframe_nbslots, hParamMC->nb_subframes ); ivas_param_mc_dec_compute_interpolator( hParamMC->hMetadataPMC->bAttackPresent, hParamMC->hMetadataPMC->attackIndex, nCldfbSlots, hParamMC->h_output_synthesis_params.interpolator ); #endif #ifdef FIX_835_PARAMMC_BUFFER_VALUES /* loop over two bands at a time */ Loading Loading @@ -1495,7 +1477,6 @@ void ivas_param_mc_dec_digest_tc( #endif } } #ifndef OBJ_EDITING_API /* map from complex input covariance to real values */ #ifdef FIX_835_PARAMMC_BUFFER_VALUES Loading Loading @@ -1585,11 +1566,6 @@ void ivas_param_mc_dec_digest_tc( nchan_out_cov ); #ifdef FIX_835_PARAMMC_BUFFER_VALUES } #endif #endif #ifdef FIX_835_PARAMMC_BUFFER_VALUES } #endif Loading