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

Merge branch '1609_basop_port_fl1339' into 'main-pc' 

Port MR 1339 into main-pc

See merge request !1625
parents 86c87c45 f67ed46a

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ 
#ifdef NONBE_FIX_947_STEREO_DMX_EVS_PHA

#define NONBE_FIX_947_STEREO_DMX_FADOPT                       /* Orange: Fading optimisation */  

#endif



#define NONBE_FIX_999_JBM_MCT_FLUSH                           /* FhG: issue #999: fix wrong flushing for MCT at a JBM rate switch */

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

lib_dec/ivas_jbm_dec_fx.c

+10 −0
Original line number Diff line number Diff line
@@ -2820,7 +2820,11 @@ ivas_error ivas_jbm_dec_flush_renderer_fx( 


                    ivas_binaural_add_LFE_fx( st_ivas, hTcBuffer->n_samples_granularity, st_ivas->hTcBuffer->tc_fx, p_output_fx );

                }

#ifdef NONBE_FIX_999_JBM_MCT_FLUSH

                ELSE IF( EQ_16( renderer_type_old, RENDERER_BINAURAL_OBJECTS_TD ) )

#else

                ELSE IF( EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_OBJECTS_TD ) )

#endif

                {

                    IF( NE_32( ( error = ivas_td_binaural_renderer_sf_fx( st_ivas, p_output_fx, hTcBuffer->n_samples_granularity ) ), IVAS_ERR_OK ) )

                    {
@@ -2828,6 +2832,12 @@ ivas_error ivas_jbm_dec_flush_renderer_fx( 
                    }

                    ivas_binaural_add_LFE_fx( st_ivas, *nSamplesRendered, st_ivas->hTcBuffer->tc_fx, p_output_fx );

                }

#ifdef NONBE_FIX_999_JBM_MCT_FLUSH

                ELSE

                {

                    return IVAS_ERROR( IVAS_ERR_WRONG_MODE, "Wrong renderer in MCT VoIP renderer flushing!" );

                }

#endif

            }

            ELSE

            {