Commit 7e368400 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into 480-fix-mdct-stereo-plc-fadeout-for-td-concealment

parents 69c6748c 25226a8f

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -215,6 +215,8 @@ 
#define FIX_STEREO_474                                  /* FhG fix for issue 574, crash with SBA to stereo output at 512 kbps */

#define FIX_MDCT_ST_PLC_FADEOUT_DELAY



#define FIX_DIRAC_LS_SYNTHESIS_CONFIG_479               /* FhG: fix for issue 479, broken LS output with DirAC at high BRs */



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

/* clang-format on */

lib_dec/ivas_dirac_dec.c

+5 −1
Original line number Diff line number Diff line
@@ -526,7 +526,11 @@ ivas_error ivas_dirac_dec_config( 
    }





    if ( nchan_transport_orig > 2 && hDirAC->hOutSetup.is_loudspeaker_setup && st_ivas->renderer_type == RENDERER_DIRAC )

    if ( nchan_transport_orig > 2 && hDirAC->hOutSetup.is_loudspeaker_setup && st_ivas->renderer_type == RENDERER_DIRAC

#ifdef FIX_DIRAC_LS_SYNTHESIS_CONFIG

         && !ivas_get_hodirac_flag( ivas_total_brate, st_ivas->sba_analysis_order )

#endif

    )

    {

        hDirAC->synthesisConf = DIRAC_SYNTHESIS_PSD_LS;

        hDirAC->panningConf = DIRAC_PANNING_VBAP;