Loading lib_dec/ivas_jbm_dec.c +9 −15 Original line number Diff line number Diff line Loading @@ -1175,12 +1175,6 @@ ivas_error ivas_jbm_dec_render( { int16_t slots_to_render, first_sf, last_sf, subframe_idx, ch; uint16_t slot_size, slot_idx_start; float *output_f_local[MAX_OUTPUT_CHANNELS]; for ( ch = 0; ch < nchan_out; ch++ ) { output_f_local[ch] = p_output[ch]; } slot_size = NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ); slots_to_render = min( st_ivas->hSpar->num_slots - st_ivas->hSpar->slots_rendered, nSamplesAsked / slot_size ); Loading Loading @@ -1209,22 +1203,22 @@ ivas_error ivas_jbm_dec_render( p_tc[0] = st_ivas->hTcBuffer->tc[0 + nchan_ism] + slot_idx_start * slot_size; p_tc[1] = st_ivas->hTcBuffer->tc[1 + nchan_ism] + slot_idx_start * slot_size; for ( n = 0; n < BINAURAL_CHANNELS; n++ ) { int16_t ts; for ( ts = 0; ts < st_ivas->hSpar->subframe_nbslots[st_ivas->hSpar->subframes_rendered]; ts++ ) { int16_t i; for ( i = 0; i < slot_size; i++ ) { output_f_local[n][i] = p_tc[n][i]; p_output[n][i + subframe_idx * slot_size] = 0; } } } st_ivas->hSpar->slots_rendered += st_ivas->hSpar->subframe_nbslots[st_ivas->hSpar->subframes_rendered]; st_ivas->hSpar->subframes_rendered++; for ( ch = 0; ch < nchan_out; ch++ ) { output_f_local[ch] += n_samples_sf; } } } else Loading lib_dec/ivas_spar_decoder.c +7 −1 Original line number Diff line number Diff line Loading @@ -1667,7 +1667,13 @@ void ivas_spar_dec_upmixer_sf( { for ( ts = 0; ts < hSpar->subframe_nbslots[hSpar->subframes_rendered]; ts++ ) { cldfbAnalysis_ts( &p_tc[in_ch][ts * num_cldfb_bands], cldfb_in_ts_re[in_ch][ts], cldfb_in_ts_im[in_ch][ts], num_cldfb_bands, st_ivas->cldfbAnaDec[in_ch] ); cldfbAnalysis_ts( &p_tc[in_ch][ts * num_cldfb_bands], cldfb_in_ts_re[in_ch][ts], cldfb_in_ts_im[in_ch][ts], num_cldfb_bands, st_ivas->cldfbAnaDec[in_ch] ); } } Loading Loading
lib_dec/ivas_jbm_dec.c +9 −15 Original line number Diff line number Diff line Loading @@ -1175,12 +1175,6 @@ ivas_error ivas_jbm_dec_render( { int16_t slots_to_render, first_sf, last_sf, subframe_idx, ch; uint16_t slot_size, slot_idx_start; float *output_f_local[MAX_OUTPUT_CHANNELS]; for ( ch = 0; ch < nchan_out; ch++ ) { output_f_local[ch] = p_output[ch]; } slot_size = NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ); slots_to_render = min( st_ivas->hSpar->num_slots - st_ivas->hSpar->slots_rendered, nSamplesAsked / slot_size ); Loading Loading @@ -1209,22 +1203,22 @@ ivas_error ivas_jbm_dec_render( p_tc[0] = st_ivas->hTcBuffer->tc[0 + nchan_ism] + slot_idx_start * slot_size; p_tc[1] = st_ivas->hTcBuffer->tc[1 + nchan_ism] + slot_idx_start * slot_size; for ( n = 0; n < BINAURAL_CHANNELS; n++ ) { int16_t ts; for ( ts = 0; ts < st_ivas->hSpar->subframe_nbslots[st_ivas->hSpar->subframes_rendered]; ts++ ) { int16_t i; for ( i = 0; i < slot_size; i++ ) { output_f_local[n][i] = p_tc[n][i]; p_output[n][i + subframe_idx * slot_size] = 0; } } } st_ivas->hSpar->slots_rendered += st_ivas->hSpar->subframe_nbslots[st_ivas->hSpar->subframes_rendered]; st_ivas->hSpar->subframes_rendered++; for ( ch = 0; ch < nchan_out; ch++ ) { output_f_local[ch] += n_samples_sf; } } } else Loading
lib_dec/ivas_spar_decoder.c +7 −1 Original line number Diff line number Diff line Loading @@ -1667,7 +1667,13 @@ void ivas_spar_dec_upmixer_sf( { for ( ts = 0; ts < hSpar->subframe_nbslots[hSpar->subframes_rendered]; ts++ ) { cldfbAnalysis_ts( &p_tc[in_ch][ts * num_cldfb_bands], cldfb_in_ts_re[in_ch][ts], cldfb_in_ts_im[in_ch][ts], num_cldfb_bands, st_ivas->cldfbAnaDec[in_ch] ); cldfbAnalysis_ts( &p_tc[in_ch][ts * num_cldfb_bands], cldfb_in_ts_re[in_ch][ts], cldfb_in_ts_im[in_ch][ts], num_cldfb_bands, st_ivas->cldfbAnaDec[in_ch] ); } } Loading