Loading lib_com/ivas_cnst.h +0 −13 Original line number Diff line number Diff line Loading @@ -945,16 +945,6 @@ typedef enum #define SPAR_SID_BITS_TAR_PER_BAND 18 #ifndef FIX_SBA_CLEAN_UP_OPT typedef enum { WYXZ = 0, WY = 0, WX, WZ, WYiX, } ivas_spar_foa_pmx_strings_t; #else typedef enum { WYXZ = 0, Loading @@ -963,7 +953,6 @@ typedef enum WZ, WYiX, } ivas_spar_pmx_strings_t; #endif #define NUM_MD_Q_COEFS_SET 4 Loading Loading @@ -1034,7 +1023,6 @@ typedef enum PCA_MODE_INACTIVE = 1 } ivas_pca_bypass_mode; #ifdef FIX_SBA_CLEAN_UP_OPT enum { PRED_Q_1 = 0, Loading Loading @@ -1068,7 +1056,6 @@ enum DECD_Q_11, TOTAL_DECD_QUANT_STRATS }; #endif /*----------------------------------------------------------------------------------* * MASA constants Loading lib_com/ivas_dirac_com.c +0 −8 Original line number Diff line number Diff line Loading @@ -92,11 +92,7 @@ ivas_error ivas_dirac_config( sba_mode = ( (Encoder_Struct *) st_ivas )->sba_mode; if ( ( (Encoder_Struct *) st_ivas )->hSpar != NULL ) { #ifndef FIX_SBA_CLEAN_UP_OPT hFbMdft = ( (Encoder_Struct *) st_ivas )->hSpar->hSparFoa->hFbMixer; #else hFbMdft = ( (Encoder_Struct *) st_ivas )->hSpar->hFbMixer; #endif } else { Loading @@ -121,11 +117,7 @@ ivas_error ivas_dirac_config( sba_mode = ( (Decoder_Struct *) st_ivas )->sba_mode; if ( ( (Decoder_Struct *) st_ivas )->hSpar != NULL ) { #ifndef FIX_SBA_CLEAN_UP_OPT hFbMdft = ( (Decoder_Struct *) st_ivas )->hSpar->hSparFoa->hFbMixer; #else hFbMdft = ( (Decoder_Struct *) st_ivas )->hSpar->hFbMixer; #endif } else { Loading lib_com/ivas_entropy_coder_common.c +0 −4 Original line number Diff line number Diff line Loading @@ -36,11 +36,9 @@ #include "debug.h" #endif #include "ivas_prot.h" #ifdef FIX_SBA_CLEAN_UP_OPT #include "ivas_rom_com.h" #include "math.h" #include "prot.h" #endif #include "wmops.h" Loading Loading @@ -97,7 +95,6 @@ void ivas_get_cum_freq_model( return; } #ifdef FIX_SBA_CLEAN_UP_OPT /*-----------------------------------------------------------------------------------------* * Function ivas_map_num_pred_r_to_idx() * Loading Loading @@ -452,4 +449,3 @@ void ivas_spar_huff_coeffs_com_init( return; } #endif lib_com/ivas_fb_mixer.c +0 −57 Original line number Diff line number Diff line Loading @@ -276,15 +276,6 @@ ivas_error ivas_FB_mixer_open( ivas_get_active_bins( &pActive_bins_per_band, &pActive_bins_per_band_abs, &pStart_offset, &pStart_offset_abs, sampling_rate ); #ifndef FIX_SBA_CLEAN_UP_OPT for ( i = 0; i < num_bands; i++ ) { if ( ( hFbMixer->pFb->fb_bin_to_band.pFb_bin_to_band[i] = (float *) count_malloc( sizeof( float ) * pActive_bins_per_band_abs[i] ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FB mixer encoder" ); } } #else if ( fb_cfg->active_w_mixing != -1 ) { for ( i = 0; i < num_bands; i++ ) Loading @@ -295,7 +286,6 @@ ivas_error ivas_FB_mixer_open( } } } #endif if ( sampling_rate != 48000 ) { Loading Loading @@ -429,13 +419,6 @@ void ivas_FB_mixer_close( { num_bands = hFbMixer->pFb->filterbank_num_bands; #ifndef FIX_SBA_CLEAN_UP_OPT for ( i = 0; i < num_bands; i++ ) { count_free( hFbMixer->pFb->fb_bin_to_band.pFb_bin_to_band[i] ); hFbMixer->pFb->fb_bin_to_band.pFb_bin_to_band[i] = NULL; } #else if ( fb_cfg->active_w_mixing != -1 ) { for ( i = 0; i < num_bands; i++ ) Loading @@ -444,7 +427,6 @@ void ivas_FB_mixer_close( hFbMixer->pFb->fb_bin_to_band.pFb_bin_to_band[i] = NULL; } } #endif if ( sampling_rate != 48000 ) { Loading Loading @@ -816,16 +798,10 @@ void ivas_fb_mixer_get_in_out_mapping( * Function to calculate number of active bands *-----------------------------------------------------------------------------------------*/ #ifndef FIX_SBA_CLEAN_UP_OPT static int16_t ivas_calculate_abs_fr( ivas_filterbank_t *pFb, const int32_t sampling_rate ) #else static int16_t ivas_calculate_abs_fr( ivas_filterbank_t *pFb, const int32_t sampling_rate, const int16_t alloc_fb_resp ) #endif { int16_t frame_len; float ppFilterbank_FRs_s[L_FRAME48k]; Loading Loading @@ -963,17 +939,10 @@ static int16_t ivas_calculate_abs_fr( temp = 0; } #ifndef FIX_SBA_CLEAN_UP_OPT if ( j < ( abs_active_bins + abs_start_offset ) && j >= abs_start_offset ) { pFb->fb_bin_to_band.pFb_bin_to_band[i][idx++] = temp; } #else if ( j < ( abs_active_bins + abs_start_offset ) && j >= abs_start_offset && alloc_fb_resp != -1 ) { pFb->fb_bin_to_band.pFb_bin_to_band[i][idx++] = temp; } #endif ppFilterbank_FRs_s[j] += temp; } Loading @@ -987,23 +956,6 @@ static int16_t ivas_calculate_abs_fr( } } #ifndef FIX_SBA_CLEAN_UP_OPT for ( j = 0; j < bands; j++ ) { int16_t abs_active_bins = pFb->fb_bin_to_band.pFb_active_bins_per_band[j]; int16_t abs_start_offset = pFb->fb_bin_to_band.pFb_start_bin_per_band[j]; for ( i = 0; i < abs_active_bins; i++ ) { pFb->fb_bin_to_band.pFb_bin_to_band[j][i] /= ppFilterbank_FRs_s[i + abs_start_offset]; /*if(pFb->fb_bin_to_band.pFb_bin_to_band[j][i] > 0.5f) { num_active_bands = j + 1; break; }*/ } } #else if ( alloc_fb_resp != -1 ) { for ( j = 0; j < bands; j++ ) Loading @@ -1022,7 +974,6 @@ static int16_t ivas_calculate_abs_fr( } } } #endif return num_active_bands; } Loading Loading @@ -1164,11 +1115,7 @@ static ivas_error ivas_filterbank_setup( offset += pFb->fb_consts.pFilterbank_bins_per_band[j]; } #ifndef FIX_SBA_CLEAN_UP_OPT ivas_calculate_abs_fr( pFb, sampling_rate ); #else ivas_calculate_abs_fr( pFb, sampling_rate, pCfg->active_w_mixing ); #endif } else { Loading Loading @@ -1219,11 +1166,7 @@ static ivas_error ivas_filterbank_setup( pFb->fb_consts.ppFilterbank_FRs[1][j] = (const float *) pFb->fb_consts.ppFilterbank_FRs_non48k[1][j]; } #ifndef FIX_SBA_CLEAN_UP_OPT ivas_calculate_abs_fr( pFb, sampling_rate ); #else ivas_calculate_abs_fr( pFb, sampling_rate, pCfg->active_w_mixing ); #endif } } Loading lib_com/ivas_prot.h +0 −184 Original line number Diff line number Diff line Loading @@ -3805,19 +3805,11 @@ int16_t ivas_get_spar_num_TCs( const int16_t sba_order /* i : IVAS SBA order */ ); #ifndef FIX_SBA_CLEAN_UP_OPT void ivas_spar_set_bitrate_config( ivas_spar_foa_md_com_cfg *pSpar_md_cfg, /* i/o: SPAR MD config. handle */ const int16_t table_idx, /* i : config. table index */ const int16_t num_bands /* i : number of bands */ ); #else void ivas_spar_set_bitrate_config( ivas_spar_md_com_cfg *pSpar_md_cfg, /* i/o: SPAR MD config. handle */ const int16_t table_idx, /* i : config. table index */ const int16_t num_bands /* i : number of bands */ ); #endif #ifdef FIX_I1_113 void ivas_spar_bitrate_dist( Loading @@ -3836,47 +3828,6 @@ void ivas_imdct( const float *pIn, float *pOut, const int16_t length ); void ivas_itda( const float *re, float *pOut, const int16_t length ); /* FOA module */ #ifndef FIX_SBA_CLEAN_UP_OPT ivas_error ivas_spar_foa_enc_open( ivas_spar_foa_enc_state_t **hSparFoa, /* i/o: SPAR FOA encoder handle */ const ENCODER_CONFIG_HANDLE hEncoderConfig /* i : configuration structure */ ); void ivas_spar_foa_enc_close( ivas_spar_foa_enc_state_t **hSparFoa, /* i/o: SPAR FOA encoder handle */ const int32_t input_Fs, /* i : input sampling rate */ const int16_t nchan_inp /* i : number of input channels */ ); ivas_error ivas_spar_foa_enc_process( Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */ const ENCODER_CONFIG_HANDLE hEncoderConfig, /* i : configuration structure */ BSTR_ENC_HANDLE hMetaData, /* i/o: MetaData handle */ const int16_t front_vad_flag, /* i : front-VAD decision */ float ppPcm_in[][L_FRAME48k] /* i/o: input/transport audio channels */ ); ivas_error ivas_spar_foa_dec_open( ivas_spar_foa_dec_state_t **hSparFoa, /* i/o: SPAR FOA decoder handle */ const DECODER_CONFIG_HANDLE hDecoderConfig, /* i : configuration structure */ #ifdef SBA_CLEANING const int16_t sba_order, /* i : Ambisonic (SBA) order */ #endif const int16_t nchan_internal /* i : number of internal channels */ ); void ivas_spar_get_cldfb_gains( ivas_spar_foa_dec_state_t *hSparFoa, HANDLE_CLDFB_FILTER_BANK cldfbAnaDec0, HANDLE_CLDFB_FILTER_BANK cldfbSynDec0, const DECODER_CONFIG_HANDLE hDecoderConfig ); void ivas_spar_foa_dec_close( ivas_spar_foa_dec_state_t **hSparFoa, /* i/o: SPAR FOA decoder handle */ const int32_t output_Fs /* i : output sampling rate */ ); #else ivas_error ivas_spar_enc_process( Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */ const ENCODER_CONFIG_HANDLE hEncoderConfig, /* i : configuration structure */ Loading @@ -3891,7 +3842,6 @@ void ivas_spar_get_cldfb_gains( HANDLE_CLDFB_FILTER_BANK cldfbSynDec0, const DECODER_CONFIG_HANDLE hDecoderConfig ); #endif /* !r: 1 if prediction residual channel */ int16_t ivas_is_res_channel( Loading @@ -3899,32 +3849,6 @@ int16_t ivas_is_res_channel( const int16_t nchan_transport /* i : number of transport channels (1-4) */ ); #ifndef FIX_SBA_CLEAN_UP_OPT void ivas_spar_foa_dec_upmixer( Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ float output[][L_FRAME48k], /* i/o: input/output audio channels */ const int16_t nchan_internal, /* i : number of internal channels */ const int16_t output_frame /* i : output frame length */ ); /* FOA MD module */ ivas_error ivas_spar_foa_md_enc_open( ivas_spar_foa_md_enc_state_t **hMdEnc, /* i/o: SPAR MD encoder handle */ const ENCODER_CONFIG_HANDLE hEncoderConfig /* i : configuration structure */ ); void ivas_spar_foa_md_enc_close( ivas_spar_foa_md_enc_state_t **hMdEnc /* i/o: SPAR MD encoder handle */ ); ivas_error ivas_spar_foa_md_enc_process( ivas_spar_foa_md_enc_state_t *hMdEnc, /* i/o: SPAR MD encoder handle */ const ENCODER_CONFIG_HANDLE hEncoderConfig, /* i : configuration structure */ ivas_spar_foa_md_enc_in_buf_t *pIn_buf, BSTR_ENC_HANDLE hMetaData, /* i/o: MetaData handle */ const int16_t dtx_silence_mode ); #else void ivas_spar_dec_upmixer( Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ float output[][L_FRAME48k], /* i/o: input/output audio channels */ Loading @@ -3949,7 +3873,6 @@ ivas_error ivas_spar_md_enc_process( BSTR_ENC_HANDLE hMetaData, /* i/o: MetaData handle */ const int16_t dtx_silence_mode ); #endif void ivas_compute_spar_params( float *pppCov_mat_re[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH], Loading @@ -3962,11 +3885,7 @@ void ivas_compute_spar_params( const int16_t num_ch, const int16_t bands_bw, const int16_t active_w, #ifndef FIX_SBA_CLEAN_UP_OPT ivas_spar_foa_md_com_cfg *hSparCfg, #else ivas_spar_md_com_cfg *hSparCfg, #endif ivas_spar_md_t *hSparMd, float *pWscale, const int16_t from_dirac Loading @@ -3980,11 +3899,7 @@ void ivas_create_fullr_dmx_mat( const int16_t start_band, const int16_t end_band, const int16_t active_w, #ifndef FIX_SBA_CLEAN_UP_OPT ivas_spar_foa_md_com_cfg *hMdCfg #else ivas_spar_md_com_cfg *hMdCfg #endif ); void ivas_calc_c_p_coeffs( Loading @@ -4007,11 +3922,7 @@ void ivas_get_spar_md_from_dirac( const int16_t n_ts, float ***mixer_mat, ivas_spar_md_t *hSpar_md, #ifndef FIX_SBA_CLEAN_UP_OPT ivas_spar_foa_md_com_cfg *hSpar_md_cfg, #else ivas_spar_md_com_cfg *hSpar_md_cfg, #endif const int16_t start_band, const int16_t end_band, const int16_t order, Loading @@ -4019,73 +3930,6 @@ void ivas_get_spar_md_from_dirac( float Wscale_d[IVAS_MAX_NUM_BANDS] ); #ifndef FIX_SBA_CLEAN_UP_OPT ivas_error ivas_spar_foa_md_dec_open( ivas_spar_foa_md_dec_state_t **hMdDec_out, /* i/o: SPAR MD decoder handle */ const DECODER_CONFIG_HANDLE hDecoderConfig, /* i : configuration structure */ const int16_t num_channels /* i : number of internal channels */ ); void ivas_spar_foa_md_dec_close( ivas_spar_foa_md_dec_state_t **hMdDec /* i/o: SPAR MD decoder handle */ ); void ivas_spar_foa_dec_MD( Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ Decoder_State *st0 /* i/o: decoder state structure - for bitstream handling*/ ); void ivas_spar_get_parameters( ivas_spar_foa_dec_state_t *hSparFoa, /* i/o: SPAR FOA decoder handle */ const DECODER_CONFIG_HANDLE hDecoderConfig, /* i : configuration structure */ const int16_t ts, /* i : time slot index */ const int16_t num_ch_out, /* i : number of channels out */ const int16_t num_ch_in, /* i : number of channels in */ const int16_t num_spar_bands, /* i : number of SPAR bands */ float par_mat[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH][IVAS_MAX_NUM_BANDS] /* o : mixing matrix */ ); ivas_error ivas_spar_foa_md_dec_init( ivas_spar_foa_md_dec_state_t *hMdDec, /* i/o: SPAR MD decoder handle */ const DECODER_CONFIG_HANDLE hDecoderConfig, /* i : configuration structure */ const int16_t num_channels /* i : number of internal channels */ ); void ivas_spar_foa_md_dec_process( Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ Decoder_State *st0, /* i/o: decoder state structure - for bitstream handling*/ const int16_t num_bands_out, /* i : number of output bands */ const int16_t sba_order /* i : SBA order */ ); void ivas_spar_to_dirac( Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ ivas_spar_foa_md_dec_state_t *hMdDec, /* i/o: SPAR MD decoder handle */ const int16_t dtx_vad, /* i : DTX frame flag */ const int16_t num_bands_out /* i : number of output bands */ ); void ivas_spar_foa_update_md_hist( ivas_spar_foa_md_dec_state_t *hMdDec /* i/o: SPAR MD decoder handle */ ); void ivas_spar_foa_smooth_md_dtx( ivas_spar_foa_md_dec_state_t *hMdDec, /* i/o: SPAR MD decoder handle */ const int16_t num_bands_out /* i : number of output bands */ ); void ivas_spar_foa_setup_md_smoothing( ivas_spar_foa_md_dec_state_t *hMdDec, /* i/o: SPAR MD decoder handle */ const int16_t num_bands_out /* i : number of output bands */ ); void ivas_spar_foa_dec_gen_umx_mat( ivas_spar_foa_md_dec_state_t *hMdDec, /* i/o: SPAR MD decoder handle */ const int16_t nchan_transport, /* i : number of transport channels */ const int16_t num_bands_out, /* i : number of output bands */ const int16_t bfi /* i : bad frame indicator */ ); #else ivas_error ivas_spar_md_dec_open( ivas_spar_md_dec_state_t **hMdDec_out, /* i/o: SPAR MD decoder handle */ const DECODER_CONFIG_HANDLE hDecoderConfig, /* i : configuration structure */ Loading Loading @@ -4151,7 +3995,6 @@ void ivas_spar_dec_gen_umx_mat( const int16_t num_bands_out, /* i : number of output bands */ const int16_t bfi /* i : bad frame indicator */ ); #endif /* Covariance module */ ivas_error ivas_spar_covar_enc_open( Loading Loading @@ -4371,20 +4214,11 @@ int16_t ivas_get_bits_to_encode( ); void ivas_huffman_encode( ivas_huffman_cfg_t *huff_cfg, int16_t in, int16_t *hcode, int16_t *hlen ); #ifndef FIX_SBA_CLEAN_UP_OPT void ivas_huff_coeffs_enc_init( ivas_huff_coeffs_t *pHuff_coeffs, const int16_t table_idx ); void ivas_arith_coeffs_enc_init( ivas_arith_coeffs_t *pArith_coeffs, ivas_spar_foa_md_com_cfg *pSpar_cfg, const int16_t table_idx ); #else void ivas_spar_huff_coeffs_com_init( ivas_huff_coeffs_t *pHuff_coeffs, ivas_spar_md_com_cfg *pSpar_cfg, const int16_t table_idx, int16_t codec_mode ); void ivas_spar_arith_coeffs_com_init( ivas_arith_coeffs_t *pArith_coeffs, ivas_spar_md_com_cfg *pSpar_cfg, const int16_t table_idx, int16_t codec_mode ); #endif void ivas_arith_encode_cmplx_cell_array(ivas_arith_t *pArith_re, ivas_arith_t *pArith_re_diff, const int16_t *pDo_diff, const int16_t nB, int16_t *pSymbol_re, int16_t *pSymbol_old_re, ivas_cell_dim_t *pCell_dims, BSTR_ENC_HANDLE hMetaData, const int16_t any_diff); ivas_error ivas_huffman_decode( ivas_huffman_cfg_t *huff_cfg, Decoder_State *st0, int16_t *dec_out ); void ivas_arith_decode_cmplx_cell_array( ivas_arith_t *pArith_re, ivas_arith_t *pArith_re_diff, Decoder_State *st0, ivas_cell_dim_t *pCell_dims, int16_t *pDo_diff, const int16_t nB, int16_t *pSymbol_re, int16_t *pSymbol_re_old ); #ifndef FIX_SBA_CLEAN_UP_OPT void ivas_arith_coeffs_dec_init( ivas_arith_coeffs_t *pArith_coeffs, ivas_spar_foa_md_com_cfg *pSpar_cfg, const int16_t table_idx ); void ivas_huff_coeffs_dec_init( ivas_huff_coeffs_t *pHuff_coeffs, ivas_spar_foa_md_com_cfg *pSpar_cfg, const int16_t table_idx ); #endif void ivas_ari_start_decoding_14bits_ext_1_lfe( Decoder_State *st, Tastat *s, int16_t *extra_bits_read ); uint16_t ivas_ari_decode_14bits_bit_ext_1_lfe( Decoder_State *st, Tastat *s, const uint16_t *cum_freq, int16_t *extra_bits_read ); Loading @@ -4394,11 +4228,9 @@ void ivas_ari_encode_14bits_ext( BSTR_ENC_HANDLE hBstr, Tastat *s, int32_t symbo void ivas_wrap_arround( int16_t *pArr, const int16_t min_val, const int16_t max_val, const int16_t length ); void ivas_get_cum_freq_model( const int16_t *pFreq_model, const int16_t length, int16_t *pCum_freq_model ); #ifdef FIX_SBA_CLEAN_UP_OPT int16_t ivas_map_num_pred_r_to_idx( const int16_t num_quant_points_pred_r, const int16_t active_w_flag ); int16_t ivas_map_num_drct_r_to_idx( const int16_t num_quant_points_drct_r ); int16_t ivas_map_num_decd_r_to_idx( const int16_t num_quant_points_decd_r ); #endif /* Quantization utilities */ void ivas_quantise_real_values( Loading @@ -4412,38 +4244,22 @@ void ivas_quantise_real_values( const int16_t dim2 ); #ifndef FIX_SBA_CLEAN_UP_OPT void ivas_spar_foa_get_uniform_quant_strat( ivas_spar_foa_md_com_cfg *pSpar_md_com_cfg, const int16_t table_idx ); #else void ivas_spar_get_uniform_quant_strat( ivas_spar_md_com_cfg *pSpar_md_com_cfg, const int16_t table_idx ); #endif void ivas_spar_quant_dtx_init( ivas_spar_md_t *spar_md, float *min_max ); #ifndef FIX_SBA_CLEAN_UP_OPT void ivas_map_prior_coeffs_quant( ivas_spar_md_prev_t *pSpar_md_prior, ivas_spar_foa_md_com_cfg *pSpar_md_cfg, const int16_t qsi, const int16_t nB ); #else void ivas_map_prior_coeffs_quant( ivas_spar_md_prev_t *pSpar_md_prior, ivas_spar_md_com_cfg *pSpar_md_cfg, const int16_t qsi, const int16_t nB ); #endif void ivas_copy_band_coeffs_idx_to_arr( ivas_band_coeffs_ind_t *pBands_idx, Loading Loading
lib_com/ivas_cnst.h +0 −13 Original line number Diff line number Diff line Loading @@ -945,16 +945,6 @@ typedef enum #define SPAR_SID_BITS_TAR_PER_BAND 18 #ifndef FIX_SBA_CLEAN_UP_OPT typedef enum { WYXZ = 0, WY = 0, WX, WZ, WYiX, } ivas_spar_foa_pmx_strings_t; #else typedef enum { WYXZ = 0, Loading @@ -963,7 +953,6 @@ typedef enum WZ, WYiX, } ivas_spar_pmx_strings_t; #endif #define NUM_MD_Q_COEFS_SET 4 Loading Loading @@ -1034,7 +1023,6 @@ typedef enum PCA_MODE_INACTIVE = 1 } ivas_pca_bypass_mode; #ifdef FIX_SBA_CLEAN_UP_OPT enum { PRED_Q_1 = 0, Loading Loading @@ -1068,7 +1056,6 @@ enum DECD_Q_11, TOTAL_DECD_QUANT_STRATS }; #endif /*----------------------------------------------------------------------------------* * MASA constants Loading
lib_com/ivas_dirac_com.c +0 −8 Original line number Diff line number Diff line Loading @@ -92,11 +92,7 @@ ivas_error ivas_dirac_config( sba_mode = ( (Encoder_Struct *) st_ivas )->sba_mode; if ( ( (Encoder_Struct *) st_ivas )->hSpar != NULL ) { #ifndef FIX_SBA_CLEAN_UP_OPT hFbMdft = ( (Encoder_Struct *) st_ivas )->hSpar->hSparFoa->hFbMixer; #else hFbMdft = ( (Encoder_Struct *) st_ivas )->hSpar->hFbMixer; #endif } else { Loading @@ -121,11 +117,7 @@ ivas_error ivas_dirac_config( sba_mode = ( (Decoder_Struct *) st_ivas )->sba_mode; if ( ( (Decoder_Struct *) st_ivas )->hSpar != NULL ) { #ifndef FIX_SBA_CLEAN_UP_OPT hFbMdft = ( (Decoder_Struct *) st_ivas )->hSpar->hSparFoa->hFbMixer; #else hFbMdft = ( (Decoder_Struct *) st_ivas )->hSpar->hFbMixer; #endif } else { Loading
lib_com/ivas_entropy_coder_common.c +0 −4 Original line number Diff line number Diff line Loading @@ -36,11 +36,9 @@ #include "debug.h" #endif #include "ivas_prot.h" #ifdef FIX_SBA_CLEAN_UP_OPT #include "ivas_rom_com.h" #include "math.h" #include "prot.h" #endif #include "wmops.h" Loading Loading @@ -97,7 +95,6 @@ void ivas_get_cum_freq_model( return; } #ifdef FIX_SBA_CLEAN_UP_OPT /*-----------------------------------------------------------------------------------------* * Function ivas_map_num_pred_r_to_idx() * Loading Loading @@ -452,4 +449,3 @@ void ivas_spar_huff_coeffs_com_init( return; } #endif
lib_com/ivas_fb_mixer.c +0 −57 Original line number Diff line number Diff line Loading @@ -276,15 +276,6 @@ ivas_error ivas_FB_mixer_open( ivas_get_active_bins( &pActive_bins_per_band, &pActive_bins_per_band_abs, &pStart_offset, &pStart_offset_abs, sampling_rate ); #ifndef FIX_SBA_CLEAN_UP_OPT for ( i = 0; i < num_bands; i++ ) { if ( ( hFbMixer->pFb->fb_bin_to_band.pFb_bin_to_band[i] = (float *) count_malloc( sizeof( float ) * pActive_bins_per_band_abs[i] ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FB mixer encoder" ); } } #else if ( fb_cfg->active_w_mixing != -1 ) { for ( i = 0; i < num_bands; i++ ) Loading @@ -295,7 +286,6 @@ ivas_error ivas_FB_mixer_open( } } } #endif if ( sampling_rate != 48000 ) { Loading Loading @@ -429,13 +419,6 @@ void ivas_FB_mixer_close( { num_bands = hFbMixer->pFb->filterbank_num_bands; #ifndef FIX_SBA_CLEAN_UP_OPT for ( i = 0; i < num_bands; i++ ) { count_free( hFbMixer->pFb->fb_bin_to_band.pFb_bin_to_band[i] ); hFbMixer->pFb->fb_bin_to_band.pFb_bin_to_band[i] = NULL; } #else if ( fb_cfg->active_w_mixing != -1 ) { for ( i = 0; i < num_bands; i++ ) Loading @@ -444,7 +427,6 @@ void ivas_FB_mixer_close( hFbMixer->pFb->fb_bin_to_band.pFb_bin_to_band[i] = NULL; } } #endif if ( sampling_rate != 48000 ) { Loading Loading @@ -816,16 +798,10 @@ void ivas_fb_mixer_get_in_out_mapping( * Function to calculate number of active bands *-----------------------------------------------------------------------------------------*/ #ifndef FIX_SBA_CLEAN_UP_OPT static int16_t ivas_calculate_abs_fr( ivas_filterbank_t *pFb, const int32_t sampling_rate ) #else static int16_t ivas_calculate_abs_fr( ivas_filterbank_t *pFb, const int32_t sampling_rate, const int16_t alloc_fb_resp ) #endif { int16_t frame_len; float ppFilterbank_FRs_s[L_FRAME48k]; Loading Loading @@ -963,17 +939,10 @@ static int16_t ivas_calculate_abs_fr( temp = 0; } #ifndef FIX_SBA_CLEAN_UP_OPT if ( j < ( abs_active_bins + abs_start_offset ) && j >= abs_start_offset ) { pFb->fb_bin_to_band.pFb_bin_to_band[i][idx++] = temp; } #else if ( j < ( abs_active_bins + abs_start_offset ) && j >= abs_start_offset && alloc_fb_resp != -1 ) { pFb->fb_bin_to_band.pFb_bin_to_band[i][idx++] = temp; } #endif ppFilterbank_FRs_s[j] += temp; } Loading @@ -987,23 +956,6 @@ static int16_t ivas_calculate_abs_fr( } } #ifndef FIX_SBA_CLEAN_UP_OPT for ( j = 0; j < bands; j++ ) { int16_t abs_active_bins = pFb->fb_bin_to_band.pFb_active_bins_per_band[j]; int16_t abs_start_offset = pFb->fb_bin_to_band.pFb_start_bin_per_band[j]; for ( i = 0; i < abs_active_bins; i++ ) { pFb->fb_bin_to_band.pFb_bin_to_band[j][i] /= ppFilterbank_FRs_s[i + abs_start_offset]; /*if(pFb->fb_bin_to_band.pFb_bin_to_band[j][i] > 0.5f) { num_active_bands = j + 1; break; }*/ } } #else if ( alloc_fb_resp != -1 ) { for ( j = 0; j < bands; j++ ) Loading @@ -1022,7 +974,6 @@ static int16_t ivas_calculate_abs_fr( } } } #endif return num_active_bands; } Loading Loading @@ -1164,11 +1115,7 @@ static ivas_error ivas_filterbank_setup( offset += pFb->fb_consts.pFilterbank_bins_per_band[j]; } #ifndef FIX_SBA_CLEAN_UP_OPT ivas_calculate_abs_fr( pFb, sampling_rate ); #else ivas_calculate_abs_fr( pFb, sampling_rate, pCfg->active_w_mixing ); #endif } else { Loading Loading @@ -1219,11 +1166,7 @@ static ivas_error ivas_filterbank_setup( pFb->fb_consts.ppFilterbank_FRs[1][j] = (const float *) pFb->fb_consts.ppFilterbank_FRs_non48k[1][j]; } #ifndef FIX_SBA_CLEAN_UP_OPT ivas_calculate_abs_fr( pFb, sampling_rate ); #else ivas_calculate_abs_fr( pFb, sampling_rate, pCfg->active_w_mixing ); #endif } } Loading
lib_com/ivas_prot.h +0 −184 Original line number Diff line number Diff line Loading @@ -3805,19 +3805,11 @@ int16_t ivas_get_spar_num_TCs( const int16_t sba_order /* i : IVAS SBA order */ ); #ifndef FIX_SBA_CLEAN_UP_OPT void ivas_spar_set_bitrate_config( ivas_spar_foa_md_com_cfg *pSpar_md_cfg, /* i/o: SPAR MD config. handle */ const int16_t table_idx, /* i : config. table index */ const int16_t num_bands /* i : number of bands */ ); #else void ivas_spar_set_bitrate_config( ivas_spar_md_com_cfg *pSpar_md_cfg, /* i/o: SPAR MD config. handle */ const int16_t table_idx, /* i : config. table index */ const int16_t num_bands /* i : number of bands */ ); #endif #ifdef FIX_I1_113 void ivas_spar_bitrate_dist( Loading @@ -3836,47 +3828,6 @@ void ivas_imdct( const float *pIn, float *pOut, const int16_t length ); void ivas_itda( const float *re, float *pOut, const int16_t length ); /* FOA module */ #ifndef FIX_SBA_CLEAN_UP_OPT ivas_error ivas_spar_foa_enc_open( ivas_spar_foa_enc_state_t **hSparFoa, /* i/o: SPAR FOA encoder handle */ const ENCODER_CONFIG_HANDLE hEncoderConfig /* i : configuration structure */ ); void ivas_spar_foa_enc_close( ivas_spar_foa_enc_state_t **hSparFoa, /* i/o: SPAR FOA encoder handle */ const int32_t input_Fs, /* i : input sampling rate */ const int16_t nchan_inp /* i : number of input channels */ ); ivas_error ivas_spar_foa_enc_process( Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */ const ENCODER_CONFIG_HANDLE hEncoderConfig, /* i : configuration structure */ BSTR_ENC_HANDLE hMetaData, /* i/o: MetaData handle */ const int16_t front_vad_flag, /* i : front-VAD decision */ float ppPcm_in[][L_FRAME48k] /* i/o: input/transport audio channels */ ); ivas_error ivas_spar_foa_dec_open( ivas_spar_foa_dec_state_t **hSparFoa, /* i/o: SPAR FOA decoder handle */ const DECODER_CONFIG_HANDLE hDecoderConfig, /* i : configuration structure */ #ifdef SBA_CLEANING const int16_t sba_order, /* i : Ambisonic (SBA) order */ #endif const int16_t nchan_internal /* i : number of internal channels */ ); void ivas_spar_get_cldfb_gains( ivas_spar_foa_dec_state_t *hSparFoa, HANDLE_CLDFB_FILTER_BANK cldfbAnaDec0, HANDLE_CLDFB_FILTER_BANK cldfbSynDec0, const DECODER_CONFIG_HANDLE hDecoderConfig ); void ivas_spar_foa_dec_close( ivas_spar_foa_dec_state_t **hSparFoa, /* i/o: SPAR FOA decoder handle */ const int32_t output_Fs /* i : output sampling rate */ ); #else ivas_error ivas_spar_enc_process( Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */ const ENCODER_CONFIG_HANDLE hEncoderConfig, /* i : configuration structure */ Loading @@ -3891,7 +3842,6 @@ void ivas_spar_get_cldfb_gains( HANDLE_CLDFB_FILTER_BANK cldfbSynDec0, const DECODER_CONFIG_HANDLE hDecoderConfig ); #endif /* !r: 1 if prediction residual channel */ int16_t ivas_is_res_channel( Loading @@ -3899,32 +3849,6 @@ int16_t ivas_is_res_channel( const int16_t nchan_transport /* i : number of transport channels (1-4) */ ); #ifndef FIX_SBA_CLEAN_UP_OPT void ivas_spar_foa_dec_upmixer( Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ float output[][L_FRAME48k], /* i/o: input/output audio channels */ const int16_t nchan_internal, /* i : number of internal channels */ const int16_t output_frame /* i : output frame length */ ); /* FOA MD module */ ivas_error ivas_spar_foa_md_enc_open( ivas_spar_foa_md_enc_state_t **hMdEnc, /* i/o: SPAR MD encoder handle */ const ENCODER_CONFIG_HANDLE hEncoderConfig /* i : configuration structure */ ); void ivas_spar_foa_md_enc_close( ivas_spar_foa_md_enc_state_t **hMdEnc /* i/o: SPAR MD encoder handle */ ); ivas_error ivas_spar_foa_md_enc_process( ivas_spar_foa_md_enc_state_t *hMdEnc, /* i/o: SPAR MD encoder handle */ const ENCODER_CONFIG_HANDLE hEncoderConfig, /* i : configuration structure */ ivas_spar_foa_md_enc_in_buf_t *pIn_buf, BSTR_ENC_HANDLE hMetaData, /* i/o: MetaData handle */ const int16_t dtx_silence_mode ); #else void ivas_spar_dec_upmixer( Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ float output[][L_FRAME48k], /* i/o: input/output audio channels */ Loading @@ -3949,7 +3873,6 @@ ivas_error ivas_spar_md_enc_process( BSTR_ENC_HANDLE hMetaData, /* i/o: MetaData handle */ const int16_t dtx_silence_mode ); #endif void ivas_compute_spar_params( float *pppCov_mat_re[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH], Loading @@ -3962,11 +3885,7 @@ void ivas_compute_spar_params( const int16_t num_ch, const int16_t bands_bw, const int16_t active_w, #ifndef FIX_SBA_CLEAN_UP_OPT ivas_spar_foa_md_com_cfg *hSparCfg, #else ivas_spar_md_com_cfg *hSparCfg, #endif ivas_spar_md_t *hSparMd, float *pWscale, const int16_t from_dirac Loading @@ -3980,11 +3899,7 @@ void ivas_create_fullr_dmx_mat( const int16_t start_band, const int16_t end_band, const int16_t active_w, #ifndef FIX_SBA_CLEAN_UP_OPT ivas_spar_foa_md_com_cfg *hMdCfg #else ivas_spar_md_com_cfg *hMdCfg #endif ); void ivas_calc_c_p_coeffs( Loading @@ -4007,11 +3922,7 @@ void ivas_get_spar_md_from_dirac( const int16_t n_ts, float ***mixer_mat, ivas_spar_md_t *hSpar_md, #ifndef FIX_SBA_CLEAN_UP_OPT ivas_spar_foa_md_com_cfg *hSpar_md_cfg, #else ivas_spar_md_com_cfg *hSpar_md_cfg, #endif const int16_t start_band, const int16_t end_band, const int16_t order, Loading @@ -4019,73 +3930,6 @@ void ivas_get_spar_md_from_dirac( float Wscale_d[IVAS_MAX_NUM_BANDS] ); #ifndef FIX_SBA_CLEAN_UP_OPT ivas_error ivas_spar_foa_md_dec_open( ivas_spar_foa_md_dec_state_t **hMdDec_out, /* i/o: SPAR MD decoder handle */ const DECODER_CONFIG_HANDLE hDecoderConfig, /* i : configuration structure */ const int16_t num_channels /* i : number of internal channels */ ); void ivas_spar_foa_md_dec_close( ivas_spar_foa_md_dec_state_t **hMdDec /* i/o: SPAR MD decoder handle */ ); void ivas_spar_foa_dec_MD( Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ Decoder_State *st0 /* i/o: decoder state structure - for bitstream handling*/ ); void ivas_spar_get_parameters( ivas_spar_foa_dec_state_t *hSparFoa, /* i/o: SPAR FOA decoder handle */ const DECODER_CONFIG_HANDLE hDecoderConfig, /* i : configuration structure */ const int16_t ts, /* i : time slot index */ const int16_t num_ch_out, /* i : number of channels out */ const int16_t num_ch_in, /* i : number of channels in */ const int16_t num_spar_bands, /* i : number of SPAR bands */ float par_mat[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH][IVAS_MAX_NUM_BANDS] /* o : mixing matrix */ ); ivas_error ivas_spar_foa_md_dec_init( ivas_spar_foa_md_dec_state_t *hMdDec, /* i/o: SPAR MD decoder handle */ const DECODER_CONFIG_HANDLE hDecoderConfig, /* i : configuration structure */ const int16_t num_channels /* i : number of internal channels */ ); void ivas_spar_foa_md_dec_process( Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ Decoder_State *st0, /* i/o: decoder state structure - for bitstream handling*/ const int16_t num_bands_out, /* i : number of output bands */ const int16_t sba_order /* i : SBA order */ ); void ivas_spar_to_dirac( Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ ivas_spar_foa_md_dec_state_t *hMdDec, /* i/o: SPAR MD decoder handle */ const int16_t dtx_vad, /* i : DTX frame flag */ const int16_t num_bands_out /* i : number of output bands */ ); void ivas_spar_foa_update_md_hist( ivas_spar_foa_md_dec_state_t *hMdDec /* i/o: SPAR MD decoder handle */ ); void ivas_spar_foa_smooth_md_dtx( ivas_spar_foa_md_dec_state_t *hMdDec, /* i/o: SPAR MD decoder handle */ const int16_t num_bands_out /* i : number of output bands */ ); void ivas_spar_foa_setup_md_smoothing( ivas_spar_foa_md_dec_state_t *hMdDec, /* i/o: SPAR MD decoder handle */ const int16_t num_bands_out /* i : number of output bands */ ); void ivas_spar_foa_dec_gen_umx_mat( ivas_spar_foa_md_dec_state_t *hMdDec, /* i/o: SPAR MD decoder handle */ const int16_t nchan_transport, /* i : number of transport channels */ const int16_t num_bands_out, /* i : number of output bands */ const int16_t bfi /* i : bad frame indicator */ ); #else ivas_error ivas_spar_md_dec_open( ivas_spar_md_dec_state_t **hMdDec_out, /* i/o: SPAR MD decoder handle */ const DECODER_CONFIG_HANDLE hDecoderConfig, /* i : configuration structure */ Loading Loading @@ -4151,7 +3995,6 @@ void ivas_spar_dec_gen_umx_mat( const int16_t num_bands_out, /* i : number of output bands */ const int16_t bfi /* i : bad frame indicator */ ); #endif /* Covariance module */ ivas_error ivas_spar_covar_enc_open( Loading Loading @@ -4371,20 +4214,11 @@ int16_t ivas_get_bits_to_encode( ); void ivas_huffman_encode( ivas_huffman_cfg_t *huff_cfg, int16_t in, int16_t *hcode, int16_t *hlen ); #ifndef FIX_SBA_CLEAN_UP_OPT void ivas_huff_coeffs_enc_init( ivas_huff_coeffs_t *pHuff_coeffs, const int16_t table_idx ); void ivas_arith_coeffs_enc_init( ivas_arith_coeffs_t *pArith_coeffs, ivas_spar_foa_md_com_cfg *pSpar_cfg, const int16_t table_idx ); #else void ivas_spar_huff_coeffs_com_init( ivas_huff_coeffs_t *pHuff_coeffs, ivas_spar_md_com_cfg *pSpar_cfg, const int16_t table_idx, int16_t codec_mode ); void ivas_spar_arith_coeffs_com_init( ivas_arith_coeffs_t *pArith_coeffs, ivas_spar_md_com_cfg *pSpar_cfg, const int16_t table_idx, int16_t codec_mode ); #endif void ivas_arith_encode_cmplx_cell_array(ivas_arith_t *pArith_re, ivas_arith_t *pArith_re_diff, const int16_t *pDo_diff, const int16_t nB, int16_t *pSymbol_re, int16_t *pSymbol_old_re, ivas_cell_dim_t *pCell_dims, BSTR_ENC_HANDLE hMetaData, const int16_t any_diff); ivas_error ivas_huffman_decode( ivas_huffman_cfg_t *huff_cfg, Decoder_State *st0, int16_t *dec_out ); void ivas_arith_decode_cmplx_cell_array( ivas_arith_t *pArith_re, ivas_arith_t *pArith_re_diff, Decoder_State *st0, ivas_cell_dim_t *pCell_dims, int16_t *pDo_diff, const int16_t nB, int16_t *pSymbol_re, int16_t *pSymbol_re_old ); #ifndef FIX_SBA_CLEAN_UP_OPT void ivas_arith_coeffs_dec_init( ivas_arith_coeffs_t *pArith_coeffs, ivas_spar_foa_md_com_cfg *pSpar_cfg, const int16_t table_idx ); void ivas_huff_coeffs_dec_init( ivas_huff_coeffs_t *pHuff_coeffs, ivas_spar_foa_md_com_cfg *pSpar_cfg, const int16_t table_idx ); #endif void ivas_ari_start_decoding_14bits_ext_1_lfe( Decoder_State *st, Tastat *s, int16_t *extra_bits_read ); uint16_t ivas_ari_decode_14bits_bit_ext_1_lfe( Decoder_State *st, Tastat *s, const uint16_t *cum_freq, int16_t *extra_bits_read ); Loading @@ -4394,11 +4228,9 @@ void ivas_ari_encode_14bits_ext( BSTR_ENC_HANDLE hBstr, Tastat *s, int32_t symbo void ivas_wrap_arround( int16_t *pArr, const int16_t min_val, const int16_t max_val, const int16_t length ); void ivas_get_cum_freq_model( const int16_t *pFreq_model, const int16_t length, int16_t *pCum_freq_model ); #ifdef FIX_SBA_CLEAN_UP_OPT int16_t ivas_map_num_pred_r_to_idx( const int16_t num_quant_points_pred_r, const int16_t active_w_flag ); int16_t ivas_map_num_drct_r_to_idx( const int16_t num_quant_points_drct_r ); int16_t ivas_map_num_decd_r_to_idx( const int16_t num_quant_points_decd_r ); #endif /* Quantization utilities */ void ivas_quantise_real_values( Loading @@ -4412,38 +4244,22 @@ void ivas_quantise_real_values( const int16_t dim2 ); #ifndef FIX_SBA_CLEAN_UP_OPT void ivas_spar_foa_get_uniform_quant_strat( ivas_spar_foa_md_com_cfg *pSpar_md_com_cfg, const int16_t table_idx ); #else void ivas_spar_get_uniform_quant_strat( ivas_spar_md_com_cfg *pSpar_md_com_cfg, const int16_t table_idx ); #endif void ivas_spar_quant_dtx_init( ivas_spar_md_t *spar_md, float *min_max ); #ifndef FIX_SBA_CLEAN_UP_OPT void ivas_map_prior_coeffs_quant( ivas_spar_md_prev_t *pSpar_md_prior, ivas_spar_foa_md_com_cfg *pSpar_md_cfg, const int16_t qsi, const int16_t nB ); #else void ivas_map_prior_coeffs_quant( ivas_spar_md_prev_t *pSpar_md_prior, ivas_spar_md_com_cfg *pSpar_md_cfg, const int16_t qsi, const int16_t nB ); #endif void ivas_copy_band_coeffs_idx_to_arr( ivas_band_coeffs_ind_t *pBands_idx, Loading