Merge branch 'main' into bugfix/issue859 (476c0347) · Commits · SA4 / Audio / IVAS BASOP

.gitlab-ci.yml

+72 −37

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ variables:
		PRM_FILES: "scripts/config/self_test.prm scripts/config/self_test_ltv.prm"
		TESTCASE_TIMEOUT_STV: 900
		TESTCASE_TIMEOUT_LTV: 2400
		TESTCASE_TIMEOUT_STV_SANITIZERS: 1800
		TESTCASE_TIMEOUT_LTV_SANITIZERS: 6000
		CI_REGRESSION_THRESH_MLD: "0.1"
		CI_REGRESSION_THRESH_MAX_ABS_DIFF: "50"
		CI_REGRESSION_THRESH_SSNR: "-1"
		@@ -505,12 +505,13 @@ stages:
		script:
		- *print-common-info
		- *update-scripts-repo
		- *copy-ltv-files-to-testv-dir
		- python3 ci/remove_unsupported_testcases.py $PRM_FILES
		- *build-reference-and-dut-binaries
		- make clean
		- make -j CLANG=$CLANG_NUM
		- if [[ $CLANG_NUM == 3 ]]; then export UBSAN_OPTIONS="suppressions=scripts/ubsan.supp,report_error_type=1"; fi
		- testcase_timeout=$TESTCASE_TIMEOUT_STV_SANITIZERS
		- testcase_timeout=$TESTCASE_TIMEOUT_LTV_SANITIZERS
		- python3 -m pytest $TEST_SUITE -v --tb=no --update_ref 1 --html=report.html --self-contained-html --junit-xml=report-junit.xml --testcase_timeout $testcase_timeout --ref_encoder_path $DUT_ENCODER_PATH --ref_decoder_path $DUT_DECODER_PATH
		artifacts:
		name: "$CI_JOB_NAME--sha-$CI_COMMIT_SHORT_SHA--results"
		@@ -931,7 +932,7 @@ ivas-pytest-dec-msan:
		before_script:
		- CLANG_NUM=1
		- DUT_ENCODER_PATH=./$REF_ENCODER_PATH
		- TEST_SUITE=$LONG_TEST_SUITE_SELF_TEST
		- TEST_SUITE=$LONG_TEST_SUITE_NO_RENDERER
		<<: *ivas-pytest-sanitizers-anchor

		ivas-pytest-dec-asan:
		@@ -940,7 +941,7 @@ ivas-pytest-dec-asan:
		before_script:
		- CLANG_NUM=2
		- DUT_ENCODER_PATH=./$REF_ENCODER_PATH
		- TEST_SUITE=$LONG_TEST_SUITE_SELF_TEST
		- TEST_SUITE=$LONG_TEST_SUITE_NO_RENDERER
		<<: *ivas-pytest-sanitizers-anchor

		ivas-pytest-dec-usan:
		@@ -1204,6 +1205,9 @@ voip-be-on-merge-request:

		- job_id=$(python3 ci/get_id_of_last_job_occurence.py $CI_COMMIT_REF_NAME $CI_JOB_NAME $CI_PROJECT_ID)
		- echo $job_id
		# this is a testing/maintenance mechanism to force getting the log history from a specific job id
		# see below in the concrete complexity jobs
		- if [ "$JOB_ID_INJECT" != "" ]; then job_id=$JOB_ID_INJECT; fi
		- curl --request GET "https://forge.3gpp.org/rep/api/v4/projects/$CI_PROJECT_ID/jobs/$job_id/artifacts" --output artifacts.zip
		- unzip artifacts.zip \|\| true # this may fail on first run, when there are no artifacts there and the zip file is actually just "404"-html
		- ls
		@@ -1214,21 +1218,13 @@ voip-be-on-merge-request:
		- rm artifacts.zip
		- rm -rf $public_dir

		### 1.5.part: get the corresponding measurement from ivas-float-update-cmplx
		- job_id=$(python3 ci/get_id_of_last_job_occurence.py ivas-float-update-cmplx $CI_JOB_NAME $CI_PROJECT_ID)
		### 1.5.part: get the corresponding measurement from ivas-float-update
		- job_id=$(python3 ci/get_id_of_last_job_occurence.py ivas-float-update $CI_JOB_NAME $CI_PROJECT_ID)
		- echo $job_id
		- curl --request GET "https://forge.3gpp.org/rep/api/v4/projects/$CI_PROJECT_ID/jobs/$job_id/artifacts" --output artifacts_ref.zip
		- unzip -j artifacts_ref.zip "*latest_WMOPS.csv"

		### 2. part: setup specific for BASOP repo
		# hack for using the reference encoder -> need to build manually to make script use ref enc and BASOP dec
		- mkdir COMPLEXITY
		- cp IVAS_cod_ref COMPLEXITY/IVAS_cod
		# build branch code aain with instrumentation
		- make clean
		- bash scripts/prepare_instrumentation.sh -p BASOP -m MEM_ONLY
		- make -j -C $INSTR_DIR
		- cp $INSTR_DIR/IVAS_dec COMPLEXITY/IVAS_dec
		- unzip -j artifacts_ref.zip "*latest_WMOPS.csv" \|\| true
		# add file to arguments only if the artifact could be retrieved to prevent error later.
		- if [ -f latest_WMOPS.csv ]; then GET_WMOPS_ARGS="$GET_WMOPS_ARGS latest_WMOPS.csv"; fi

		.complexity-measurements-prepare-artifacts:
		&complexity-measurements-prepare-artifacts # prepare artifacts -> move to public directory
		@@ -1256,6 +1252,7 @@ voip-be-on-merge-request:
		stage: test
		variables:
		ret_val: 0
		GET_WMOPS_ARGS: "mem_only basop"
		timeout: 3 hours 30 minutes
		before_script:
		- *print-common-info
		@@ -1276,10 +1273,12 @@ complexity-stereo-in-stereo-out:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		variables:
		JOB_ID_INJECT: ""
		script:
		- in_format=stereo
		- out_format=stereo
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv \|\| ret_val=$?
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		@@ -1290,11 +1289,13 @@ complexity-ism-in-binaural-out:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 1 hour
		variables:
		JOB_ID_INJECT: ""
		script:
		- in_format=ISM
		- out_format=BINAURAL
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" mem_only basop latest_WMOPS.csv \|\| ret_val=$?
		- bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" $GET_WMOPS_ARGS \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		@@ -1305,11 +1306,13 @@ complexity-ism-in-binaural_room_ir-out:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 2 hours
		variables:
		JOB_ID_INJECT: ""
		script:
		- in_format=ISM
		- out_format=BINAURAL_ROOM_IR
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" mem_only basop latest_WMOPS.csv \|\| ret_val=$?
		- bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" $GET_WMOPS_ARGS \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		@@ -1320,11 +1323,13 @@ complexity-ism-in-ext-out:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 3 hours 30 minutes
		variables:
		JOB_ID_INJECT: ""
		script:
		- in_format=ISM
		- out_format=EXT
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" mem_only basop latest_WMOPS.csv \|\| ret_val=$?
		- bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" $GET_WMOPS_ARGS \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		@@ -1335,11 +1340,13 @@ complexity-sba-hoa3-in-hoa3-out:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 4 hours 30 minutes
		variables:
		JOB_ID_INJECT: ""
		script:
		- in_format=HOA3
		- out_format=HOA3
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv \|\| ret_val=$?
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		@@ -1350,11 +1357,13 @@ complexity-sba-hoa3-in-binaural-out:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 5 hours 30 minutes
		variables:
		JOB_ID_INJECT: ""
		script:
		- in_format=HOA3
		- out_format=BINAURAL
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv \|\| ret_val=$?
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		@@ -1365,11 +1374,13 @@ complexity-sba-hoa3-in-binaural_room_ir-out:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 6 hours 30 minutes
		variables:
		JOB_ID_INJECT: ""
		script:
		- in_format=HOA3
		- out_format=BINAURAL_ROOM_IR
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv \|\| ret_val=$?
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		@@ -1380,11 +1391,13 @@ complexity-mc-in-7_1_4-out:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 7 hours 30 minutes
		variables:
		JOB_ID_INJECT: ""
		script:
		- in_format=MC
		- out_format=7_1_4
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv \|\| ret_val=$?
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		@@ -1395,11 +1408,13 @@ complexity-mc-in-binaural-out:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 10 hours
		variables:
		JOB_ID_INJECT: ""
		script:
		- in_format=MC
		- out_format=BINAURAL
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv \|\| ret_val=$?
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		@@ -1410,11 +1425,13 @@ complexity-mc-in-binaural_room_ir-out:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 12 hours 30 minutes
		variables:
		JOB_ID_INJECT: ""
		script:
		- in_format=MC
		- out_format=BINAURAL_ROOM_IR
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv \|\| ret_val=$?
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		@@ -1425,11 +1442,13 @@ complexity-masa-in-ext-out:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 15 hours
		variables:
		JOB_ID_INJECT: ""
		script:
		- in_format=MASA
		- out_format=EXT
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv \|\| ret_val=$?
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		@@ -1440,11 +1459,13 @@ complexity-masa-in-binaural-out:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 16 hours
		variables:
		JOB_ID_INJECT: ""
		script:
		- in_format=MASA
		- out_format=BINAURAL
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv \|\| ret_val=$?
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		@@ -1455,11 +1476,13 @@ complexity-masa-in-hoa3-out:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 17 hours
		variables:
		JOB_ID_INJECT: ""
		script:
		- in_format=MASA
		- out_format=HOA3
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv \|\| ret_val=$?
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		@@ -1470,11 +1493,13 @@ complexity-masa-in-hoa3-out:
		# - if: $MEASURE_COMPLEXITY_LINUX
		# when: delayed
		# start_in: 13 hours
		# variables:
		# JOB_ID_INJECT: ""
		# script:
		# - in_format=OMASA
		# - out_format=EXT
		# - ret_val=0
		# - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv \|\| ret_val=$?
		# - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS \|\| ret_val=$?
		# - *complexity-measurements-prepare-artifacts
		# - exit $ret_val

		@@ -1485,11 +1510,13 @@ complexity-omasa-in-binaural-out:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 18 hours
		variables:
		JOB_ID_INJECT: ""
		script:
		- in_format=OMASA
		- out_format=BINAURAL
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv \|\| ret_val=$?
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		@@ -1500,11 +1527,13 @@ complexity-omasa-in-hoa3-out:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 20 hours
		variables:
		JOB_ID_INJECT: ""
		script:
		- in_format=OMASA
		- out_format=HOA3
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv \|\| ret_val=$?
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		@@ -1515,11 +1544,13 @@ complexity-StereoDmxEVS-stereo-in-mono-out:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 22 hours
		variables:
		JOB_ID_INJECT: ""
		script:
		- in_format=StereoDmxEVS
		- out_format=mono
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv \|\| ret_val=$?
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		@@ -1534,7 +1565,7 @@ complexity-StereoDmxEVS-stereo-in-mono-out:
		# - in_format=OSBA
		# - out_format=EXT
		# - ret_val=0
		# - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv \|\| ret_val=$?
		# - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS \|\| ret_val=$?
		# - *complexity-measurements-prepare-artifacts
		# - exit $ret_val

		@@ -1545,11 +1576,13 @@ complexity-osba-in-binaural-out:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 22 hours 30 minutes
		variables:
		JOB_ID_INJECT: ""
		script:
		- in_format=OSBA
		- out_format=BINAURAL
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv \|\| ret_val=$?
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		@@ -1560,11 +1593,13 @@ complexity-osba-in-binaural_room_ir-out:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 25 hours
		variables:
		JOB_ID_INJECT: ""
		script:
		- in_format=OSBA
		- out_format=BINAURAL_ROOM_IR
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv \|\| ret_val=$?
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

