ongoing (f59a685f) · Commits · SA4 / Audio / IVAS BASOP

lib_dec/core_dec_init_fx.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -1281,7 +1281,7 @@ void open_decoder_LPD_ivas_fx(
		move16();
		st->output_frame_fx = st->hTcxDec->L_frameTCX;
		move16();
		if ( st->ini_frame == 0 )
		if ( ( st->ini_frame == 0 ) )
		{
		st->L_frameTCX_past = st->hTcxDec->L_frameTCX;
		move16();
		@@ -1354,7 +1354,7 @@ void open_decoder_LPD_ivas_fx(
		}
		}

		if ( st->ini_frame == 0 )
		if ( ( st->ini_frame == 0 ) )
		{
		st->pit_res_max_past = st->pit_res_max;
		move16();
		@@ -1471,7 +1471,7 @@ void open_decoder_LPD_ivas_fx(
		}

		/* Static vectors to zero */
		IF( st->ini_frame == 0 )
		IF( ( st->ini_frame == 0 ) )
		{
		st->last_is_cng = 0;
		move16();
		@@ -1729,7 +1729,7 @@ void open_decoder_LPD_ivas_fx(
		}

		/* Formant postfilter */
		IF( st->ini_frame == 0 )
		IF( ( st->ini_frame == 0 ) )
		{
		/* do nothing */
		}
		@@ -1807,7 +1807,7 @@ void open_decoder_LPD_ivas_fx(
		}

		/* lsf and lsp initialization */
		IF( st->ini_frame == 0 )
		IF( ( st->ini_frame == 0 ) )
		{
		Copy( st->lsp_old_fx, st->lspold_uw, M );
		Copy( st->lsf_old_fx, st->lsfold_uw, M );

lib_dec/ivas_binRenderer_internal.c

deleted100644 → 0

+0 −3267

File deleted.

Preview size limit exceeded, changes collapsed.

lib_dec/ivas_init_dec.c

+8 −8

Original line number	Diff line number	Diff line
		@@ -1553,22 +1553,22 @@ ivas_error ivas_init_decoder_front(

		IF( st_ivas->hDecoderConfig->Opt_HRTF_binary )
		{
		IF( NE_32( ( error = ivas_HRTF_binary_open( &( st_ivas->hHrtfTD ) ) ), IVAS_ERR_OK ) )
		IF( NE_32( ( error = ivas_HRTF_binary_open_fx( &( st_ivas->hHrtfTD ) ) ), IVAS_ERR_OK ) )
		{
		return error;
		}

		IF( NE_32( ( error = ivas_HRTF_CRend_binary_open( &( st_ivas->hSetOfHRTF ) ) ), IVAS_ERR_OK ) )
		IF( NE_32( ( error = ivas_HRTF_CRend_binary_open_fx( &( st_ivas->hSetOfHRTF ) ) ), IVAS_ERR_OK ) )
		{
		return error;
		}

		IF( NE_32( ( error = ivas_HRTF_fastconv_binary_open( &st_ivas->hHrtfFastConv ) ), IVAS_ERR_OK ) )
		IF( NE_32( ( error = ivas_HRTF_fastconv_binary_open_fx( &st_ivas->hHrtfFastConv ) ), IVAS_ERR_OK ) )
		{
		return error;
		}

		IF( NE_32( ( error = ivas_HRTF_parambin_binary_open( &st_ivas->hHrtfParambin ) ), IVAS_ERR_OK ) )
		IF( NE_32( ( error = ivas_HRTF_parambin_binary_open_fx( &st_ivas->hHrtfParambin ) ), IVAS_ERR_OK ) )
		{
		return error;
		}
		@@ -4937,20 +4937,20 @@ void ivas_destroy_dec_fx(
		#endif
		{
		BSplineModelEvalDealloc_fx( &st_ivas->hHrtfTD->ModelParams, &st_ivas->hHrtfTD->ModelEval );
		ivas_HRTF_binary_close( &st_ivas->hHrtfTD );
		ivas_HRTF_binary_close_fx( &st_ivas->hHrtfTD );
		}

		/* CRend binaural renderer handle */
		ivas_HRTF_CRend_binary_close( &st_ivas->hSetOfHRTF );
		ivas_HRTF_CRend_binary_close_fx( &st_ivas->hSetOfHRTF );

		/* Fastconv HRTF memories */
		ivas_binaural_hrtf_close( &st_ivas->hHrtfFastConv );

		/* Fastconv HRTF filters */
		ivas_HRTF_fastconv_binary_close( &st_ivas->hHrtfFastConv );
		ivas_HRTF_fastconv_binary_close_fx( &st_ivas->hHrtfFastConv );

		/* Parametric binauralizer HRTF filters */
		ivas_HRTF_parambin_binary_close( &st_ivas->hHrtfParambin );
		ivas_HRTF_parambin_binary_close_fx( &st_ivas->hHrtfParambin );

		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		/* HRTF statistics */

lib_dec/ivas_jbm_dec.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1202,7 +1202,7 @@ ivas_error ivas_jbm_dec_tc_fx(
		{
		IF( ( st_ivas->hTransSetup.nchan_out_woLFE + st_ivas->hTransSetup.num_lfe ) >= ( st_ivas->hIntSetup.nchan_out_woLFE + st_ivas->hIntSetup.num_lfe ) )
		{
		ivas_mc2sba_fx( st_ivas->hTransSetup, p_output_fx, p_output_fx, output_frame, st_ivas->hIntSetup.ambisonics_order, GAIN_LFE );
		ivas_mc2sba_fx( st_ivas->hTransSetup, p_output_fx, p_output_fx, output_frame, st_ivas->hIntSetup.ambisonics_order, GAIN_LFE_FX );
		}
		}

		@@ -3157,7 +3157,7 @@ ivas_error ivas_jbm_dec_render_fx(
		crendInPlaceRotation = TRUE;
		move16();

		ivas_mc2sba_fx( st_ivas->hTransSetup, p_tc_fx, p_output_fx, *nSamplesRendered, st_ivas->hIntSetup.ambisonics_order, GAIN_LFE );
		ivas_mc2sba_fx( st_ivas->hTransSetup, p_tc_fx, p_output_fx, *nSamplesRendered, st_ivas->hIntSetup.ambisonics_order, GAIN_LFE_FX );
		}
		}

lib_dec/ivas_mc_param_dec.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -3901,7 +3901,7 @@ void ivas_param_mc_dec_render_fx(
		Scale_sig32( Cldfb_ImagBuffer_fx[i][j], CLDFB_NO_CHANNELS_MAX, sub( Q_Cldfb_RealBuffer, Q6 ) );
		}
		}
		ivas_param_mc_mc2sba_cldfb_fx( st_ivas->hTransSetup, hParamMC->hoa_encoder_fx, slot_idx, Cldfb_RealBuffer_fx, Cldfb_ImagBuffer_fx, nband_synth, GAIN_LFE );
		ivas_param_mc_mc2sba_cldfb_fx( st_ivas->hTransSetup, hParamMC->hoa_encoder_fx, slot_idx, Cldfb_RealBuffer_fx, Cldfb_ImagBuffer_fx, nband_synth, GAIN_LFE_FX );
		FOR( i = 0; i < MAX_OUTPUT_CHANNELS; i++ )
		{
		FOR( j = 0; j < MAX_PARAM_SPATIAL_SUBFRAMES; j++ )
		@@ -3924,7 +3924,7 @@ void ivas_param_mc_dec_render_fx(
		{
		Word16 tmp_exp = 0;
		move16();
		Word16 tmp = BASOP_Util_Divide1616_Scale( GAIN_LFE, hLsSetup.nchan_out_woLFE, &tmp_exp );
		Word16 tmp = BASOP_Util_Divide1616_Scale( GAIN_LFE_FX, hLsSetup.nchan_out_woLFE, &tmp_exp );
		tmp_exp = add( tmp_exp, ( 1 - 15 ) );
		FOR( idx_lfe = 0; idx_lfe < hLsSetup.num_lfe; idx_lfe++ )
		{