[cleanup] accept FIX_899_VARIABLE_SPEED_DECODING (e0d59928) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/decoder.c

+0 −53

Original line number	Diff line number	Diff line
		@@ -2123,35 +2123,6 @@ static ivas_error decodeG192(
		/* we always start with needing a new frame */
		needNewFrame = true;

		#ifndef FIX_899_VARIABLE_SPEED_DECODING
		#ifdef DEBUGGING
		#ifdef VARIABLE_SPEED_DECODING
		/------------------------------------------------------------------------------------------
		* Open TSM scale file or set global TSM scale
		------------------------------------------------------------------------------------------/

		if ( arg.tsmEnabled )
		{
		if ( arg.tsmScaleFileEnabled )
		{
		if ( ( tsmScaleFileReader = TsmScaleFileReader_open( arg.tsmScaleFileName ) ) == NULL )
		{
		fprintf( stderr, "\nError: Can't open TSM scale file %s \n\n", arg.tsmScaleFileName );
		goto cleanup;
		}
		}
		else
		{
		if ( ( error = IVAS_DEC_VoIP_SetScale( hIvasDec, arg.tsmScale, arg.tsmScale ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_VoIP_SetScale failed: %s \n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}
		}
		}
		#endif
		#endif
		#endif

		if ( !arg.quietModeEnabled )
		{
		@@ -2196,7 +2167,6 @@ static ivas_error decodeG192(
		}
		#endif

		#ifdef FIX_899_VARIABLE_SPEED_DECODING
		#ifdef DEBUGGING
		#ifdef VARIABLE_SPEED_DECODING
		/------------------------------------------------------------------------------------------
		@@ -2232,7 +2202,6 @@ static ivas_error decodeG192(
		}
		}
		#endif
		#endif
		#endif

		/------------------------------------------------------------------------------------------
		@@ -2387,14 +2356,10 @@ static ivas_error decodeG192(
		fprintf( stderr, "\nError: input bitstream file couldn't be read: %s \n\n", arg.inputBitstreamFilename );
		goto cleanup;
		}
		#ifdef FIX_899_VARIABLE_SPEED_DECODING
		int16_t maxScaling;
		/* max scaling as abs diff to the normal frame size in samples */
		maxScaling = (int16_t) ceilf( (float) abs( arg.tsmScale - 100 ) / 100.0f * (float) ( nOutSamples * vec_pos_len ) );
		if ( ( error = IVAS_DEC_VoIP_SetScale( hIvasDec, maxScaling, arg.tsmScale ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_DEC_VoIP_SetScale( hIvasDec, scale, scale ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "\nIVAS_DEC_VoIP_SetScale failed: %s \n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		@@ -2466,7 +2431,6 @@ static ivas_error decodeG192(
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		}
		#endif
		#ifdef FIX_899_VARIABLE_SPEED_DECODING
		if ( needNewFrame )
		{
		frame++;
		@@ -2481,7 +2445,6 @@ static ivas_error decodeG192(
		#endif
		}
		}
		#endif

		} while ( nSamplesRendered < nOutSamples && error == IVAS_ERR_OK );

		@@ -2605,22 +2568,6 @@ static ivas_error decodeG192(
		}
		}
		vec_pos_update = ( vec_pos_update + 1 ) % vec_pos_len;
		#ifndef FIX_899_VARIABLE_SPEED_DECODING
		if ( needNewFrame )
		{
		frame++;
		if ( !arg.quietModeEnabled )
		{
		fprintf( stdout, "%-8d\b\b\b\b\b\b\b\b", frame );
		#ifdef DEBUGGING
		if ( IVAS_DEC_GetBerDetectFlag( hIvasDec ) )
		{
		fprintf( stdout, "\n Decoding error: BER detected in frame %d !!!!!\n", frame - 1 );
		}
		#endif
		}
		}
		#endif
		#ifdef WMOPS
		if ( vec_pos_update == 0 )
		{

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -152,7 +152,6 @@

		#define FIX_902_HACK_IN_CORECODER /* VA: issue 902: remove a hack in ivas_core_dec() */
		#define FIX_881_REMOVE_LFE_ADDITION_IN_ISM /* VA: issue 881: remove LFE addition in ISM format */
		#define FIX_899_VARIABLE_SPEED_DECODING /* FhG: Fix variable speed decoding */
		#define FIX_887_ARRAY_SIZE_DFT_MDCT_STEREO /* VA: Fix the definition of buffers/arrays in DFT and MDCT stereo to satisfy gcc v 11.4.0 */
		#define FIX_891_PARAMUPMIX_CLEANUP /* Dlb: issue 891: remove unneeded code from ParamUpmix */

lib_dec/lib_dec.c

+0 −14

Original line number	Diff line number	Diff line
		@@ -78,9 +78,7 @@ struct IVAS_DEC
		bool Opt_VOIP; /* flag indicating VOIP mode with JBM */
		int16_t tsm_scale; /* scale for TSM operation */
		int16_t tsm_max_scaling;
		#ifdef FIX_899_VARIABLE_SPEED_DECODING
		float tsm_quality;
		#endif
		float apaExecBuffer; / Buffer for APA scaling */
		PCMDSP_APA_HANDLE hTimeScaler;
		bool needNewFrame;
		@@ -166,10 +164,8 @@ ivas_error IVAS_DEC_Open(
		hIvasDec->apaExecBuffer = NULL;
		hIvasDec->hTimeScaler = NULL;
		hIvasDec->tsm_scale = 100;
		#ifdef FIX_899_VARIABLE_SPEED_DECODING
		hIvasDec->tsm_max_scaling = 0;
		hIvasDec->tsm_quality = 1.0f;
		#endif
		hIvasDec->needNewFrame = false;
		hIvasDec->nTransportChannelsOld = 0;
		hIvasDec->nSamplesAvailableNext = 0;
		@@ -495,12 +491,8 @@ ivas_error IVAS_DEC_Configure(
		hIvasDec->nSamplesAvailableNext = 0;
		hIvasDec->nSamplesRendered = 0;
		hIvasDec->tsm_scale = 100;
		#ifdef FIX_899_VARIABLE_SPEED_DECODING
		hIvasDec->tsm_max_scaling = 0;
		hIvasDec->tsm_quality = 1.0f;
		#else
		hIvasDec->tsm_max_scaling = 100;
		#endif

		return error;
		}
		@@ -2561,7 +2553,6 @@ ivas_error IVAS_DEC_VoIP_SetScale(
		return error;
		}

		#ifdef FIX_899_VARIABLE_SPEED_DECODING
		/---------------------------------------------------------------------
		* IVAS_DEC_VoIP_SetScale( )
		*
		@@ -2589,7 +2580,6 @@ ivas_error IVAS_DEC_TSM_SetQuality(
		return error;
		}

		#endif


		/---------------------------------------------------------------------
		@@ -3676,11 +3666,7 @@ static ivas_error IVAS_DEC_VoIP_reconfigure(
		uint16_t wss, css;
		float startQuality;

		#ifdef FIX_899_VARIABLE_SPEED_DECODING
		startQuality = hIvasDec->tsm_quality;
		#else
		startQuality = 1.0f;
		#endif
		apa_buffer_size = APA_BUF_PER_CHANNEL;

		/* get current renderer type*/

lib_dec/lib_dec.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -266,12 +266,10 @@ ivas_error IVAS_DEC_VoIP_SetScale(
		const int16_t scale /* i : TSM scale to set */
		);

		#ifdef FIX_899_VARIABLE_SPEED_DECODING
		ivas_error IVAS_DEC_TSM_SetQuality(
		IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
		const float quality /* i : target TSM quality */
		);
		#endif

		/! r: error code /
		ivas_error IVAS_DEC_VoIP_GetSamples(