fix crash, best solution ? (af956756) · Commits · SA4 / Audio / IVAS BASOP

lib_dec/ivas_jbm_dec_fx.c

+13 −2

Original line number	Diff line number	Diff line
		@@ -2159,7 +2159,7 @@ ivas_error ivas_jbm_dec_render_fx(
		#endif
		{
		scale_sig32( p_output_fx[i], nSamplesRendered, negate( sub( Q11, st_ivas->hCrendWrapper->p_io_qfactor ) ) ); // Q = *st_ivas->hCrendWrapper->p_io_qfactor
		IF( st_ivas->hDecoderConfig->Opt_tsm )
		IF( ( p_output_fx[0] != p_tc_fx[0] ) )
		{
		scale_sig32( p_tc_fx[i], nSamplesRendered, negate( sub( Q11, st_ivas->hCrendWrapper->p_io_qfactor ) ) ); // Q = *st_ivas->hCrendWrapper->p_io_qfactor
		}
		@@ -2195,7 +2195,11 @@ ivas_error ivas_jbm_dec_render_fx(
		}

		// Todo main-pc update: This might be needed also in the split rendering path
		#ifdef FIX_1330_JBM_MEMORY
		IF( ( p_output_fx[0] != p_tc_fx[0] ) )
		#else
		IF( st_ivas->hDecoderConfig->Opt_tsm )
		#endif
		{
		IF( NE_16( exp, *st_ivas->hCrendWrapper->p_io_qfactor ) )
		{
		@@ -2211,7 +2215,11 @@ ivas_error ivas_jbm_dec_render_fx(

		IF( crendInPlaceRotation )
		{
		#ifdef FIX_2070_JBM_TC_CHANNEL_RESCALING_ISSUE
		n = st_ivas->nchan_transport;
		#else
		n = nchan_in;
		#endif
		}
		ELSE
		{
		@@ -2223,8 +2231,11 @@ ivas_error ivas_jbm_dec_render_fx(
		{
		scale_sig32( p_output_fx[i], nSamplesRendered, sub( Q11, st_ivas->hCrendWrapper->p_io_qfactor ) ); // Q11
		}

		#ifdef FIX_1330_JBM_MEMORY
		IF( ( p_output_fx[0] != p_tc_fx[0] ) && crendInPlaceRotation )
		#else
		IF( st_ivas->hDecoderConfig->Opt_tsm && crendInPlaceRotation )
		#endif
		{
		n = 0;
		move16();