Workspace_msvc/lib_enc.vcxproj

+1 −31

Original line number	Diff line number	Diff line
		@@ -229,6 +229,7 @@
		<ClCompile Include="..\lib_enc\ivas_omasa_enc.c" />
		<ClCompile Include="..\lib_enc\ivas_pca_enc.c" />
		<ClCompile Include="..\lib_enc\ivas_range_uni_enc.c" />
		<ClCompile Include="..\lib_enc\ivas_rom_enc_fx.c" />
		<ClCompile Include="..\lib_enc\ivas_spar_encoder.c" />
		<ClCompile Include="..\lib_enc\ivas_spar_md_enc.c" />
		<ClCompile Include="..\lib_enc\ivas_stereo_adapt_GR_enc.c" />
		@@ -238,13 +239,6 @@
		<ClCompile Include="..\lib_enc\ivas_stereo_dft_enc_itd.c" />
		<ClCompile Include="..\lib_enc\ivas_stereo_dft_td_itd.c" />
		<ClCompile Include="..\lib_enc\ivas_stereo_dmx_evs.c" />
		<ClCompile Include="..\lib_enc\ACcontextMapping_enc.c" />
		<ClCompile Include="..\lib_enc\acelp_core_enc.c" />
		<ClCompile Include="..\lib_enc\acelp_core_switch_enc.c" />
		<ClCompile Include="..\lib_enc\acelp_enc_util.c" />
		<ClCompile Include="..\lib_enc\amr_wb_enc.c" />
		<ClCompile Include="..\lib_enc\analy_lp.c" />
		<ClCompile Include="..\lib_enc\analy_sp.c" />
		<ClCompile Include="..\lib_enc\arith_coder_enc.c" />
		<ClCompile Include="..\lib_enc\ari_enc.c" />
		<ClCompile Include="..\lib_enc\ari_hm_enc.c" />
		@@ -278,28 +272,13 @@
		<ClCompile Include="..\lib_enc\enc_amr_wb.c" />
		<ClCompile Include="..\lib_enc\enc_gain.c" />
		<ClCompile Include="..\lib_enc\enc_gen_voic.c" />
		<ClCompile Include="..\lib_enc\enc_gen_voic_rf.c" />
		<ClCompile Include="..\lib_enc\enc_higher_acelp.c" />
		<ClCompile Include="..\lib_enc\enc_nelp.c" />
		<ClCompile Include="..\lib_enc\enc_pit_exc.c" />
		<ClCompile Include="..\lib_enc\enc_ppp.c" />
		<ClCompile Include="..\lib_enc\enc_prm.c" />
		<ClCompile Include="..\lib_enc\enc_tran.c" />
		<ClCompile Include="..\lib_enc\enc_uv.c" />
		<ClCompile Include="..\lib_enc\energy.c" />
		<ClCompile Include="..\lib_enc\eval_pit_contr.c" />
		<ClCompile Include="..\lib_enc\evs_enc.c" />
		<ClCompile Include="..\lib_enc\ext_sig_ana.c" />
		<ClCompile Include="..\lib_enc\fd_cng_enc.c" />
		<ClCompile Include="..\lib_enc\FEC_enc.c" />
		<ClCompile Include="..\lib_enc\find_tar.c" />
		<ClCompile Include="..\lib_enc\find_tilt.c" />
		<ClCompile Include="..\lib_enc\find_uv.c" />
		<ClCompile Include="..\lib_enc\find_wsp.c" />
		<ClCompile Include="..\lib_enc\frame_spec_dif_cor_rate.c" />
		<ClCompile Include="..\lib_enc\gain_enc.c" />
		<ClCompile Include="..\lib_enc\gaus_enc.c" />
		<ClCompile Include="..\lib_enc\gp_clip.c" />
		<ClCompile Include="..\lib_enc\gs_enc.c" />
		<ClCompile Include="..\lib_enc\guided_plc_enc.c" />
		<ClCompile Include="..\lib_enc\hf_cod_amrwb.c" />
		@@ -331,7 +310,6 @@
		<ClCompile Include="..\lib_enc\ivas_mdct_core_enc.c" />
		<ClCompile Include="..\lib_enc\ivas_qmetadata_enc.c" />
		<ClCompile Include="..\lib_enc\ivas_qspherical_enc.c" />
		<ClCompile Include="..\lib_enc\ivas_rom_enc.c" />
		<ClCompile Include="..\lib_enc\ivas_sba_enc.c" />
		<ClCompile Include="..\lib_enc\ivas_sce_enc.c" />
		<ClCompile Include="..\lib_enc\ivas_stereo_eclvq_enc.c" />
		@@ -414,17 +392,9 @@
		<ClCompile Include="..\lib_enc\pvq_core_enc.c" />
		<ClCompile Include="..\lib_enc\pvq_encode.c" />
		<ClCompile Include="..\lib_enc\qlpc_avq.c" />
		<ClCompile Include="..\lib_enc\qlpc_stoch.c" />
		<ClCompile Include="..\lib_enc\q_gain2p.c" />
		<ClCompile Include="..\lib_enc\range_enc.c" />
		<ClCompile Include="..\lib_enc\re8_cod.c" />
		<ClCompile Include="..\lib_enc\reordernorm.c" />
		<ClCompile Include="..\lib_enc\rom_enc.c" />
		<ClCompile Include="..\lib_enc\rst_enc.c" />
		<ClCompile Include="..\lib_enc\setmodeindex.c" />
		<ClCompile Include="..\lib_enc\set_impulse.c" />
		<ClCompile Include="..\lib_enc\sig_clas.c" />
		<ClCompile Include="..\lib_enc\SNR_calc.c" />
		<ClCompile Include="..\lib_enc\ivas_sns_enc.c" />
		<ClCompile Include="..\lib_enc\spec_center.c" />
		<ClCompile Include="..\lib_enc\spec_flatness.c" />

