Commit 9ea4cb60 authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_1005_MC_RS_TCBUFFER_UPDATE

parent 1252e78b

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -164,7 +164,6 @@ 
/* any switch which is non-be wrt selection floating point code */

/* all switches in this category should start with "NONBE_" */



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

#define NONBE_FIX_864_JBM_RENDER_FRAMESIZE                    /* FhG: issue #864: fix different behaviour of JBM TSM with different render frame sizes */

#define NONBE_FIX_1012_1013_JBM_FLUSH_BUFFER                  /* FhG: issues #1012, 1013: JBM flush function uses wrong output buffer */

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

lib_dec/ivas_mct_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -774,10 +774,8 @@ 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;
@@ -794,9 +792,7 @@ 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 */