Commit 8221029a authored by vaclav's avatar vaclav
Browse files

- Merge remote-tracking branch 'remotes/origin/main' into 1044-unused-memory-in-ism-renderer-handle

parents 34bf4d04 bff92061

.gitlab-ci.yml

+95 −5
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ variables: 
      - 'test-be-release'

      - 'test-long-self-test'

      - 'ivas-conformance'

      - 'ivas-conformance-linux'

  GIT_CLEAN_FLAGS: -ffdxq

  TESTCASE_TIMEOUT_STV_SANITIZERS: 180

  TESTCASE_TIMEOUT_LTV_SANITIZERS: 1200
@@ -58,6 +59,10 @@ workflow: 
      variables:

        IVAS_PIPELINE_NAME: 'Draft IVAS Conformance test: $CI_COMMIT_BRANCH'        

    - if: $CI_PIPELINE_SOURCE == 'trigger'

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'ivas-conformance-linux'

      variables:

        IVAS_PIPELINE_NAME: 'Draft IVAS Conformance test -- Linux: $CI_COMMIT_BRANCH'        

    



stages:

  - .pre
@@ -243,6 +248,8 @@ stages: 
      when: never

    - if: $MANUAL_PIPELINE_TYPE == 'ivas-conformance'

      when: never      

    - if: $MANUAL_PIPELINE_TYPE == 'ivas-conformance-linux'

      when: never      

    - when: on_success



.rules-merge-request:
@@ -529,6 +536,8 @@ codec-smoke-test: 
codec-msan:

  extends:

    - .sanitizer-selftest-on-mr

  tags:

    - ivas-linux-fast

  before_script:

    - CLANG_NUM=1

    - SELFTEST_SANITY_TIMEOUT=$TESTCASE_TIMEOUT_STV_SANITIZERS
@@ -1337,6 +1346,7 @@ ivas-conformance: 
    # Prepare reference exec, use tests and scripts from reference

    - $source_branch_commit_sha = $(git rev-parse HEAD)

    - git checkout main # This should be set to a relevant reference

    - git pull # Ensure to get the latest version

    - python .\scripts\strip_split_rendering.py

    - MSBuild.exe -maxcpucount .\Workspace_msvc\Workspace_msvc.sln /property:Configuration=Debug    

    - cp -force IVAS_cod.exe IVAS_cod_ref.exe
@@ -1401,6 +1411,86 @@ ivas-conformance: 
    reports:

      junit: report-junit.xml