Workspace_msvc/lib_enc.vcxproj.filters

+3 −87

Original line number	Diff line number	Diff line
		@@ -19,12 +19,6 @@
		<ClCompile Include="..\lib_enc\ivas_sce_enc.c">
		<Filter>enc_ivas_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\acelp_core_switch_enc.c">
		<Filter>enc_evs_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\amr_wb_enc.c">
		<Filter>enc_evs_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\cod_ace.c">
		<Filter>enc_evs_c</Filter>
		</ClCompile>
		@@ -58,21 +52,9 @@
		<ClCompile Include="..\lib_enc\enc_amr_wb.c">
		<Filter>enc_evs_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\enc_gen_voic_rf.c">
		<Filter>enc_evs_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\enc_ppp.c">
		<Filter>enc_evs_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\enc_nelp.c">
		<Filter>enc_evs_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\enc_prm.c">
		<Filter>enc_evs_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\evs_enc.c">
		<Filter>enc_evs_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\hf_cod_amrwb.c">
		<Filter>enc_evs_c</Filter>
		</ClCompile>
		@@ -115,21 +97,6 @@
		<ClCompile Include="..\lib_enc\vad_proc.c">
		<Filter>enc_evs_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\ACcontextMapping_enc.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\acelp_core_enc.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\acelp_enc_util.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\analy_lp.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\analy_sp.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\ari_enc.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		@@ -193,15 +160,6 @@
		<ClCompile Include="..\lib_enc\enc_gen_voic.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\enc_higher_acelp.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\enc_pit_exc.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\enc_tran.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\enc_uv.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		@@ -211,18 +169,9 @@
		<ClCompile Include="..\lib_enc\eval_pit_contr.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\ext_sig_ana.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\fd_cng_enc.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\FEC_enc.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\find_tar.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\find_tilt.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		@@ -238,12 +187,6 @@
		<ClCompile Include="..\lib_enc\gain_enc.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\gaus_enc.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\gp_clip.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\gs_enc.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		@@ -334,33 +277,12 @@
		<ClCompile Include="..\lib_enc\qlpc_avq.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\qlpc_stoch.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\range_enc.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\re8_cod.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\reordernorm.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\rom_enc.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\rst_enc.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\set_impulse.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\setmodeindex.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\sig_clas.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\spec_center.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		@@ -433,12 +355,6 @@
		<ClCompile Include="..\lib_enc\comvad_decision.c">
		<Filter>enc_evs_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\SNR_calc.c">
		<Filter>enc_evs_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\ivas_rom_enc.c">
		<Filter>enc_ivas_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\ivas_mcmasa_enc.c">
		<Filter>enc_ivas_c</Filter>
		</ClCompile>
		@@ -454,9 +370,6 @@
		<ClCompile Include="..\lib_enc\ivas_mct_enc_mct.c">
		<Filter>enc_ivas_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\ivas_rom_enc.c">
		<Filter>enc_ivas_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\ivas_mdct_core_enc.c">
		<Filter>enc_ivas_c</Filter>
		</ClCompile>
		@@ -1013,6 +926,9 @@
		<ClCompile Include="..\lib_enc\scale_enc_fx.c">
		<Filter>enc_evs_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\ivas_rom_enc_fx.c">
		<Filter>enc_ivas_c</Filter>
		</ClCompile>
		</ItemGroup>
		<ItemGroup>
		<ClInclude Include="..\lib_enc\ivas_stat_enc.h">

