Commit d0d3642f authored by norvell's avatar norvell
Browse files

Merge branch 'add-combined-formats-extrend-tests' into ci/test-ext-rend-test-extension

parents 5d3077a5 24b73488

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line 
variables:

  # note: GitLab cannot reference variables defined by users in the include ref:, we need to use a YAML anchor for this

  # see https://docs.gitlab.com/ci/yaml/includes/#use-variables-with-include for more information

  IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF 44cb5638949b874ce0f5c3bf4359f9db860d88bc

  IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF a31272de16bd1b556269a50bc179321a60f2a500



include:

  - local: .gitlab-ci/variables.yml
@@ -488,7 +488,7 @@ pytest-compare-20ms-and-5ms-rendering: 
  needs: ["build-codec-linux-cmake", "build-codec-linux-make", "build-codec-instrumented-linux", "build-codec-sanitizers-linux"]

  script:

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/float/disable-limiter.sh

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/disable-limiter.sh

    - make clean

    - make -j

    ### prepare pytest

apps/renderer.c

+12 −1
Original line number Diff line number Diff line
@@ -1083,7 +1083,18 @@ int main( 
            fprintf( stderr, "\nFailed to read renderer configuration from file %s\n", args.renderConfigFilePath );

            goto cleanup;

        }



#ifdef NONBE_FIX_1337_MISSING_DIRECTIVITY_DISTATT_EXTREND

        if ( ( error = RenderConfigReader_getDirectivity( renderConfigReader, args.directivityPatternId, renderConfig.directivity ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "Failed to get directivity patterns for one or more of IDs: %d %d %d %d\n\n", args.directivityPatternId[0], args.directivityPatternId[1], args.directivityPatternId[2], args.directivityPatternId[3] );

            goto cleanup;

        }

        if ( ( error = RenderConfigReader_getDistanceAttenuation( renderConfigReader, renderConfig.distAtt ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "Failed to get Distance Attenuation \n\n" );

            goto cleanup;

        }

#endif

        if ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

        {

            aeID = args.aeSequence.count > 0 ? args.aeSequence.pID[0] : 65535;

ci/smoke_test.sh

+23 −28
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ else 
  usage

fi





cfg=./scripts/config/ci_linux.json

dly_profile=./scripts/dly_error_profiles/dly_error_profile_10_smoke_test.dat

ism_md_cmd="--ism_metadata_files /usr/local/ltv/ltvISM1.csv /usr/local/ltv/ltvISM2.csv /usr/local/ltv/ltvISM3.csv /usr/local/ltv/ltvISM4.csv"
@@ -77,10 +76,6 @@ if [ $BUILD -eq 1 ];then 


fi



# prepare combined format test signals

echo -e "\n======================= 0. preparing combined format test inputs =======================\n\n"

./scripts/prepare_combined_format_inputs.py



# run all modes vanilla-fashion

# treat ISM modes separately because passing the metadata files to MASA modes causes crashes

readarray -t ism_modes < <(./scripts/runIvasCodec.py -l | grep ISM)

ci/smoke_test_complexity.sh

+32 −37
Original line number Diff line number Diff line
@@ -61,10 +61,6 @@ duration_arg="" 
complexity_cmd="--checks COMPLEXITY --create_complexity_tables"

max_num_workers="--max_workers $MAX_CORES"



# prepare combined format test signals

echo "\n======================= 0. preparing combined format test inputs =======================\n\n"

./scripts/prepare_combined_format_inputs.py



# Modes

mono_modes=$(./scripts/IvasBuildAndRunChecks.py -l | grep ^mono)

FOA_modes=$(./scripts/IvasBuildAndRunChecks.py -l | grep ^FOA)
@@ -91,7 +87,6 @@ ISM_plus2_modes=$(./scripts/IvasBuildAndRunChecks.py -l | grep ^ISM+2) 
ISM_plus3_modes=$(./scripts/IvasBuildAndRunChecks.py -l | grep ^ISM+3)

ISM_plus4_modes=$(./scripts/IvasBuildAndRunChecks.py -l | grep ^ISM+4)





echo "\n======================= 1. Mono =======================\n\n"

./scripts/IvasBuildAndRunChecks.py $complexity_cmd ltv_complexity_mono_no_fec -m $mono_modes -p $cfg $duration_arg $max_num_workers | tee smoke_test_output_mono.txt

rm -r ./COMPLEXITY/dec/

lib_com/options.h

+3 −1
Original line number Diff line number Diff line
@@ -174,7 +174,9 @@ 
#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_1250_MCMASA_LS_OUTPUT                     /* VA: issue 1250: fix crash in McMASA to custom LS output decoding */



#define NONBE_1302_FIX_OMASA_JBM_FLUSH                  /* VA: issue 1302: fix OMASA JBM bitrate switching flush in binaural output */

#define NONBE_1324_TC_BUFFER_MEMOERY_KEEP               /* VA: issue 1324: do not reset TSM memory in JBM bitrate switching */

#define NONBE_FIX_1337_MISSING_DIRECTIVITY_DISTATT_EXTREND /* Eri: issue 1337: Missing directivity setting and distance attenuation in external renderer IVAS_rend */



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