Commit ff961bfb authored by vaillancour's avatar vaillancour
Browse files

merge main

parents 81193b3f b3792048

.gitlab-ci.yml

+18 −18
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ variables: 
  SCRIPTS_DIR: "/usr/local/scripts"

  EXIT_CODE_NON_BE: 123

  EXIT_CODE_FAIL: 1

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

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

  SHORT_TEST_SUITE: "tests/codec_be_on_mr_nonselection"

  TEST_SUITE: ""

  DUT_ENCODER_PATH: "./IVAS_cod"
@@ -214,7 +214,7 @@ stages: 
    - if [ ! -d "$TESTV_DIR" ]; then mkdir -p $TESTV_DIR; fi

    - cp -r scripts/testv/* $TESTV_DIR/



.ivas-pytest-mld-anchor: &ivas-pytest-mld-anchor

.ivas-pytest-anchor: &ivas-pytest-anchor

  stage: test

  needs: ["build-codec-linux-make"]

  timeout: "240 minutes"
@@ -240,7 +240,7 @@ stages: 


    ### run pytest

    - exit_code=0

    - python3 -m pytest $TEST_SUITE -v --create_cut --html=report.html --self-contained-html --junit-xml=report-junit.xml --mld --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH -n auto --testcase_timeout $testcase_timeout || exit_code=$?

    - python3 -m pytest $TEST_SUITE -v --create_cut --html=report.html --self-contained-html --junit-xml=report-junit.xml --mld --ssnr --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH -n auto --testcase_timeout $testcase_timeout || exit_code=$?

    - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true



    - python3 scripts/parse_mld_xml.py report-junit.xml $MLD_ARTIFACT_NAME
@@ -418,7 +418,7 @@ build-codec-linux-instrumented-make: 
#    - USE_LTV=0

#    - TEST_SUITE="$SHORT_TEST_SUITE"

#    - LEVEL_SCALING=1.0

#  <<: *ivas-pytest-mld-anchor  

#  <<: *ivas-pytest-anchor

  

ivas-pytest-mld-dec:

  extends:
@@ -429,7 +429,7 @@ ivas-pytest-mld-dec: 
    - DUT_ENCODER_PATH=./IVAS_cod_ref

    - TEST_SUITE="$SHORT_TEST_SUITE"

    - LEVEL_SCALING=1.0

  <<: *ivas-pytest-mld-anchor

  <<: *ivas-pytest-anchor

  

#ivas-pytest-mld-enc-dec-lev-10:

#  extends:
@@ -439,7 +439,7 @@ ivas-pytest-mld-dec: 
#    - USE_LTV=0  

#    - TEST_SUITE="$SHORT_TEST_SUITE"

#    - LEVEL_SCALING=0.3162

#  <<: *ivas-pytest-mld-anchor  

#  <<: *ivas-pytest-anchor

  

ivas-pytest-mld-dec-lev-10:

  extends:
@@ -450,7 +450,7 @@ ivas-pytest-mld-dec-lev-10: 
    - DUT_ENCODER_PATH=./IVAS_cod_ref

    - TEST_SUITE="$SHORT_TEST_SUITE"

    - LEVEL_SCALING=0.3162

  <<: *ivas-pytest-mld-anchor

  <<: *ivas-pytest-anchor



#ivas-pytest-mld-enc-dec-lev+10:

#  extends:
@@ -460,7 +460,7 @@ ivas-pytest-mld-dec-lev-10: 
#    - USE_LTV=0  

#    - TEST_SUITE="$SHORT_TEST_SUITE"

#    - LEVEL_SCALING=3.162

#  <<: *ivas-pytest-mld-anchor  

#  <<: *ivas-pytest-anchor

  

ivas-pytest-mld-dec-lev+10:

  extends:
@@ -471,7 +471,7 @@ ivas-pytest-mld-dec-lev+10: 
    - DUT_ENCODER_PATH=./IVAS_cod_ref

    - TEST_SUITE="$SHORT_TEST_SUITE"

    - LEVEL_SCALING=3.162

  <<: *ivas-pytest-mld-anchor

  <<: *ivas-pytest-anchor



ivas-pytest-mld-long-enc-fx-dec-flt-interop:

  extends:
@@ -482,7 +482,7 @@ ivas-pytest-mld-long-enc-fx-dec-flt-interop: 
    - DUT_DECODER_PATH=./IVAS_dec_ref

    - TEST_SUITE="$SHORT_TEST_SUITE"

    - LEVEL_SCALING=1.0

  <<: *ivas-pytest-mld-anchor

  <<: *ivas-pytest-anchor



ivas-pytest-mld-long-enc-fx-dec-flt-lev-10-interop:

  extends:
@@ -493,7 +493,7 @@ ivas-pytest-mld-long-enc-fx-dec-flt-lev-10-interop: 
    - DUT_DECODER_PATH=./IVAS_dec_ref

    - TEST_SUITE="$SHORT_TEST_SUITE"

    - LEVEL_SCALING=0.3162

  <<: *ivas-pytest-mld-anchor

  <<: *ivas-pytest-anchor



ivas-pytest-mld-long-enc-fx-dec-flt-lev+10-interop:

  extends:
@@ -504,7 +504,7 @@ ivas-pytest-mld-long-enc-fx-dec-flt-lev+10-interop: 
    - DUT_DECODER_PATH=./IVAS_dec_ref

    - TEST_SUITE="$SHORT_TEST_SUITE"

    - LEVEL_SCALING=3.162

  <<: *ivas-pytest-mld-anchor

  <<: *ivas-pytest-anchor



ivas-pytest-dec-msan:

  extends:
@@ -539,7 +539,7 @@ ivas-pytest-mld-long-enc-dec: 
    - USE_LTV=1  

    - TEST_SUITE="$LONG_TEST_SUITE"

    - LEVEL_SCALING=1.0

  <<: *ivas-pytest-mld-anchor  

  <<: *ivas-pytest-anchor

  

ivas-pytest-mld-long-dec:

  extends:
@@ -550,7 +550,7 @@ ivas-pytest-mld-long-dec: 
    - DUT_ENCODER_PATH=./IVAS_cod_ref

    - TEST_SUITE="$LONG_TEST_SUITE"

    - LEVEL_SCALING=1.0

  <<: *ivas-pytest-mld-anchor

  <<: *ivas-pytest-anchor

  

ivas-pytest-mld-long-enc-dec-lev-10:

  extends:
@@ -560,7 +560,7 @@ ivas-pytest-mld-long-enc-dec-lev-10: 
    - USE_LTV=1  

    - TEST_SUITE="$LONG_TEST_SUITE"

    - LEVEL_SCALING=0.3162

  <<: *ivas-pytest-mld-anchor  

  <<: *ivas-pytest-anchor

  

ivas-pytest-mld-long-dec-lev-10:

  extends:
@@ -571,7 +571,7 @@ ivas-pytest-mld-long-dec-lev-10: 
    - DUT_ENCODER_PATH=./IVAS_cod_ref

    - TEST_SUITE="$LONG_TEST_SUITE"

    - LEVEL_SCALING=0.3162

  <<: *ivas-pytest-mld-anchor

  <<: *ivas-pytest-anchor



ivas-pytest-mld-long-enc-dec-lev+10:

  extends:
@@ -581,7 +581,7 @@ ivas-pytest-mld-long-enc-dec-lev+10: 
    - USE_LTV=1  

    - TEST_SUITE="$LONG_TEST_SUITE"

    - LEVEL_SCALING=3.162

  <<: *ivas-pytest-mld-anchor  

  <<: *ivas-pytest-anchor

  

ivas-pytest-mld-long-dec-lev+10:

  extends:
@@ -592,7 +592,7 @@ ivas-pytest-mld-long-dec-lev+10: 
    - DUT_ENCODER_PATH=./IVAS_cod_ref

    - TEST_SUITE="$LONG_TEST_SUITE"

    - LEVEL_SCALING=3.162

  <<: *ivas-pytest-mld-anchor

  <<: *ivas-pytest-anchor



ivas-smoke-test-saturation:

  extends:

apps/decoder.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
 * Local constants

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



#if !defined( WMOPS_FLT )

#if !defined( DEBUGGING ) && !defined( WMOPS_FLT )

static

#endif

    int32_t frame = 0; /* Counter of frames */

apps/encoder.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 
 * Local constants, enums

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



#if !defined( WMOPS )

#if !defined( DEBUGGING ) && !defined( WMOPS )

static

#endif

    int32_t frame = 0; /* Counter of frames */

apps/renderer.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ 
#define IVAS_MIN16B_FLT ( -32768.0f )

#define IVAS_MAX16B_FX  32767

#define IVAS_MIN16B_FX  ( -32768 )

#if !defined( WMOPS )

#if !defined( DEBUGGING ) && !defined( WMOPS )

static

#endif

    int32_t frame = 0;

lib_com/bits_alloc_fx.c

+1 −0
Original line number Diff line number Diff line
@@ -615,6 +615,7 @@ ivas_error config_acelp1( 
    Word32 core_brate_inpI = core_brate_inp;

#ifdef REMOVE_IVAS_UNUSED_PARAMETERS_WARNING

    (void) active_cnt;

    (void) core_brate_inpI;

#endif

#endif

    ivas_error error;