Commit 98c78fb4 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main-pc' into 1571_basop_fix_diffs_between_framesizes

parents 8f4620f8 c563142c

.gitlab-ci.yml

+6 −0
Original line number Diff line number Diff line
@@ -1468,6 +1468,7 @@ check-be-to-target-short-enc-0db: 
    - .rules-mr-to-main-or-main-pc

    - .test-job-linux

  before_script:

    - *set-reference-for-basop-port-branch

    - USE_LTV=0

    - DUT_DECODER_PATH=./IVAS_dec_ref

    - MERGE_TARGET_DECODER_PATH=./IVAS_dec_ref
@@ -1481,6 +1482,7 @@ check-be-to-target-short-enc-+10db: 
    - .rules-mr-to-main-or-main-pc

    - .test-job-linux

  before_script:

    - *set-reference-for-basop-port-branch

    - USE_LTV=0

    - DUT_DECODER_PATH=./IVAS_dec_ref

    - MERGE_TARGET_DECODER_PATH=./IVAS_dec_ref
@@ -1494,6 +1496,7 @@ check-be-to-target-short-enc--10db: 
    - .rules-mr-to-main-or-main-pc

    - .test-job-linux

  before_script:

    - *set-reference-for-basop-port-branch

    - USE_LTV=0

    - DUT_DECODER_PATH=./IVAS_dec_ref

    - MERGE_TARGET_DECODER_PATH=./IVAS_dec_ref
@@ -1507,6 +1510,7 @@ check-be-to-target-short-dec-0db: 
    - .rules-mr-to-main-or-main-pc

    - .test-job-linux

  before_script:

    - *set-reference-for-basop-port-branch

    - USE_LTV=0

    - DUT_ENCODER_PATH=./IVAS_cod_ref

    - MERGE_TARGET_ENCODER_PATH=./IVAS_cod_ref
@@ -1520,6 +1524,7 @@ check-be-to-target-short-dec-+10db: 
    - .rules-mr-to-main-or-main-pc

    - .test-job-linux

  before_script:

    - *set-reference-for-basop-port-branch

    - USE_LTV=0

    - DUT_ENCODER_PATH=./IVAS_cod_ref

    - MERGE_TARGET_ENCODER_PATH=./IVAS_cod_ref
@@ -1533,6 +1538,7 @@ check-be-to-target-short-dec--10db: 
    - .rules-mr-to-main-or-main-pc

    - .test-job-linux

  before_script:

    - *set-reference-for-basop-port-branch

    - USE_LTV=0

    - DUT_ENCODER_PATH=./IVAS_cod_ref

    - MERGE_TARGET_ENCODER_PATH=./IVAS_cod_ref

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
@@ -104,6 +104,7 @@ 
#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_951_MCMASA_5MS_RENDERING                    /* Nokia: issue #951: Differences for 5ms and 20ms rendering for McMASA at 13.2 kbps to BINAURAL */

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



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