Commit 93a991e0 authored Jun 20, 2024 by vaclav

fix merge issues

parent 0aab7276

lib_dec/lib_dec.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -562,7 +562,7 @@ static int16_t get_render_frame_size_ms(
		return (int16_t) ( render_framesize * ( 1000 / ( FRAMES_PER_SEC * IVAS_MAX_PARAM_SPATIAL_SUBFRAMES ) ) );
		}

		#ifdef SPLIT_REND_WITH_HEAD_ROT

		/---------------------------------------------------------------------
		* IVAS_DEC_SetRenderFramesize( )
		*
		@@ -592,7 +592,7 @@ ivas_error IVAS_DEC_SetRenderFramesize(

		return IVAS_ERR_OK;
		}
		#endif


		/---------------------------------------------------------------------
		* IVAS_DEC_GetGetRenderFramesize( )

lib_dec/lib_dec.h

+0 −2

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

		#ifdef SPLIT_REND_WITH_HEAD_ROT
		ivas_error IVAS_DEC_SetRenderFramesize(
		IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
		const IVAS_RENDER_FRAMESIZE render_framesize/* i : render framesize */
		);

		#endif
		ivas_error IVAS_DEC_GetRenderFramesize(
		IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
		IVAS_RENDER_FRAMESIZE render_framesize / o : render framesize */