Commit 34050644 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch '1567_ref_empty_dirac_param_bands_at_high_br' into 'float-pc' 

[non-BE][non-io][split-non-be] port MR 1335 from float

See merge request !1554
parents 1984ff0e 5f6c6bb6

lib_com/ivas_dirac_com.c

+4 −0
Original line number Diff line number Diff line
@@ -447,10 +447,14 @@ ivas_error ivas_dirac_sba_config( 
    else

    {

        hQMetaData->useLowerBandRes = 0;

#ifndef NONBE_FIX_973_HODIRAC_BAND_GROUPING

        if ( hodirac_flag == 0 )

        {

            nbands_coded = nbands - 1; /* always combine the last two bands */

        }

#else

        nbands_coded = nbands - 1; /* always combine the last two bands */

#endif

    }



    {

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -190,9 +190,9 @@ 
#define NONBE_FIX_935_SBA_REVERB                              /* FhG: issue 935: fix MSAN error for SBA related to BINAURAL_ROOM_REVERB */

#define FIX_969_USAN_IGF_ARITH                          /* FhG: issue 969: fix USAN error in igf_sce_dec; same issue as #962 */

#define FIX_959_MASA_LINEAR_REND                        /* VA: issue 959: remove unused calling of ivas_sba_linear_renderer() in MASA rendering */

#define NONBE_FIX_973_HODIRAC_BAND_GROUPING                   /* FhG: issue 973: empty parameter band in DirAC */

#define FIX_971_LOG2_IDX_GAIN_0                         /* VA: prevent -Inf due to log2(ratio==0)  */





/* #################### End BASOP porting switches ############################ */



/* clang-format on */