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

Merge branch '1567_basop_empty_dirac_param_bands_at_high_br' into 'main-pc' 

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

See merge request !1555
parents ed6d9e34 2c35ef34

lib_com/ivas_dirac_com_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -578,10 +578,14 @@ ivas_error ivas_dirac_sba_config_fx( 
    {

        hQMetaData->useLowerBandRes = 0;

        move16();

#ifndef NONBE_FIX_973_HODIRAC_BAND_GROUPING

        IF( hodirac_flag == 0 )

        {

            nbands_coded = sub( nbands, 1 ); /* always combine the last two bands */

        }

#else

        nbands_coded = sub( nbands, 1 ); /* always combine the last two bands */

#endif

    }



    {

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ 
#define NONBE_FIX_968_ISM_BRIR_WITH_HEADROTATION_5MS_FIX      /* FhG : issue #968: differences between 5ms and 20ms rendering for discrete ISM with BRIR and head rotation*/

#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 NONBE_FIX_973_HODIRAC_BAND_GROUPING                   /* FhG: issue 973: empty parameter band in DirAC */



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