Loading lib_com/ivas_prot.h +1 −4 Original line number Diff line number Diff line Loading @@ -525,11 +525,8 @@ void stereo_tcx_core_dec( const int16_t last_element_mode, /* i : last element mode */ const int16_t flag_sec_CNA, /* i : CNA flag for secondary channel */ STEREO_CNG_DEC_HANDLE hStereoCng, /* i : Stereo CNG handle */ const int16_t nchan_out /* i : number of output channels */ #ifndef SIMPLIFY_IVAS_CORE , const int16_t nchan_out, /* i : number of output channels */ const IVAS_FORMAT ivas_format /* i : IVAS format */ #endif ); void stereo_tcx_init_dec( Loading lib_dec/ivas_core_dec.c +1 −5 Original line number Diff line number Diff line Loading @@ -384,12 +384,8 @@ ivas_error ivas_core_dec( if ( ( st->core == TCX_20_CORE || st->core == TCX_10_CORE ) && st->element_mode != IVAS_CPE_MDCT ) { /* TCX decoder */ #ifdef SIMPLIFY_IVAS_CORE stereo_tcx_core_dec( st, frameMode[n], output[n], synth[n], pitch_buf[n], sba_dirac_stereo_flag, hStereoTD, last_element_mode, flag_sec_CNA, hStereoCng, nchan_out ); #else /* TCX core decoder */ stereo_tcx_core_dec( st, frameMode[n], output[n], synth[n], pitch_buf[n], sba_dirac_stereo_flag, hStereoTD, last_element_mode, flag_sec_CNA, hCPE == NULL ? NULL : hCPE->hStereoCng, nchan_out, st_ivas == NULL ? 0 : st_ivas->ivas_format ); #endif } if ( st->core == HQ_CORE ) Loading lib_dec/ivas_tcx_core_dec.c +2 −9 Original line number Diff line number Diff line Loading @@ -158,11 +158,8 @@ void stereo_tcx_core_dec( const int16_t last_element_mode, /* i : last element mode */ const int16_t flag_sec_CNA, /* i : CNA flag for secondary channel */ STEREO_CNG_DEC_HANDLE hStereoCng, /* i : Stereo CNG handle */ const int16_t nchan_out /* i : number of output channels */ #ifndef SIMPLIFY_IVAS_CORE , const int16_t nchan_out, /* i : number of output channels */ const IVAS_FORMAT ivas_format /* i : IVAS format */ #endif ) { int16_t i, k; Loading Loading @@ -715,11 +712,7 @@ void stereo_tcx_core_dec( if ( st->element_mode != IVAS_CPE_TD ) { #ifdef SIMPLIFY_IVAS_CORE if ( st->is_ism_format ) #else if ( ivas_format == ISM_FORMAT ) #endif { float buffer[L_FRAME16k]; lerp( signal_outFB, buffer, st->L_frame, hTcxDec->L_frameTCX ); Loading Loading
lib_com/ivas_prot.h +1 −4 Original line number Diff line number Diff line Loading @@ -525,11 +525,8 @@ void stereo_tcx_core_dec( const int16_t last_element_mode, /* i : last element mode */ const int16_t flag_sec_CNA, /* i : CNA flag for secondary channel */ STEREO_CNG_DEC_HANDLE hStereoCng, /* i : Stereo CNG handle */ const int16_t nchan_out /* i : number of output channels */ #ifndef SIMPLIFY_IVAS_CORE , const int16_t nchan_out, /* i : number of output channels */ const IVAS_FORMAT ivas_format /* i : IVAS format */ #endif ); void stereo_tcx_init_dec( Loading
lib_dec/ivas_core_dec.c +1 −5 Original line number Diff line number Diff line Loading @@ -384,12 +384,8 @@ ivas_error ivas_core_dec( if ( ( st->core == TCX_20_CORE || st->core == TCX_10_CORE ) && st->element_mode != IVAS_CPE_MDCT ) { /* TCX decoder */ #ifdef SIMPLIFY_IVAS_CORE stereo_tcx_core_dec( st, frameMode[n], output[n], synth[n], pitch_buf[n], sba_dirac_stereo_flag, hStereoTD, last_element_mode, flag_sec_CNA, hStereoCng, nchan_out ); #else /* TCX core decoder */ stereo_tcx_core_dec( st, frameMode[n], output[n], synth[n], pitch_buf[n], sba_dirac_stereo_flag, hStereoTD, last_element_mode, flag_sec_CNA, hCPE == NULL ? NULL : hCPE->hStereoCng, nchan_out, st_ivas == NULL ? 0 : st_ivas->ivas_format ); #endif } if ( st->core == HQ_CORE ) Loading
lib_dec/ivas_tcx_core_dec.c +2 −9 Original line number Diff line number Diff line Loading @@ -158,11 +158,8 @@ void stereo_tcx_core_dec( const int16_t last_element_mode, /* i : last element mode */ const int16_t flag_sec_CNA, /* i : CNA flag for secondary channel */ STEREO_CNG_DEC_HANDLE hStereoCng, /* i : Stereo CNG handle */ const int16_t nchan_out /* i : number of output channels */ #ifndef SIMPLIFY_IVAS_CORE , const int16_t nchan_out, /* i : number of output channels */ const IVAS_FORMAT ivas_format /* i : IVAS format */ #endif ) { int16_t i, k; Loading Loading @@ -715,11 +712,7 @@ void stereo_tcx_core_dec( if ( st->element_mode != IVAS_CPE_TD ) { #ifdef SIMPLIFY_IVAS_CORE if ( st->is_ism_format ) #else if ( ivas_format == ISM_FORMAT ) #endif { float buffer[L_FRAME16k]; lerp( signal_outFB, buffer, st->L_frame, hTcxDec->L_frameTCX ); Loading