- Merge remote-tracking branch 'remotes/origin/ivas-float-update' into... (def6779d) · Commits · SA4 / Audio / IVAS BASOP

apps/encoder.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -211,6 +211,8 @@ int main(
		#ifdef DEBUG_SBA
		int16_t numTransportChannels = 1;
		#endif
		int32_t noClipping;
		float maxOverload, minOverload;
		#endif

		#ifdef DEBUGGING
		@@ -820,6 +822,12 @@ int main(
		}

		#ifdef DEBUGGING
		if ( ( noClipping = IVAS_ENC_GetNoCLipping( hIvasEnc, &maxOverload, &minOverload ) ) > 0 )
		{
		fprintf( stdout, "Core input overload detected: %d samples!!!\n", noClipping );
		fprintf( stdout, "Max overload value: %f \n", maxOverload );
		fprintf( stdout, "Min overload value: %f \n\n", minOverload );
		}
		print_snr();
		#endif
		/------------------------------------------------------------------------------------------

+0 −1

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

		#define FIX_1129_EXT_REND_OUTPUT_HIGH /* Philips: issue 1129: External renderer BINAURAL_ROOM_REVERB format output level too high compared to internal rendering output */
		#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 FIX_1113_CLDFB_REND_IN_ISAR /* issue 1113: fix the use of CLDFB renderer in split-rendering at the external renderer */
		#define FIX_989_TD_REND_ROM /* Eri: Clean-up for TD renderer and completion of ROM generation tool */
		#define FIX_CREND_SIMPLIFY_CODE
		#ifdef FIX_CREND_SIMPLIFY_CODE

+11 −0

Original line number	Diff line number	Diff line
		@@ -215,6 +215,17 @@ void mvr2r(
		const int16_t n /* i : vector size */
		);

		#ifdef DEBUGGING
		/! r: number of overload samples /
		uint32_t check_clipping(
		const float x[], /* i : input vector */
		const int16_t n, /* i : vector size */
		float maxOverload, / i/o: max overload value */
		float minOverload / i/o: max overload value */
		);

		#endif
		/! r: number of clipped samples /
		void mvs2s(
		const int16_t x[], /* i : input vector */
		int16_t y[], /* o : output vector */

+40 −0

Original line number	Diff line number	Diff line
		@@ -373,6 +373,46 @@ void mvs2s(
		return;
		}

		#ifdef DEBUGGING
		/! r: number of overload samples /
		uint32_t check_clipping(
		const float x[], /* i : input vector */
		const int16_t n, /* i : vector size */
		float maxOverload, / i/o: max overload value */
		float minOverload / i/o: max overload value */
		)
		{
		int16_t i;
		float temp;
		uint32_t noClipping = 0;

		for ( i = 0; i < n; i++ )
		{
		temp = x[i];

		if ( temp >= ( MAX16B_FLT + 0.5f ) )
		{
		noClipping++;
		if ( temp > *maxOverload )
		{
		*maxOverload = temp;
		}
		}
		else if ( temp <= ( MIN16B_FLT - 0.5f ) )
		{
		noClipping++;
		if ( temp < *minOverload )
		{
		*minOverload = temp;
		}
		}
		}

		return noClipping;
		}

		#endif
		/! r: number of clipped samples /
		uint32_t mvr2s(
		const float x[], /* i : input vector */
		int16_t y[], /* o : output vector */

+0 −4

Original line number	Diff line number	Diff line
		@@ -1204,14 +1204,10 @@ ivas_error ivas_rend_openCldfbRend(
		return error;
		}

		#ifdef FIX_1113_CLDFB_REND_IN_ISAR
		#ifdef FIX_CREND_SIMPLIFY_CODE
		pCldfbRend->binaural_latency_ns = (int32_t) ( pCldfbRend->hHrtfFastConv->FASTCONV_latency_s * 1000000000.f );
		#else
		pCldfbRend->binaural_latency_ns = (int32_t) ( pCldfbRend->hHrtfFastConv->FASTCONV_HOA3_latency_s * 1000000000.f );
		#endif
		#else
		pCldfbRend->binaural_latency_ns = (int32_t) ( FASTCONV_HOA3_latency_s * 1000000000.f );
		#endif
		hBinRenderer->hReverb = NULL;
		hBinRenderer->hEFAPdata = NULL;