Commit 7960d452 authored by norvell's avatar norvell
Browse files

Merge branch 'main' into 'basop-ci-branch' 

[BASOP CI] Merge MASA EXT handling with MLD into basop-ci-branch

See merge request !1368
parents 7b4fb9e4 2f7b6933

lib_com/ivas_dirac_com.c

+2 −0
Original line number Diff line number Diff line
@@ -445,7 +445,9 @@ ivas_error ivas_dirac_sba_config( 
    else

    {

        hQMetaData->useLowerBandRes = 0;

#ifndef NONBE_FIX_973_HODIRAC_BAND_GROUPING

        if ( hodirac_flag == 0 )

#endif

        {

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

        }

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ 
#define NONBE_FIX_967_ISM_MONO_DMX                            /* FhG: issue 967: accumulating energies in ISM mono DMX */

#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_977_OSBA_GAIN_MISMATCH                      /* Dlb : issue 977 : Output gain mismatch for different bit rates in OSBA */

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



#define BE_FIX_567_DOUBLE_STEREO_DMX                          /* NTT: Fix formal issues */   

#define NONBE_FIX_567_DOUBLE_STEREO_DMX                       /* Orange: Double-precision replaced by single-precision */

tests/codec_be_on_mr_nonselection/test_masa_enc_dec.py

+12 −8
Original line number Diff line number Diff line
@@ -211,6 +211,10 @@ def test_masa_enc_dec( 
                    mld = float(reason.split(':')[1].split()[0])

                record_property("MLD",mld)



            if get_mld and get_mld_lim > 0:

                if pcmcmp_res != 0:

                    pytest.fail(reason)                

            else:

                # Fail if compare fails compare result

                if metacmp_res == False and pcmcmp_res != 0:

                    pytest.fail("Metadata and transport output difference detected")