apps/renderer.c

+48 −0

Original line number	Diff line number	Diff line
		@@ -655,6 +655,10 @@ int main(
		lfeRoutingConfigs[i] = NULL;
		}

		#ifdef FIX_DISCLAIMER
		IVAS_REND_PrintDisclaimer();

		#endif
		CmdlnArgs args = parseCmdlnArgs( argc, argv );

		if ( args.nonDiegeticPan && !( ( args.inConfig.numAudioObjects == 0 && args.inConfig.multiChannelBuses[0].audioConfig == IVAS_AUDIO_CONFIG_MONO ) \|\|
		@@ -816,6 +820,50 @@ int main(
		exit( -1 );
		}

		#ifdef FIX_DISCLAIMER
		fprintf( stdout, "Input audio file: %s\n", args.inputFilePath );
		fprintf( stdout, "Output audio file: %s\n\n", args.outputFilePath );

		if ( args.inConfig.numAudioObjects > 0 )
		{
		if ( args.inConfig.numAudioObjects == 1 )
		{
		IVAS_REND_PrintInputConfig( IVAS_AUDIO_CONFIG_ISM1 );
		}
		else if ( args.inConfig.numAudioObjects == 2 )
		{
		IVAS_REND_PrintInputConfig( IVAS_AUDIO_CONFIG_ISM2 );
		}
		else if ( args.inConfig.numAudioObjects == 3 )
		{
		IVAS_REND_PrintInputConfig( IVAS_AUDIO_CONFIG_ISM3 );
		}
		else if ( args.inConfig.numAudioObjects == 4 )
		{
		IVAS_REND_PrintInputConfig( IVAS_AUDIO_CONFIG_ISM4 );
		}
		}
		for ( i = 0; i < args.inConfig.numMultiChannelBuses; i++ )
		{
		IVAS_REND_PrintInputConfig( args.inConfig.multiChannelBuses[i].audioConfig );
		}
		for ( i = 0; i < args.inConfig.numMasaBuses; i++ )
		{
		IVAS_REND_PrintInputConfig( args.inConfig.masaBuses[i].audioConfig );
		}
		for ( i = 0; i < args.inConfig.numAmbisonicsBuses; i++ )
		{
		IVAS_REND_PrintInputConfig( args.inConfig.ambisonicsBuses[i].audioConfig );
		}

		if ( ( error = IVAS_REND_PrintConfig( hIvasRend ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\n IVAS_REND_PrintConfig failed: %s\n\n", ivas_error_to_string( error ) );
		// goto cleanup;
		exit( -1 );
		}

		#endif
		/* === Configure === */
		if ( ( error = IVAS_REND_InitConfig( hIvasRend, args.outConfig.audioConfig ) ) != IVAS_ERR_OK )
		{

lib_com/basop32.c

+7 −7

File changed.

Preview size limit exceeded, changes collapsed.