Commit cc113f02 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept NONBE_FIX_1005_MC_RS_TCBUFFER_UPDATE

parent 8b75e559

lib_com/options.h

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


//#define FIX_777_COMBI_RENDER_CONFIG_FILE                /* Philips: Fix for combined renderer config file support */



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

#define NONBE_FIX_1004_USAN_DTX_MASA_NO_DIRS            /* Nokia: fix USAN error caused by non-setting of correctly the number of MASA directions in DTX */

/* #define NONBE_FIX_991_PARAMBIN_BINARY_HRTF   */           /* Nokia: issue #991: fix using of binary file HRTF in ParamBin (to activate when USE_NEW_HRTF_BINARY_FILE_FORMAT and FIX_777_COMBI_RENDER_CONFIG_FILE are on ) */

#define FIX_1009_ISM_NONDIEGETIC_PANNING                /* FhG: issue #1009: use correct object buffer for ISM1 non-diegetic pan      */

lib_dec/ivas_mct_dec_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -1023,10 +1023,8 @@ static ivas_error ivas_mc_dec_reconfig_fx( 


    /* 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 ) )

        {
@@ -1052,9 +1050,7 @@ 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 */