Commit 8b9beb24 authored by bayers's avatar bayers
Browse files

Merge remote-tracking branch 'remotes/origin/main' into... 

Merge remote-tracking branch 'remotes/origin/main' into 982-omasa-not-be-between-5ms-and-20ms-rendering
parents 445ad6c7 1e778f66

.gitlab-ci.yml

+5 −1
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ stages: 
  - *mr-fetch-target-branch

  - *mr-get-target-commit

  - git checkout $target_commit

  - echo "Building reference codec at commit $target_commit"



  ### build reference binaries

  - *disable-debugging-macro
@@ -409,7 +410,7 @@ codec-smoke-test: 
  extends:

    - .test-job-linux-needs-testv-dir

    - .rules-merge-request

  timeout: "17 minutes"

  timeout: "20 minutes"

  tags:

    - ivas-linux-fast

  stage: test
@@ -718,6 +719,7 @@ split-rendering-pytest-on-merge-request: 
    - *mr-fetch-target-branch

    - *mr-get-target-commit

    - git checkout $target_commit

    - echo "Building reference codec at commit $target_commit"



    # build reference binaries

    - *enable-split-rendering
@@ -1126,6 +1128,7 @@ codec-comparison-on-main-push: 
    ### compare to the previous merge commit in the main branch

    - git fetch origin main

    - git checkout $previous_merge_commit

    - echo "Building reference codec at commit $previous_merge_commit"



    ### build reference binaries

    - cd build
@@ -1237,6 +1240,7 @@ test-long-self-test: 


    ### switch to main

    - git checkout main

    - echo "Building reference codec at commit $(git rev-parse HEAD)"



    ### build main (ref) binaries

    - cmake . -Bbuild-ref

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/ivas_prot.h

+3 −0
Original line number Diff line number Diff line
@@ -3683,6 +3683,9 @@ void generate_masking_noise_lb_dirac( 
    HANDLE_FD_CNG_COM hFdCngCom,                                /* i/o: FD_CNG structure containing all buffers and variables */

    float *tdBuffer,                                            /* i/o: time-domain signal, if NULL no LB-CNA                 */

    const int16_t nCldfbTs,                                     /* i  : number of CLDFB slots that will be rendered           */

#ifdef NONBE_FIX_951_MCMASA_5MS_RENDERING

    SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom,       /* i  : common spatial rendering parameters handle            */

#endif

    const int16_t cna_flag                                      /* i  : CNA flag for LB and HB                                */

);

lib_com/options.h

+9 −0
Original line number Diff line number Diff line
@@ -158,6 +158,8 @@ 
#define FIX_955_FASTCONV_REND_IN_ISM                    /* VA: put FastConv rendering call under DEBUGGING */

#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 FIX_963_USAN_ERROR                              /* Eri: Issue 963: USAN error in Stereo CNG, division by zero */

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



/* #################### End BE switches ################################## */
@@ -174,6 +176,13 @@ 
#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 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_979_OSBA_STEREO_5MS                           /* FhG : issue #979 : 5ms and 20ms output different for OSBA and stereo */

#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 */   

#define NONBE_FIX_947_STEREO_DMX_EVS_POC                      /* Orange: Fix clicks on POC */  

#define NONBE_FIX_947_STEREO_DMX_EVS_PHA                      /* Orange: Fix issues on PHA */                                                                                        

#define NONBE_FIX_982_OMASA_DELAY_COMP_5MS                    /* FhG : issue #982 : 5ms and 20ms output different for OMASA */

/* ##################### End NON-BE switches ########################### */

lib_com/prot.h

+7 −0
Original line number Diff line number Diff line
@@ -132,6 +132,13 @@ float inv_sqrt( 
    const float x /* i  : input value                                     */

);



#ifdef NONBE_FIX_567_DOUBLE_STEREO_DMX

/*! r: inverse square root of input value (float) */

float inv_sqrtf(

    const float x /* i  : input value                                     */

);

#endif



/*! r: output random value */

int16_t own_random(

    int16_t *seed /* i/o: random seed                                     */