simplify fix (b7e93ac4) · Commits · SA4 / Audio / IVAS BASOP

lib_dec/ivas_jbm_dec_fx.c

+20 −10

Original line number	Diff line number	Diff line
		@@ -2159,10 +2159,12 @@ 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( ( p_output_fx[0] != p_tc_fx[0] ) )
		#ifndef FIX_1330_JBM_MEMORY
		IF( st_ivas->hDecoderConfig->Opt_tsm )
		{
		scale_sig32( p_tc_fx[i], nSamplesRendered, negate( sub( Q11, st_ivas->hCrendWrapper->p_io_qfactor ) ) ); // Q = *st_ivas->hCrendWrapper->p_io_qfactor
		}
		#endif
		}
		}
		ELSE
		@@ -2179,28 +2181,37 @@ ivas_error ivas_jbm_dec_render_fx(

		IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) \|\| EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )
		{
		#ifdef FIX_1330_JBM_MEMORY
		IF( ( error = ivas_rend_crendProcessSubframesSplitBin( st_ivas->hCrendWrapper, st_ivas->intern_config, st_ivas->hOutSetup.output_config, ( st_ivas->hSplitBinRend == NULL ) ? NULL : &st_ivas->hSplitBinRend->splitrend.multiBinPoseData, st_ivas->hDecoderConfig, st_ivas->hCombinedOrientationData,
		&st_ivas->hIntSetup, st_ivas->hEFAPdata, st_ivas->hTcBuffer, p_output_fx, p_output_fx, *nSamplesRendered, output_Fs ) ) != IVAS_ERR_OK )
		#else
		IF( ( error = ivas_rend_crendProcessSubframesSplitBin( st_ivas->hCrendWrapper, st_ivas->intern_config, st_ivas->hOutSetup.output_config, ( st_ivas->hSplitBinRend == NULL ) ? NULL : &st_ivas->hSplitBinRend->splitrend.multiBinPoseData, st_ivas->hDecoderConfig, st_ivas->hCombinedOrientationData,
		&st_ivas->hIntSetup, st_ivas->hEFAPdata, st_ivas->hTcBuffer, crendInPlaceRotation ? p_output_fx : p_tc_fx, p_output_fx, *nSamplesRendered, output_Fs ) ) != IVAS_ERR_OK )
		#endif
		{
		return error;
		}
		}
		ELSE
		{
		#ifdef FIX_1330_JBM_MEMORY
		IF( NE_32( ( error = ivas_rend_crendProcessSubframe_fx( st_ivas->hCrendWrapper, st_ivas->intern_config, st_ivas->hOutSetup.output_config, st_ivas->hDecoderConfig, st_ivas->hCombinedOrientationData,
		&st_ivas->hIntSetup, st_ivas->hEFAPdata, st_ivas->hTcBuffer, p_output_fx, p_output_fx, *nSamplesRendered, output_Fs, 0 ) ),
		IVAS_ERR_OK ) )
		#else
		IF( NE_32( ( error = ivas_rend_crendProcessSubframe_fx( st_ivas->hCrendWrapper, st_ivas->intern_config, st_ivas->hOutSetup.output_config, st_ivas->hDecoderConfig, st_ivas->hCombinedOrientationData,
		&st_ivas->hIntSetup, st_ivas->hEFAPdata, st_ivas->hTcBuffer, crendInPlaceRotation ? p_output_fx : p_tc_fx, p_output_fx, *nSamplesRendered, output_Fs, 0 ) ),
		IVAS_ERR_OK ) )
		#endif
		{
		return error;
		}

		// 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
		#ifndef FIX_1330_JBM_MEMORY
		IF( st_ivas->hDecoderConfig->Opt_tsm )
		#endif
		{
		#endif
		IF( NE_16( exp, *st_ivas->hCrendWrapper->p_io_qfactor ) )
		{
		FOR( i = 0; i < nchan_in; i++ )
		@@ -2208,8 +2219,9 @@ ivas_error ivas_jbm_dec_render_fx(
		scale_sig32( p_tc_fx[i], nSamplesRendered, sub( st_ivas->hCrendWrapper->p_io_qfactor, exp ) );
		}
		}
		#ifndef FIX_1330_JBM_MEMORY
		}

		#endif
		ivas_binaural_add_LFE_fx( st_ivas, *nSamplesRendered, p_tc_fx, p_output_fx );
		}

		@@ -2231,15 +2243,13 @@ 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
		#ifndef FIX_1330_JBM_MEMORY
		IF( st_ivas->hDecoderConfig->Opt_tsm && crendInPlaceRotation )
		#endif
		{
		n = 0;
		move16();
		}
		#endif

		#ifdef FIX_2070_JBM_TC_CHANNEL_RESCALING_ISSUE
		FOR( i = n; i < st_ivas->nchan_transport; i++ )