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

Merge branch 'update-basop-ci-branch' into 'basop-ci-branch' 

Update basop ci branch

See merge request !2110
parents c4d75740 327aa4d3

.gitlab-ci.yml

+155 −383

File changed.

Preview size limit exceeded, changes collapsed.

.gitlab-ci/variables.yml

0 → 100644
+30 −0
Original line number Diff line number Diff line 
variables:

  EVS_BE_TEST_DIR: "/usr/local/be_2_evs_test"

  EVS_BE_WIN_TEST_DIR: "C:/Users/gitlab-runner/testvec"

  PROCESSING_SCRIPTS_BIN_DIR: "/test-bin"

  SANITIZER_TESTS: "CLANG1 CLANG2 CLANG3"

  OUT_FORMATS_CHANNEL_BASED: "stereo mono 5_1 5_1_2 5_1_4 7_1 7_1_4"

  OUT_FORMATS_SCENE_BASED: "FOA HOA2 HOA3"

  OUT_FORMATS_BINAURAL: "BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB"

  OUT_FORMATS_ALL: "$OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT"

  MANUAL_PIPELINE_TYPE:

    description: "Type for the manual pipeline run. Use 'test-be-release' to run BE test against release codec."

    value: 'default'

    options:

      - 'default'

      - 'test-be-release'

      - 'test-long-self-test'

      - 'ivas-conformance'

      - 'ivas-conformance-linux'

      - 'check-clipping'

      - 'test-branch-vs-input-passthrough'



  PYTEST_ARGS: ""

  LONG_TEST_SUITE: "tests/codec_be_on_mr_nonselection tests/renderer --param_file scripts/config/self_test_ltv.prm --use_ltv"

  LONG_TEST_SUITE_NO_RENDERER: "tests/codec_be_on_mr_nonselection --param_file scripts/config/self_test_ltv.prm --use_ltv"

  SHORT_TEST_SUITE: "tests/codec_be_on_mr_nonselection"

  SHORT_TEST_SUITE_ENCODER: "tests/codec_be_on_mr_nonselection/test_param_file.py --param_file scripts/config/self_test_basop_encoder.prm"

  LONG_TEST_SUITE_ENCODER: "tests/codec_be_on_mr_nonselection/test_param_file.py --param_file scripts/config/self_test_ltv_basop_encoder.prm"

  TEST_SUITE: ""

  # note: currently overwrites default value from ci repo

  TESTCASE_TIMEOUT_STV_SANITIZERS: 240

lib_com/ivas_cnst.h

+4 −0
Original line number Diff line number Diff line
@@ -175,7 +175,11 @@ typedef enum 
#define MAX_JBM_L_FRAME48k                      1920

#define MAX_JBM_L_FRAME_NS                      40000000L

#define MAX_SPAR_INTERNAL_CHANNELS              IVAS_SPAR_MAX_CH

#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS

#define MAX_CLDFB_DIGEST_CHANNELS               3                           /* == maximum of ParamISM TCs and ParamMC TCs */

#else

#define MAX_CLDFB_DIGEST_CHANNELS               (FOA_CHANNELS + MAX_NUM_OBJECTS)

#endif



typedef enum

{

lib_com/ivas_prot.h

+7 −5
Original line number Diff line number Diff line
@@ -868,12 +868,13 @@ void ivas_jbm_dec_get_md_map( 
int16_t ivas_jbm_dec_get_num_tc_channels( 

    Decoder_Struct *st_ivas                                     /* i  : IVAS decoder handle                                         */

);



#ifndef UNIFIED_DECODING_PATHS_LEFTOVERS

void ivas_jbm_dec_copy_tc_no_tsm( 

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                                         */

    float *tc[],                                                /* i  : transport channels                                          */

    const int16_t output_frame                                  /* i  : output frame size                                           */

);

#endif



void ivas_jbm_dec_get_md_map_even_spacing(

    const int16_t len,                                          /* i  : length of the modfied frames in metadata slots              */
@@ -1116,7 +1117,7 @@ void ivas_ism_dec_digest_tc( 
void ivas_param_ism_dec_digest_tc(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                         */

    const uint16_t nCldfbSlots,                                 /* i  : number of CLDFB slots in transport channels */

    float *transport_channels_f[]                               /* i  : synthesized core-coder transport channels/DirAC output  */

    float *p_data_f[]                                           /* i  : synthesized core-coder transport channels/DirAC output  */

);



void ivas_param_ism_dec_dequant_md(
@@ -1128,13 +1129,14 @@ void ivas_param_ism_dec_prepare_renderer( 
    const uint16_t nCldfbSlots                                  /* i  : number of CLDFB slots in transport channels */

);



#ifndef UNIFIED_DECODING_PATHS_LEFTOVERS

void ivas_ism_param_dec_tc_gain_ajust(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                         */

    const uint16_t nSamples,                                    /* i  : number of samples to be compensate          */

    const uint16_t nFadeLength,                                 /* i  : length of the crossfade in samples          */

    float *transport_channels_f[]                               /* i  : synthesized core-coder transport channels/DirAC output  */

    float *p_data_f[]                                           /* i  : synthesized core-coder transport channels/DirAC output  */

);



#endif

void ivas_param_ism_dec_render(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                         */

    const uint16_t nSamplesAsked,                               /* i  : number of CLDFB slots requested             */
@@ -3875,7 +3877,7 @@ void ivas_param_mc_dec_read_BS( 
void ivas_param_mc_dec_digest_tc(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                                 */

    const uint8_t nCldfbSlots,                                  /* i  : number of CLDFB slots in transport channels         */

    float *transport_channels_f[]                               /* i/o: synthesized core-coder transport channels/DirAC output*/

    float *p_data_f[]                                           /* i/o: synthesized core-coder transport channels/DirAC output*/

);



void ivas_param_mc_dec_prepare_renderer(

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ 


/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#define TMP_FIX_1119_SPLIT_RENDERING_VOIP               /* FhG: Add error check for unsupported config: split rendering with VoIP mode */

#define UNIFIED_DECODING_PATHS_LEFTOVERS                /* VA: issue 880: remove leftovers after NONBE_UNIFIED_DECODING_PATHS */





/* #################### End BE switches ################################## */
@@ -171,7 +172,7 @@ 


#define NONBE_1244_FIX_SWB_BWE_MEMORY                   /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */ 

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */



#define NONBE_1300_TDREND_LARGE_ITD                     /* Eri: issue 1300: There was a bug feeding 1.25 ms frames to the TD renderer, causing out-of-buffer access. This was resolved. However, it is still possible that modeled HRTF with large ITDs could trigger out-of-buffer access. This adds a check to prevent this.*/



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