Commit 86c87c45 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

Merge branch '1613_basop_port-mr-1406-from' into 'main-pc' 

Port float MR 1406 to BASOP

See merge request !1632
parents 67a7e20a b79064a6

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -131,9 +131,10 @@ 
#ifdef NONBE_FIX_947_STEREO_DMX_EVS_PHA

#define NONBE_FIX_947_STEREO_DMX_FADOPT                       /* Orange: Fading optimisation */  

#endif



#define FIX_1003_PARAMISM_BINAURAL_RECONFIG_USAN        /* FhG: fix for #1003: fix USAN caused by ParamISM reconfig                    */

#define FIX_1001_ARI_HM_OVERFLOW                        /* FhG: (no changes needed in BASOP) fix for undef behaviour in in the harmonic TCX model arithmetic coder */



#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

+31 −23
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 */