issue 1293: fix G.192 decoder crash when first frame is lost; under... (4bc35e93) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/options.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -175,8 +175,9 @@
		#define NONBE_1244_FIX_SWB_BWE_MEMORY /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */
		#define NONBE_FIX_1180_HQMDCT_PHECU_LT_MUTING /* Ericsson: issue 1180, corrected long term mute loop attnuation after 200ms in PhECU-PLC */
		#define NONBE_FIX_1277_EVS_DTX_HIGH_RATE_THRESHOLD /* VA/Eri: issue 1277: Fix Mismatch in DTX high-rate threshold between EVS float and BASOP */

		#define NONBE_1231_BASOP_819_THRESHOLD_MASA2TOTAL /* Nokia: add fix for precision limitation in comparison with masa2total energy ratio threshold to be aligned with BASOP*/
		#define NONBE_1293_CRASH_FIRST_FRAME_LOST /* VA: issue 1293: fix G.192 decoder crash when first frame is lost */

		/* ##################### End NON-BE switches ########################### */

		/* ################## End DEVELOPMENT switches ######################### */

lib_dec/lib_dec.c

+34 −1

Original line number	Diff line number	Diff line
		@@ -1081,6 +1081,13 @@ ivas_error IVAS_DEC_GetSamplesDecoder(
		return IVAS_ERR_UNEXPECTED_NULL_POINTER;
		}

		#ifdef NONBE_1293_CRASH_FIRST_FRAME_LOST
		if ( !hIvasDec->hasBeenFedFirstGoodFrame )
		{
		return IVAS_ERR_OK;
		}
		#endif

		/* If TSM is generally enabled, we have to wait for the first good frame.
		Otherwise, we directly decode the first frame in any case. */
		if ( !hIvasDec->isInitialized \|\| hIvasDec->hasBeenFedFrame )
		@@ -1221,6 +1228,13 @@ ivas_error IVAS_DEC_GetEditableParameters(
		return IVAS_ERR_UNEXPECTED_NULL_POINTER;
		}

		#ifdef NONBE_1293_CRASH_FIRST_FRAME_LOST
		if ( !hIvasDec->hasBeenFedFirstGoodFrame )
		{
		return IVAS_ERR_OK;
		}
		#endif

		st_ivas = hIvasDec->st_ivas;
		ism_mode = st_ivas->ism_mode;

		@@ -1360,6 +1374,13 @@ ivas_error IVAS_DEC_SetEditableParameters(
		return IVAS_ERR_UNEXPECTED_NULL_POINTER;
		}

		#ifdef NONBE_1293_CRASH_FIRST_FRAME_LOST
		if ( !hIvasDec->hasBeenFedFirstGoodFrame )
		{
		return IVAS_ERR_OK;
		}
		#endif

		st_ivas = hIvasDec->st_ivas;
		ism_mode = st_ivas->ism_mode;

		@@ -1593,7 +1614,12 @@ ivas_error IVAS_DEC_PrepareRenderer(
		return IVAS_ERR_UNEXPECTED_NULL_POINTER;
		}

		#ifdef NONBE_1293_CRASH_FIRST_FRAME_LOST
		if ( hIvasDec->hasBeenFedFirstGoodFrame )
		#endif
		{
		ivas_dec_prepare_renderer( hIvasDec->st_ivas );
		}

		hIvasDec->hasBeenPreparedRendering = true;

		@@ -1777,6 +1803,13 @@ ivas_error IVAS_DEC_GetSplitBinauralBitstream(
		return IVAS_ERR_UNEXPECTED_NULL_POINTER;
		}

		#ifdef NONBE_1293_CRASH_FIRST_FRAME_LOST
		if ( !hIvasDec->hasBeenFedFirstGoodFrame )
		{
		return IVAS_ERR_OK;
		}
		#endif

		error = IVAS_ERR_OK;
		st_ivas = hIvasDec->st_ivas;
		output_config = st_ivas->hDecoderConfig->output_config;