Commit 15425acc authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

port float MR 1406

parent 30f20459

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -219,6 +219,7 @@ 


#define FIX_ACCESS_WITHIN_NULL_STRUCT_MC_BW_SWITCHING   /* FhG: fix usan error in MCT with bw swicthing */

#define NONBE_FIX_986_MC_BW_SWITCHING                   /* FhG: fix crash in bw and br switching with MC */

#define NONBE_FIX_1005_MC_RS_TCBUFFER_UPDATE            /* FhG: issue #1005: fix TC Buffer update at a MC rate switch */



/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_mct_dec.c

+23 −16
Original line number Diff line number Diff line
@@ -794,6 +794,10 @@ static ivas_error ivas_mc_dec_reconfig( 
    ivas_output_init( &( st_ivas->hIntSetup ), st_ivas->intern_config );



    /* transfer subframe info from DirAC or ParamMC to central tc buffer */

#ifdef NONBE_FIX_1005_MC_RS_TCBUFFER_UPDATE

	if (st_ivas->hTcBuffer->tc_buffer_mode != TC_BUFFER_MODE_BUFFER)

	{

#endif

		if ( last_mc_mode == MC_MODE_PARAMMC )

		{

			st_ivas->hTcBuffer->nb_subframes = st_ivas->hParamMC->nb_subframes;
@@ -810,6 +814,9 @@ static ivas_error ivas_mc_dec_reconfig( 
			st_ivas->hTcBuffer->slots_rendered = st_ivas->hSpatParamRendCom->slots_rendered;

			mvs2s( st_ivas->hSpatParamRendCom->subframe_nbslots, st_ivas->hTcBuffer->subframe_nbslots, MAX_JBM_SUBFRAMES_5MS );

		}

#ifdef NONBE_FIX_1005_MC_RS_TCBUFFER_UPDATE

	}

#endif



    /* JBM: when granularity goes down (e.g. MCT with CREND -> ParamMC with binaural fastconv

            render what still fits in the new granularity */