ivas-conformance-linux:

  tags:

    - ivas-linux

  stage: test

  timeout: "60 minutes"

  rules:

    - if: ($CI_PIPELINE_SOURCE == 'web' || $CI_PIPELINE_SOURCE == 'trigger') && $MANUAL_PIPELINE_TYPE == 'ivas-conformance-linux'

  allow_failure:

    exit_codes:

      - 123

  script:

    - *print-common-info

    # Prepare reference exec, use tests and scripts from reference

    - source_branch_commit_sha=$(git rev-parse HEAD)

    - git checkout main # This should be set to a relevant reference

    

    - make -j

    - cp IVAS_cod IVAS_cod_ref

    - cp IVAS_dec IVAS_dec_ref

    - cp IVAS_rend IVAS_rend_ref

    - git restore .

    - git checkout $source_branch_commit_sha

    

    # Reference creation

    - python3 tests/create_short_testvectors.py

    - python3 scripts/prepare_combined_format_inputs.py

    - python3 -m pytest tests/codec_be_on_mr_nonselection -v -n auto --update_ref 1 -m create_ref --keep_files

    - python3 -m pytest tests/codec_be_on_mr_nonselection -v -n auto --update_ref 1 -m create_ref_part2 --keep_files

    - python3 -m pytest tests/renderer/test_renderer.py --create_ref --keep_files



    # Output creation

    - python3 -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --keep_files --create_cut --html=report_cmd.html --self-contained-html

    - python3 scripts/parse_commands.py report_cmd.html Readme_IVAS.txt

    

    # Copy input data and output ref data

    - rm -rf testvec

    - mkdir testvec

    - mkdir testvec/binauralRenderer_interface

    - mkdir testvec/testv

    - mkdir testvec/testv/renderer

    - mkdir testvec/bin    

    - cp -r scripts/testv/* testvec/testv

    - cp -r scripts/ls_layouts testvec

    - cp -r scripts/switchPaths testvec

    - cp -r scripts/trajectories testvec

    - cp -r scripts/binauralRenderer_interface/binaural_renderers_hrtf_data testvec/binauralRenderer_interface

    - cp -r tests/ref testvec/testv/ref

    - cp -r tests/dut/* testvec/testv/ref

    - cp -r tests/renderer/cut testvec/testv/renderer/ref

    - cp -r tests/conformance-test testvec/

    - cp Readme_IVAS_dec.txt testvec

    - cp Readme_IVAS_enc.txt testvec 

    - cp Readme_IVAS_rend.txt testvec

    - cp Readme_IVAS_JBM_dec.txt testvec

    - cp IVAS_cod testvec/bin

    - cp IVAS_dec testvec/bin

    - cp IVAS_rend testvec/bin

    

    # Test run generated scripts in testvec

    - cd testvec    

    - python3 -m pytest conformance-test/test_26252.py --junit-xml=report-junit.xml --html=report.html --self-contained-html

    - mv report.html ..

    - mv report-junit.xml ..



  artifacts:

    name: "ivas-conformance-linux-$CI_COMMIT_SHORT_SHA"

    expire_in: 1 week

    when: always

    paths:

      - report-junit.xml

      - report.html

      - Readme_IVAS_dec.txt  

      - Readme_IVAS_enc.txt  

      - Readme_IVAS_rend.txt

      - Readme_IVAS_JBM_dec.txt

    expose_as: "Draft IVAS conformance -- Linux"

    reports:

      junit: report-junit.xml





test-long-self-test:

  tags:

    - ivas-linux-fast
@@ -1482,7 +1572,7 @@ ltv-msan: 
    - .sanitizer-selftest-ltv

  rules:

    - if: $SANITIZER_SCHEDULE_E

  timeout: 1 hour

  timeout: 2 hour

  tags:

    - ivas-linux-fast

  before_script:
@@ -1498,10 +1588,10 @@ ltv-asan: 
  rules:

    - if: $SANITIZER_SCHEDULE_E

      when: delayed

      start_in: 1 hours

      start_in: 2 hours

  tags:

    - ivas-linux-fast

  timeout: 1 hour

  timeout: 2 hour

  before_script:

    - CLANG_NUM=2

    - SELFTEST_SANITY_TIMEOUT=$TESTCASE_TIMEOUT_LTV_SANITIZERS
@@ -1515,10 +1605,10 @@ ltv-usan: 
  rules:

    - if: $SANITIZER_SCHEDULE_E

      when: delayed

      start_in: 2 hours

      start_in: 3 hours

  tags:

    - ivas-linux-fast

  timeout: 1 hour

  timeout: 2 hour

  before_script:

    - CLANG_NUM=3

    - SELFTEST_SANITY_TIMEOUT=$TESTCASE_TIMEOUT_LTV_SANITIZERS

apps/decoder.c

+0 −3
Original line number Diff line number Diff line
@@ -2525,9 +2525,6 @@ static ivas_error decodeG192( 
        {

            update_wmops();

            update_mem();

#ifdef MEM_COUNT_DETAILS

            export_mem( "mem_analysis.csv" );

#endif

        }

#endif

    }

ci/smoke_test.sh

+10 −11
Original line number Diff line number Diff line
@@ -82,8 +82,8 @@ echo "\n======================= 0. preparing combined format test inputs ======= 


# run all modes vanilla-fashion

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

ism_modes=$(./scripts/runIvasCodec.py -l | grep ^ISM)

non_ism_modes=$(./scripts/runIvasCodec.py -l | grep -v ^ISM)

ism_modes=$(./scripts/runIvasCodec.py -l | grep ISM)

non_ism_modes=$(./scripts/runIvasCodec.py -l | grep -v ISM)

echo "\n======================= 1. non-ism modes no FEC =======================\n\n"

./scripts/runIvasCodec.py $verbosity_cmd -m $non_ism_modes -p $cfg $duration_arg $timeout_cmd | tee smoke_test_output.txt

echo "\n======================= 2. ism modes no FEC =======================\n\n"
@@ -93,29 +93,28 @@ echo "\n======================= 3. all modes with FEC =======================\n\ 
./scripts/runIvasCodec.py $verbosity_cmd -p $cfg $duration_arg -f="$ep_file" --decoder_only $timeout_cmd | tee smoke_test_output_plc.txt



# run JBM modes - EXT is excluded as not supported yet

# OMASA disabled for now

modes_with_no_ext_out=$(./scripts/runIvasCodec.py -l | grep -v ^MASA | grep -v ^ISM | grep -v OMASA)

modes_with_ext_out=$(./scripts/runIvasCodec.py -l | grep 'MASA\|ISM' | grep -v ^ISM+ | grep -v OMASA)

formats_with_no_ext_out=$(./scripts/runIvasCodec.py -L | grep -v MASA | grep -v ISM | grep -v OSBA)

formats_with_ext_out=$(./scripts/runIvasCodec.py -L | grep 'MASA\|ISM\|OSBA')

echo "\n======================= 4. JBM, modes with no EXT =======================\n\n"

./scripts/runIvasCodec.py $verbosity_cmd -m $modes_with_no_ext_out -p $cfg $duration_arg --decoder_only --jbm_file $dly_profile $timeout_cmd | tee smoke_test_output_jbm_noEXT.txt

./scripts/runIvasCodec.py $verbosity_cmd -C $formats_with_no_ext_out -p $cfg $duration_arg --decoder_only --jbm_file $dly_profile $timeout_cmd | tee smoke_test_output_jbm_noEXT.txt

echo "\n======================= 5. JBM, modes with EXT =======================\n\n"

./scripts/runIvasCodec.py  $verbosity_cmd -m $modes_with_ext_out -p $cfg $duration_arg --decoder_only --jbm_file $dly_profile --oc BINAURAL BINAURAL_ROOM_IR mono stereo FOA HOA3 5_1 7_1_4 $timeout_cmd | tee -a smoke_test_output_jbm_noEXT.txt

./scripts/runIvasCodec.py  $verbosity_cmd -C $formats_with_ext_out -p $cfg $duration_arg --decoder_only --jbm_file $dly_profile --oc BINAURAL BINAURAL_ROOM_IR mono stereo FOA HOA3 5_1 7_1_4 $timeout_cmd | tee -a smoke_test_output_jbm_noEXT.txt



# run all modes with binaural output using external files

modes_with_bin_out="FOA HOA2 HOA3 PlanarFOA PlanarHOA2 PlanarHOA3 MASA MC ISM1 ISM2 ISM3 ISM4"

formats_with_bin_out=$(./scripts/runIvasCodec.py -L | grep -v "mono\|tereo")

bin_out_modes="BINAURAL BINAURAL_ROOM_IR"



echo "\n======================= 6. binaural out with HRTF files - WB =======================\n\n"

wb_modes=$(./scripts/runIvasCodec.py -l -C $modes_with_bin_out | grep _wb_)

wb_modes=$(./scripts/runIvasCodec.py -l -C $formats_with_bin_out | grep _wb_)

hrtf_wb="../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin"

./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m $wb_modes $duration_arg -D="-hrtf ${hrtf_wb}" --decoder_only --oc $bin_out_modes $timeout_cmd | tee -a smoke_test_output_hrtf.txt



echo "\n======================= 7. binaural out with HRTF files - SWB =======================\n\n"

swb_modes=$(./scripts/runIvasCodec.py -l -C $modes_with_bin_out | grep _swb_)

swb_modes=$(./scripts/runIvasCodec.py -l -C $formats_with_bin_out | grep _swb_)

hrtf_swb="../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin"

./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m $swb_modes $duration_arg -D="-hrtf ${hrtf_swb}" --decoder_only --oc $bin_out_modes $timeout_cmd | tee -a smoke_test_output_hrtf.txt



echo "\n======================= 8. binaural out with HRTF files - FB =======================\n\n"

fb_modes=$(./scripts/runIvasCodec.py -l -C $modes_with_bin_out | grep _fb_)

fb_modes=$(./scripts/runIvasCodec.py -l -C $formats_with_bin_out | grep _fb_)

hrtf_fb="../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin"

./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m $fb_modes $duration_arg -D="-hrtf ${hrtf_fb}" --decoder_only --oc $bin_out_modes $timeout_cmd | tee -a smoke_test_output_hrtf.txt

lib_com/ivas_cnst.h

+4 −4
Original line number Diff line number Diff line
@@ -1195,12 +1195,12 @@ enum 
#define MASA_COHERENCE_TOLERANCE                0.1f

#define MASA_COHERENCE_THRESHOLD                0.1f

#define MASA_RATIO_TOLERANCE                    0.1f

#ifdef NONBE_FIX_1034_DRY_MASA_RATIOS

#define MASA_RATIO_THRESHOLD                    0.015f

#else

#define MASA_RATIO_THRESHOLD                    0.1f

#endif

#define MASA_ANGLE_TOLERANCE                    0.5f

#ifdef  NON_BE_FIX_1048_THRESHOLD_COH_BASOP

#define MASA_SUR_COH_THRESHOLD                  1e-7f

#define MASA_SUR_COH_PRECISION                  1e7f

#endif

#define MASA_LIMIT_NO_BANDS_SUR_COH             8

#define MINIMUM_BIT_BUDGET_NORMAL_META          100

#define DIFF_DFRATIO_2BIT_LIMIT_IDX_HODIRAC     4

lib_com/ivas_prot.h

+0 −16
Original line number Diff line number Diff line
@@ -1095,13 +1095,6 @@ void ivas_param_ism_dec_close( 
    const AUDIO_CONFIG output_config                            /* i  : output audio configuration                  */

);



#ifndef FIX_1022_REMOVE_PARAMISM_DEC

void ivas_param_ism_dec(

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

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

);



#endif

void ivas_ism_dec_digest_tc(

    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                      */

);
@@ -3869,13 +3862,6 @@ void ivas_param_mc_dec_render( 
    float *output_f[]                                           /* o  : rendered time signal                                */

);



#ifndef FIX_1023_REMOVE_PARAMMC_DEC

void ivas_param_mc_dec(

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

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

);



#endif

/*! r: number of cldfb synthesis instances */

int16_t param_mc_get_num_cldfb_syntheses( 

    Decoder_Struct *st_ivas                                     /* i  : IVAS decoder structure                              */
@@ -5218,9 +5204,7 @@ void ivas_ism_renderer_close( 


void ivas_ism_render_sf(

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

#ifdef NONBE_FIX_1021_ISM_BRIR_RS_FLUSH

    const RENDERER_TYPE renderer_type,                          /* i  : active renderer type                            */

#endif

    float *output_f[],                                          /* i/o: core-coder transport channels/object output     */

    const int16_t n_samples_to_render                           /* i  : output frame length per channel                 */

);