Commit 58d51eff authored by kinuthia's avatar kinuthia
Browse files

Merge branch 'main' into... 

Merge branch 'main' into 550-binaural-td-object-renderer-first-frame-accesses-wrong-transport-channel-offsets
parents e409cabf 04819308

.gitlab-ci.yml

+6 −5
Original line number Diff line number Diff line
@@ -499,7 +499,7 @@ renderer-pytest-on-merge-request: 
      - 123

  artifacts:

    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"

    expire_in: 2 week

    expire_in: 1 week

    when: always

    paths:

      - report-junit.xml
@@ -550,7 +550,7 @@ ivas-pytest-on-merge-request: 
      - 123

  artifacts:

    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"

    expire_in: 2 week

    expire_in: 1 week

    when: always

    paths:

      - report-junit.xml
@@ -597,7 +597,7 @@ evs-pytest-on-merge-request: 
      - 123

  artifacts:

    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"

    expire_in: 2 week

    expire_in: 1 week

    when: always

    paths:

      - report-junit-evs.xml
@@ -656,7 +656,7 @@ clang-format-check: 


    - exit $format_problems

  artifacts:

    expire_in: 2 days

    expire_in: 1 day

    paths:

      - tmp-formatting-fix/

    when: on_failure
@@ -859,7 +859,7 @@ codec-comparison-on-main-push: 
      - 123

  artifacts:

    name: "main-push--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"

    expire_in: 2 week

    expire_in: 1 week

    when: always

    paths:

      - report-junit.xml
@@ -1322,6 +1322,7 @@ pages: 
  artifacts:

    paths:

      - public

    expire_in: 1 day



# Pull state of a branch on 3GPP repo, push to a mirror repo.

pull-from-3gpp-forge:

Workspace_msvc/lib_util.vcxproj

+0 −2
Original line number Diff line number Diff line
@@ -145,7 +145,6 @@ 
    <ClCompile Include="..\lib_util\cmdl_tools.c" />

    <ClCompile Include="..\lib_util\evs_rtp_payload.c" />

    <ClCompile Include="..\lib_util\g192.c" />

    <ClCompile Include="..\lib_util\head_rotation_file_reader.c" />

    <ClCompile Include="..\lib_util\vector3_pair_file_reader.c" />

    <ClCompile Include="..\lib_util\hrtf_file_reader.c" />

    <ClCompile Include="..\lib_util\ism_file_reader.c" />
@@ -171,7 +170,6 @@ 
    <ClInclude Include="..\lib_util\evs_rtp_payload.h" />

    <ClInclude Include="..\lib_util\g192.h" />

    <ClInclude Include="..\lib_util\vector3_pair_file_reader.h" />

    <ClInclude Include="..\lib_util\head_rotation_file_reader.h" />

    <ClInclude Include="..\lib_util\hrtf_file_reader.h" />

    <ClInclude Include="..\lib_util\ism_file_reader.h" />

    <ClInclude Include="..\lib_util\ism_file_writer.h" />

lib_com/options.h

+17 −2
Original line number Diff line number Diff line
@@ -134,9 +134,14 @@ 


/* #################### End DEBUGGING switches ############################ */



/* ################# Start DEVELOPMENT switches ######################## */



/* keep as part of options.h */

#define BASOP_NOGLOB                                    /* Disable global symbols in BASOPs, Overflow/Carry in BASOPs disabled, additional BASOPs in case of Overflow */





/* ################# Start BE DEVELOPMENT switches ######################## */

/* only BE switches wrt operation points tested in selection */



/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */
@@ -162,9 +167,19 @@ 
#define FIX_550_FIRST_FRAME_ACCESS_ALT

#define ISM_FB_16k4                                     /* VA: Issue: 579: change BW from SWB to FB in NxISM conditions to match the EVS codec */

#define FIX_580_PARAMMC_ENER_BURSTS                     /* FhG: issue 580: energy bursts due to ILD holding when energy relations change too much */

#define FIX_593_STL_INCLUDE                             /* FhG: Issue 593: correct include of stl.h in lib_enc/ivas_stereo_eclvq_enc.c */

#define FIX_583_CLANG_TRANS_DET                         /* FhG: Issue 583: clang left shift on ramp_up_flag in transient detector */



/* ################## End BE DEVELOPMENT switches ######################### */





/* #################### Start NON-BE CR switches ########################## */

/* any switch which is non-be wrt operation points tested in selection */

/* all switches in this category should start with "CR_" */





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



/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */



#endif

lib_dec/ivas_spar_md_dec.c

+1 −22
Original line number Diff line number Diff line
@@ -2873,9 +2873,6 @@ void ivas_spar_to_dirac( 
    float dvx[IVAS_MAX_NUM_BANDS], dvy[IVAS_MAX_NUM_BANDS], dvz[IVAS_MAX_NUM_BANDS];

    float radius;

    float en_ratio, res_pow;

#ifdef ENABLE_DITHER

    int16_t *seed_ptr;

#endif

    int16_t num_slots_in_subfr;

    int16_t tmp_write_idx_param_band;

    int16_t tmp_write_idx_band;
@@ -2898,9 +2895,6 @@ void ivas_spar_to_dirac( 
    if ( hDirAC != NULL && ivas_get_hodirac_flag( st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->sba_analysis_order ) == 0 )

    {

        band_grouping = hDirAC->band_grouping;

#ifdef ENABLE_DITHER

        seed_ptr = &hDirAC->dithering_seed;

#endif

        num_slots_in_subfr = st_ivas->hDirAC->hConfig->dec_param_estim ? CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES : 1;



        for ( band = start_band; band < end_band; band++ )
@@ -2975,17 +2969,10 @@ void ivas_spar_to_dirac( 


        for ( band = start_band; band < end_band; band++ )

        {

#ifdef ENABLE_DITHER

            int16_t diff_idx, azi_dith, ele_dith;

#else

            int16_t azi_dith, ele_dith;

#endif

            tmp_write_idx_param_band = hDirAC->spar_to_dirac_write_idx;



            en_ratio = 1.0f - diffuseness[band];

#ifdef ENABLE_DITHER

            diff_idx =

#endif

            masa_sq( 1.0f - en_ratio, diffuseness_thresholds, DIRAC_DIFFUSE_LEVELS );



            qmf_band_start = band_grouping[band];
@@ -3000,16 +2987,8 @@ void ivas_spar_to_dirac( 
                for ( b = qmf_band_start; b < qmf_band_end; b++ )

                {



#ifdef ENABLE_DITHER

                    azi_dith = (int16_t) ( azi[band] + rand_triangular_signed( seed_ptr ) * dirac_dithering_azi_scale[diff_idx] + 0.5f );

                    ele_dith = (int16_t) ( ele[band] + rand_triangular_signed( seed_ptr ) * dirac_dithering_ele_scale[diff_idx] + 0.5f );

                    /* limit the elevation to [-90, 90] */

                    ele_dith = min( 90, ele_dith );

                    ele_dith = max( -90, ele_dith );

#else

                    azi_dith = azi[band];

                    ele_dith = ele[band];

#endif



                    hDirAC->energy_ratio1[block][b] = en_ratio;

                    tmp_write_idx_band = tmp_write_idx_param_band;

lib_enc/ivas_stereo_eclvq_enc.c

+4 −0
Original line number Diff line number Diff line
@@ -41,7 +41,11 @@ 
#include "prot.h"

#include "wmc_auto.h"

/* used only for norm_s in the code_length_from_count function */

#ifdef FIX_593_STL_INCLUDE

#include "stl.h"

#else

#include "basop32.h"

#endif





/*---------------------------------------------------------------