remove duplicated API function for getting number of rendering subframes;... (d1e5fd1c) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/decoder.c

+24 −1

Original line number	Diff line number	Diff line
		@@ -639,11 +639,13 @@ int main(
		fprintf( stderr, "Failed to get directivity patterns for one or more of IDs: %d %d %d %d\n\n", arg.directivityPatternId[0], arg.directivityPatternId[1], arg.directivityPatternId[2], arg.directivityPatternId[3] );
		goto cleanup;
		}

		if ( ( error = RenderConfigReader_getDistanceAttenuation( renderConfigReader, renderConfig.distAtt ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Failed to get Distance Attenuation \n\n" );
		goto cleanup;
		}

		if ( arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
		{
		if ( asked_num_subframes != IVAS_RENDER_NUM_SUBFR_20MS &&
		@@ -657,7 +659,7 @@ int main(
		arg.render_num_subframes = IVAS_RENDER_NUM_SUBFR_20MS;
		}

		if ( ( error = IVAS_DEC_SetRenderFramesize( hIvasDec, arg.render_num_subframes ) ) != IVAS_ERR_OK )
		if ( ( error = IVAS_DEC_SetRenderNumSubfr( hIvasDec, arg.render_num_subframes ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		@@ -2201,6 +2203,15 @@ static ivas_error decodeG192(
		}
		}

		#ifdef FIX_945_REMOVE_DUPLICATED_API_FUNC
		IVAS_RENDER_NUM_SUBFR num_subframes;
		if ( ( error = IVAS_DEC_GetRenderNumSubfr( hIvasDec, &num_subframes ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_GetRenderNumSubfr failed: %s\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}

		#else
		int16_t num_subframes;
		if ( ( error = IVAS_DEC_GetNumOrientationSubframes( hIvasDec, &num_subframes ) ) != IVAS_ERR_OK )
		{
		@@ -2208,6 +2219,7 @@ static ivas_error decodeG192(
		goto cleanup;
		}
		/* Head-tracking input simulation */
		#endif
		/* Head-tracking input simulation */
		if ( arg.enableHeadRotation )
		{
		@@ -3128,6 +3140,16 @@ static ivas_error decodeVoIP(
		goto cleanup;
		}
		}

		#ifdef FIX_945_REMOVE_DUPLICATED_API_FUNC
		IVAS_RENDER_NUM_SUBFR num_subframes;
		if ( ( error = IVAS_DEC_GetRenderNumSubfr( hIvasDec, &num_subframes ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_GetRenderNumSubfr failed: %s\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}

		#else
		int16_t num_subframes;
		if ( ( error = IVAS_DEC_GetNumOrientationSubframes( hIvasDec, &num_subframes ) ) != IVAS_ERR_OK )
		{
		@@ -3136,6 +3158,7 @@ static ivas_error decodeVoIP(
		}

		/* Head-tracking input simulation */
		#endif
		/* Head-tracking input simulation */
		if ( arg.enableHeadRotation )
		{

lib_com/options.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -163,7 +163,7 @@
		/#define FIX_I4_OL_PITCH/ /* fix open-loop pitch used for EVS core switching */
		#define TMP_FIX_1119_SPLIT_RENDERING_VOIP /* FhG: Add error check for unsupported config: split rendering with VoIP mode */
		#define FIX_1209_SID_SIGNALING /* VA: issue 1209: remove dead code in IVAS SID signaling */

		#define FIX_945_REMOVE_DUPLICATED_API_FUNC /* VA: issue 945: remove duplicated API function for getting number of rendering subframes */

		/* #################### End BE switches ################################## */

lib_dec/lib_dec.c

+17 −12

Original line number	Diff line number	Diff line
		@@ -581,9 +581,10 @@ ivas_error IVAS_DEC_EnableSplitRendering(
		/---------------------------------------------------------------------
		* get_render_framesize_ms( )
		*
		* Get the 5ms flag
		* Get render framesize in ms
		---------------------------------------------------------------------/

		/! r: render framesize in ms /
		static int16_t get_render_frame_size_ms(
		const IVAS_RENDER_NUM_SUBFR render_num_subframes )
		{
		@@ -592,12 +593,12 @@ static int16_t get_render_frame_size_ms(


		/---------------------------------------------------------------------
		* IVAS_DEC_SetRenderFramesize( )
		* IVAS_DEC_SetRenderNumSubfr( )
		*
		* Get the 5ms flag
		* Set number of rendering subframes
		---------------------------------------------------------------------/

		ivas_error IVAS_DEC_SetRenderFramesize(
		ivas_error IVAS_DEC_SetRenderNumSubfr(
		IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
		const IVAS_RENDER_NUM_SUBFR render_num_subframes /* i : renderer number of subframes */
		)
		@@ -644,8 +645,9 @@ ivas_error IVAS_DEC_GetRenderNumSubfr(
		return IVAS_ERR_OK;
		}


		/---------------------------------------------------------------------
		* IVAS_DEC_GetGetRenderFramesizeSamples( )
		* IVAS_DEC_GetRenderFramesizeSamples( )
		*
		* Get render framesize in samples
		---------------------------------------------------------------------/
		@@ -665,29 +667,31 @@ ivas_error IVAS_DEC_GetRenderFramesizeSamples(
		return IVAS_ERR_OK;
		}


		/---------------------------------------------------------------------
		* IVAS_DEC_GetGetRenderFramesizeMs( )
		* IVAS_DEC_GetRenderFramesizeMs( )
		*
		* Get render framesize in milliseconds
		---------------------------------------------------------------------/

		ivas_error IVAS_DEC_GetRenderFramesizeMs(
		IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
		uint32_t render_framesize / o : render framesize in samples */
		uint32_t systemTime / o : render framesize in ms */
		)
		{
		if ( hIvasDec == NULL \|\| hIvasDec->st_ivas == NULL \|\| render_framesize == NULL )
		if ( hIvasDec == NULL \|\| hIvasDec->st_ivas == NULL \|\| systemTime == NULL )
		{
		return IVAS_ERR_UNEXPECTED_NULL_POINTER;
		}

		*render_framesize = get_render_frame_size_ms( hIvasDec->st_ivas->hDecoderConfig->render_num_subframes );
		*systemTime = get_render_frame_size_ms( hIvasDec->st_ivas->hDecoderConfig->render_num_subframes );

		return IVAS_ERR_OK;
		}


		/---------------------------------------------------------------------
		* IVAS_DEC_GetGetReferencesUpdateFrequency( )
		* IVAS_DEC_GetReferencesUpdateFrequency( )
		*
		* Get update frequency of the reference vector/orientation
		---------------------------------------------------------------------/
		@@ -707,6 +711,7 @@ ivas_error IVAS_DEC_GetReferencesUpdateFrequency(
		return IVAS_ERR_OK;
		}

		#ifndef FIX_945_REMOVE_DUPLICATED_API_FUNC
		/---------------------------------------------------------------------
		* IVAS_DEC_GetGetNumOrientationSubframes( )
		*
		@@ -727,7 +732,7 @@ ivas_error IVAS_DEC_GetNumOrientationSubframes(

		return IVAS_ERR_OK;
		}

		#endif

		/---------------------------------------------------------------------
		* IVAS_DEC_EnableVoIP( )

lib_dec/lib_dec.h

+13 −11

Original line number	Diff line number	Diff line
		@@ -342,7 +342,7 @@ ivas_error IVAS_DEC_EnableSplitRendering(
		IVAS_DEC_HANDLE hIvasDec /* i/o: IVAS decoder handle */
		);

		ivas_error IVAS_DEC_SetRenderFramesize(
		ivas_error IVAS_DEC_SetRenderNumSubfr(
		IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
		const IVAS_RENDER_NUM_SUBFR render_num_subframes /* i : rendering number of subframes */
		);
		@@ -362,14 +362,16 @@ ivas_error IVAS_DEC_GetReferencesUpdateFrequency(
		int16_t update_frequency / o : update frequency */
		);

		#ifndef FIX_945_REMOVE_DUPLICATED_API_FUNC
		ivas_error IVAS_DEC_GetNumOrientationSubframes(
		IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
		int16_t num_subframes / o : render framesize */
		);

		#endif
		ivas_error IVAS_DEC_GetRenderFramesizeMs(
		IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
		uint32_t render_framesize / o : render framesize in samples */
		uint32_t systemTime / o : render framesize in ms */
		);

		#ifdef DEBUGGING