Loading lib_dec/ivas_sba_dec.c +0 −63 Original line number Diff line number Diff line Loading @@ -173,11 +173,7 @@ ivas_error ivas_sba_dec_reconfigure( hSpar->hPCA = NULL; } #ifndef VLBR_20MS_MD if ( nchan_transport_old != ivas_get_sba_num_TCs( ivas_total_brate, sba_order_internal ) || ( last_ivas_total_brate >= IVAS_512k && ivas_total_brate < IVAS_512k ) || ( last_ivas_total_brate < IVAS_512k && ivas_total_brate >= IVAS_512k ) || ( last_ivas_total_brate < IVAS_24k4 && ivas_total_brate >= IVAS_24k4 ) ) #else if ( nchan_transport_old != ivas_get_sba_num_TCs( ivas_total_brate, sba_order_internal ) || ( last_ivas_total_brate >= IVAS_512k && ivas_total_brate < IVAS_512k ) || ( last_ivas_total_brate < IVAS_512k && ivas_total_brate >= IVAS_512k ) ) #endif { ivas_spar_dec_close( &( st_ivas->hSpar ), hDecoderConfig->output_Fs, 1 ); Loading Loading @@ -255,65 +251,6 @@ ivas_error ivas_sba_dec_reconfigure( return error; } } #ifndef VLBR_20MS_MD if ( last_ivas_total_brate < IVAS_24k4 && ivas_total_brate >= IVAS_24k4 ) { num_channels = st_ivas->hSpar->hMdDec->spar_md_cfg.num_umx_chs; ivas_spar_md_dec_matrix_close( st_ivas->hSpar->hMdDec, num_channels ); num_md_sub_frames = ivas_get_spar_dec_md_num_subframes( sba_order_internal, ivas_total_brate ); if ( ( error = ivas_spar_md_dec_matrix_open( st_ivas->hSpar->hMdDec, num_channels, num_md_sub_frames ) ) != IVAS_ERR_OK ) { return error; } for ( i = 0; i < num_channels; i++ ) { for ( j = 0; j < num_channels; j++ ) { for ( k = 0; k < IVAS_MAX_NUM_BANDS; k++ ) { st_ivas->hSpar->hMdDec->spar_coeffs_prev.C_re[i][j][k] = 0; } } } for ( i = 0; i < num_channels; i++ ) { for ( j = 0; j < num_channels; j++ ) { for ( k = 0; k < IVAS_MAX_NUM_BANDS; k++ ) { st_ivas->hSpar->hMdDec->spar_coeffs_prev.P_re[i][j][k] = 0; } } } for ( i = 0; i < num_channels; i++ ) { for ( j = 0; j < num_channels; j++ ) { for ( k = 0; k < IVAS_MAX_NUM_BANDS; k++ ) { st_ivas->hSpar->hMdDec->spar_coeffs_tar.C_re[i][j][k] = 0; } } } for ( i = 0; i < num_channels; i++ ) { for ( j = 0; j < num_channels; j++ ) { for ( k = 0; k < IVAS_MAX_NUM_BANDS; k++ ) { st_ivas->hSpar->hMdDec->spar_coeffs_tar.P_re[i][j][k] = 0; } } } } #endif hSpar = st_ivas->hSpar; st_ivas->sba_dirac_stereo_flag = ivas_get_sba_dirac_stereo_flag( st_ivas ); Loading Loading
lib_dec/ivas_sba_dec.c +0 −63 Original line number Diff line number Diff line Loading @@ -173,11 +173,7 @@ ivas_error ivas_sba_dec_reconfigure( hSpar->hPCA = NULL; } #ifndef VLBR_20MS_MD if ( nchan_transport_old != ivas_get_sba_num_TCs( ivas_total_brate, sba_order_internal ) || ( last_ivas_total_brate >= IVAS_512k && ivas_total_brate < IVAS_512k ) || ( last_ivas_total_brate < IVAS_512k && ivas_total_brate >= IVAS_512k ) || ( last_ivas_total_brate < IVAS_24k4 && ivas_total_brate >= IVAS_24k4 ) ) #else if ( nchan_transport_old != ivas_get_sba_num_TCs( ivas_total_brate, sba_order_internal ) || ( last_ivas_total_brate >= IVAS_512k && ivas_total_brate < IVAS_512k ) || ( last_ivas_total_brate < IVAS_512k && ivas_total_brate >= IVAS_512k ) ) #endif { ivas_spar_dec_close( &( st_ivas->hSpar ), hDecoderConfig->output_Fs, 1 ); Loading Loading @@ -255,65 +251,6 @@ ivas_error ivas_sba_dec_reconfigure( return error; } } #ifndef VLBR_20MS_MD if ( last_ivas_total_brate < IVAS_24k4 && ivas_total_brate >= IVAS_24k4 ) { num_channels = st_ivas->hSpar->hMdDec->spar_md_cfg.num_umx_chs; ivas_spar_md_dec_matrix_close( st_ivas->hSpar->hMdDec, num_channels ); num_md_sub_frames = ivas_get_spar_dec_md_num_subframes( sba_order_internal, ivas_total_brate ); if ( ( error = ivas_spar_md_dec_matrix_open( st_ivas->hSpar->hMdDec, num_channels, num_md_sub_frames ) ) != IVAS_ERR_OK ) { return error; } for ( i = 0; i < num_channels; i++ ) { for ( j = 0; j < num_channels; j++ ) { for ( k = 0; k < IVAS_MAX_NUM_BANDS; k++ ) { st_ivas->hSpar->hMdDec->spar_coeffs_prev.C_re[i][j][k] = 0; } } } for ( i = 0; i < num_channels; i++ ) { for ( j = 0; j < num_channels; j++ ) { for ( k = 0; k < IVAS_MAX_NUM_BANDS; k++ ) { st_ivas->hSpar->hMdDec->spar_coeffs_prev.P_re[i][j][k] = 0; } } } for ( i = 0; i < num_channels; i++ ) { for ( j = 0; j < num_channels; j++ ) { for ( k = 0; k < IVAS_MAX_NUM_BANDS; k++ ) { st_ivas->hSpar->hMdDec->spar_coeffs_tar.C_re[i][j][k] = 0; } } } for ( i = 0; i < num_channels; i++ ) { for ( j = 0; j < num_channels; j++ ) { for ( k = 0; k < IVAS_MAX_NUM_BANDS; k++ ) { st_ivas->hSpar->hMdDec->spar_coeffs_tar.P_re[i][j][k] = 0; } } } } #endif hSpar = st_ivas->hSpar; st_ivas->sba_dirac_stereo_flag = ivas_get_sba_dirac_stereo_flag( st_ivas ); Loading