Commit 5f4755a3 authored by bayers's avatar bayers
Browse files

Merge branch '841-mc-rs-hrft-handle-not-set-to-null' into 'main' 

[Non-BE] Resolve "MC RS HRFT handle not set to NULL"

See merge request !1131
parents ebc7f53c 63ed0dd1

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ 
#define NONBE_FIX_825_SBA_JBM_MONO_STEREO_OUTPUT              /* FhG: issue #825: Resolve "JBM SBA: AGC and PCA run twice for MONO and STEREO output"   */

#define NONBE_FIX_808_JBM_PARAMUPMIX_RS                       /* FhG: Issue 808: fix JBM MC rate switching */

#define NONBE_FIX_846_JBM_MASA_SIDSTART                       /* FhG: Issue #846: fix JBM for MASA DTX when the first frame is a SID frame */



#define NONBE_FIX_841_MC_RS_TDOBJ_RENDERER                    /* FhG: Issue #841: [Non-BE] Resolve "MC RS HRFT handle not set to NULL" */

/* ##################### End NON-BE switches ########################### */



/* ################## End DEVELOPMENT switches ######################### */

lib_dec/ivas_mct_dec.c

+3 −0
Original line number Diff line number Diff line
@@ -1218,6 +1218,9 @@ static ivas_error ivas_mc_dec_reconfig( 
            if ( st_ivas->hBinRendererTd != NULL && ( st_ivas->renderer_type != RENDERER_BINAURAL_OBJECTS_TD ) )

            {

                ivas_td_binaural_close( &st_ivas->hBinRendererTd );

#ifdef NONBE_FIX_841_MC_RS_TDOBJ_RENDERER

                st_ivas->hHrtfTD = NULL;

#endif

            }



#ifdef SPLIT_REND_WITH_HEAD_ROT_PARAMBIN