Loading lib_dec/lib_dec.c +5 −9 Original line number Diff line number Diff line Loading @@ -93,7 +93,6 @@ struct IVAS_DEC int16_t bitstreamformat; /* Bitstream format flag (G.192/MIME/VOIP_G192_RTP/VOIP_RTPDUMP) */ bool Opt_VOIP; /* flag indicating VOIP mode with JBM */ #ifdef API_5MS bool Opt_TSM; /* flag indicating TSM mode*/ int16_t tsm_scale; /* scale for TSM operation */ int16_t tsm_max_scaling; float *apaExecBuffer; /* Buffer for APA scaling */ Loading Loading @@ -166,7 +165,6 @@ ivas_error IVAS_DEC_Open( #ifdef API_5MS hIvasDec->apaExecBuffer = NULL; hIvasDec->hTimeScaler = NULL; hIvasDec->Opt_TSM = false; hIvasDec->tsm_scale = 100; hIvasDec->needNewFrame = false; hIvasDec->nTransportChannelsOld = 0; Loading Loading @@ -531,7 +529,6 @@ ivas_error IVAS_DEC_Configure( #ifdef API_5MS hDecoderConfig->tsm_active = tsmEnabled; hIvasDec->Opt_TSM = tsmEnabled; hIvasDec->nSamplesFrame = (uint16_t) ( hDecoderConfig->output_Fs / FRAMES_PER_SEC ); hIvasDec->nSamplesAvailableNext = 0; hIvasDec->nSamplesRendered = 0; Loading Loading @@ -578,7 +575,6 @@ ivas_error IVAS_DEC_EnableVoIP( hIvasDec->Opt_VOIP = 1; #ifdef API_5MS hIvasDec->Opt_TSM = 1; hDecoderConfig->tsm_active = 1; #else hDecoderConfig->voip_active = 1; Loading Loading @@ -895,7 +891,7 @@ ivas_error IVAS_DEC_GetSamples( return error; } if ( hIvasDec->Opt_TSM ) if ( hIvasDec->st_ivas->hDecoderConfig->tsm_active ) { if ( apa_set_scale( hIvasDec->hTimeScaler, hIvasDec->tsm_scale ) != 0 ) { Loading @@ -922,7 +918,7 @@ ivas_error IVAS_DEC_GetSamples( return error; } if ( hIvasDec->Opt_TSM ) if ( hIvasDec->st_ivas->hDecoderConfig->tsm_active ) { /* feed residual samples to TSM for the next call */ if ( apa_set_renderer_residual_samples( hIvasDec->hTimeScaler, (uint16_t) nResidualSamples ) != 0 ) Loading Loading @@ -2018,7 +2014,7 @@ ivas_error IVAS_DEC_VoIP_SetScale( error = IVAS_ERR_OK; #ifdef API_5MS if ( hIvasDec->Opt_TSM == false ) if ( hIvasDec->st_ivas->hDecoderConfig->tsm_active == false ) { return IVAS_ERR_TSM_NOT_ENABLED; } Loading Loading @@ -3560,7 +3556,7 @@ ivas_error IVAS_DEC_reconfigure( DECODER_CONFIG_HANDLE hDecoderConfig; #ifdef API_5MS if ( hIvasDec->Opt_TSM ) if ( hIvasDec->st_ivas->hDecoderConfig->tsm_active ) { uint16_t wss, css; float startQuality; Loading Loading @@ -3692,7 +3688,7 @@ ivas_error IVAS_DEC_reconfigure( else { #ifdef API_5MS if ( hIvasDec->Opt_TSM ) if ( hIvasDec->st_ivas->hDecoderConfig->tsm_active ) { if ( apa_reconfigure( hIvasDec->hTimeScaler, nTransportChannels, l_ts ) != 0 ) #else Loading Loading
lib_dec/lib_dec.c +5 −9 Original line number Diff line number Diff line Loading @@ -93,7 +93,6 @@ struct IVAS_DEC int16_t bitstreamformat; /* Bitstream format flag (G.192/MIME/VOIP_G192_RTP/VOIP_RTPDUMP) */ bool Opt_VOIP; /* flag indicating VOIP mode with JBM */ #ifdef API_5MS bool Opt_TSM; /* flag indicating TSM mode*/ int16_t tsm_scale; /* scale for TSM operation */ int16_t tsm_max_scaling; float *apaExecBuffer; /* Buffer for APA scaling */ Loading Loading @@ -166,7 +165,6 @@ ivas_error IVAS_DEC_Open( #ifdef API_5MS hIvasDec->apaExecBuffer = NULL; hIvasDec->hTimeScaler = NULL; hIvasDec->Opt_TSM = false; hIvasDec->tsm_scale = 100; hIvasDec->needNewFrame = false; hIvasDec->nTransportChannelsOld = 0; Loading Loading @@ -531,7 +529,6 @@ ivas_error IVAS_DEC_Configure( #ifdef API_5MS hDecoderConfig->tsm_active = tsmEnabled; hIvasDec->Opt_TSM = tsmEnabled; hIvasDec->nSamplesFrame = (uint16_t) ( hDecoderConfig->output_Fs / FRAMES_PER_SEC ); hIvasDec->nSamplesAvailableNext = 0; hIvasDec->nSamplesRendered = 0; Loading Loading @@ -578,7 +575,6 @@ ivas_error IVAS_DEC_EnableVoIP( hIvasDec->Opt_VOIP = 1; #ifdef API_5MS hIvasDec->Opt_TSM = 1; hDecoderConfig->tsm_active = 1; #else hDecoderConfig->voip_active = 1; Loading Loading @@ -895,7 +891,7 @@ ivas_error IVAS_DEC_GetSamples( return error; } if ( hIvasDec->Opt_TSM ) if ( hIvasDec->st_ivas->hDecoderConfig->tsm_active ) { if ( apa_set_scale( hIvasDec->hTimeScaler, hIvasDec->tsm_scale ) != 0 ) { Loading @@ -922,7 +918,7 @@ ivas_error IVAS_DEC_GetSamples( return error; } if ( hIvasDec->Opt_TSM ) if ( hIvasDec->st_ivas->hDecoderConfig->tsm_active ) { /* feed residual samples to TSM for the next call */ if ( apa_set_renderer_residual_samples( hIvasDec->hTimeScaler, (uint16_t) nResidualSamples ) != 0 ) Loading Loading @@ -2018,7 +2014,7 @@ ivas_error IVAS_DEC_VoIP_SetScale( error = IVAS_ERR_OK; #ifdef API_5MS if ( hIvasDec->Opt_TSM == false ) if ( hIvasDec->st_ivas->hDecoderConfig->tsm_active == false ) { return IVAS_ERR_TSM_NOT_ENABLED; } Loading Loading @@ -3560,7 +3556,7 @@ ivas_error IVAS_DEC_reconfigure( DECODER_CONFIG_HANDLE hDecoderConfig; #ifdef API_5MS if ( hIvasDec->Opt_TSM ) if ( hIvasDec->st_ivas->hDecoderConfig->tsm_active ) { uint16_t wss, css; float startQuality; Loading Loading @@ -3692,7 +3688,7 @@ ivas_error IVAS_DEC_reconfigure( else { #ifdef API_5MS if ( hIvasDec->Opt_TSM ) if ( hIvasDec->st_ivas->hDecoderConfig->tsm_active ) { if ( apa_reconfigure( hIvasDec->hTimeScaler, nTransportChannels, l_ts ) != 0 ) #else Loading