Commit 8483d61d authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

port float MR 1406

parent 2c2a6925

lib_com/options.h

+3 −1
Original line number Diff line number Diff line
@@ -128,6 +128,8 @@ 
#ifdef NONBE_FIX_947_STEREO_DMX_EVS_PHA

#define NONBE_FIX_947_STEREO_DMX_FADOPT                       /* Orange: Fading optimisation */  

#endif

#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_fx.c

+33 −25
Original line number Diff line number Diff line
@@ -1022,6 +1022,11 @@ static ivas_error ivas_mc_dec_reconfig_fx( 
    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

		test();

		IF( EQ_16( last_mc_mode, MC_MODE_PARAMMC ) )

		{
@@ -1047,6 +1052,9 @@ static ivas_error ivas_mc_dec_reconfig_fx( 
			move16();

			Copy( 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 */