diff --git a/README.md b/README.md index d70343e2366a7d862098e97a777583ff5eb07b5e..b70fab001b3ea67a0e611647e364f9d29358236f 100755 --- a/README.md +++ b/README.md @@ -103,9 +103,9 @@ conditions_to_generate: bitrates: - 9600 cod: - bin: ~/git/ivas-codec/IVAS_cod + bin: ~/git/ivas-codec/EVS_cod dec: - bin: ~/git/ivas-codec/IVAS_dec + bin: ~/git/ivas-codec/EVS_dec postprocessing: fmt: "BINAURAL" ``` @@ -267,7 +267,7 @@ input: ### mnru generate MNRU condition ### esdru generate ESDRU condition ### mono_dmx generate mono downmix condition -### evs generate an EVS coded condition (see below examples for additional required keys) (currently uses IVAS EVS mode) +### evs generate an EVS coded condition (see below examples for additional required keys) ### ivas generate an IVAS coded condition (see below examples for additional required keys) conditions_to_generate: ### Reference and anchor conditions ########################## @@ -358,13 +358,13 @@ conditions_to_generate: # - 9600 - [13200, 13200, 8000, 13200, 9600] cod: - ### Path to encoder binary; default search for IVAS_cod in bin folder (primary) and PATH (secondary) - bin: ~/git/ivas-codec/IVAS_cod + ### Path to encoder binary; default search for EVS_cod in bin folder (primary) and PATH (secondary) + bin: ~/git/ivas-codec/EVS_cod ### Encoder input sampling rate in Hz (resampling performed in case of mismatch); default = null (no resampling) # fs: 32000 dec: - ### Path to encoder binary; default search for IVAS_dec in bin folder (primary) and PATH (secondary) - bin: ~/git/ivas-codec/IVAS_dec + ### Path to encoder binary; default search for EVS_dec in bin folder (primary) and PATH (secondary) + bin: ~/git/ivas-codec/EVS_dec ### Decoder output sampling rate; default = null (same as input) # fs: 48000 ``` @@ -489,6 +489,7 @@ The following additional executables are needed for the different processing ste | Random offset/seed generation | random | https://www.3gpp.org/ftp/tsg_sa/WG4_CODEC/TSGS4_76/docs/S4-131277.zip | | JBM network simulator | networkSimulator_g192 | https://www.3gpp.org/ftp/tsg_sa/WG4_CODEC/TSGS4_76/docs/S4-131277.zip | | MASA rendering | masaRenderer | https://www.3gpp.org/ftp/TSG_SA/WG4_CODEC/TSGS4_122_Athens/Docs/S4-230221.zip | +| EVS reference conditions | EVS_cod, EVS_dec | https://www.3gpp.org/ftp/Specs/archive/26_series/26.443/26443-h00.zip | The necessary binaries have to be placed in the [ivas_processing_scripts/bin](./ivas_processing_scripts/bin) folder. For most of the tools it is sufficient to copy the binaries while it is necessary to add some additional files for the MASA renderer. diff --git a/examples/TEMPLATE.yml b/examples/TEMPLATE.yml index 441250aeba3ff29dbfc26b526908c209a39154e6..854c0cea71a095eb0bf7190036761327d94a2cdb 100755 --- a/examples/TEMPLATE.yml +++ b/examples/TEMPLATE.yml @@ -151,7 +151,7 @@ input: ### mnru generate MNRU condition ### esdru generate ESDRU condition ### mono_dmx generate mono downmix condition -### evs generate an EVS coded condition (see below examples for additional required keys) (currently uses IVAS EVS mode) +### evs generate an EVS coded condition (see below examples for additional required keys) ### ivas generate an IVAS coded condition (see below examples for additional required keys) conditions_to_generate: ### Reference and anchor conditions ########################## @@ -242,13 +242,13 @@ conditions_to_generate: # - 9600 - [13200, 13200, 8000, 13200, 9600] cod: - ### Path to encoder binary; default search for IVAS_cod in bin folder (primary) and PATH (secondary) - bin: ~/git/ivas-codec/IVAS_cod + ### Path to encoder binary; default search for EVS_cod in bin folder (primary) and PATH (secondary) + bin: EVS_cod ### Encoder input sampling rate in Hz (resampling performed in case of mismatch); default = null (no resampling) # fs: 32000 dec: - ### Path to encoder binary; default search for IVAS_dec in bin folder (primary) and PATH (secondary) - bin: ~/git/ivas-codec/IVAS_dec + ### Path to encoder binary; default search for EVS_dec in bin folder (primary) and PATH (secondary) + bin: EVS_dec ### Decoder output sampling rate; default = null (same as input) # fs: 48000 diff --git a/ivas_processing_scripts/bin/README.txt b/ivas_processing_scripts/bin/README.md similarity index 91% rename from ivas_processing_scripts/bin/README.txt rename to ivas_processing_scripts/bin/README.md index f8fe6ac00d99c1082940fb747881d3ff3f8ff063..06b0f07714d1fd3e70487e70175ea1a5b9370f26 100755 --- a/ivas_processing_scripts/bin/README.txt +++ b/ivas_processing_scripts/bin/README.md @@ -12,3 +12,4 @@ Necessary additional executables: | Random offset/seed generation | random | https://www.3gpp.org/ftp/tsg_sa/WG4_CODEC/TSGS4_76/docs/S4-131277.zip | | JBM network simulator | networkSimulator_g192 | https://www.3gpp.org/ftp/tsg_sa/WG4_CODEC/TSGS4_76/docs/S4-131277.zip | | MASA rendering | masaRenderer | https://www.3gpp.org/ftp/TSG_SA/WG4_CODEC/TSGS4_122_Athens/Docs/S4-230221.zip | +| EVS reference conditions | EVS_cod, EVS_dec | https://www.3gpp.org/ftp/Specs/archive/26_series/26.443/26443-h00.zip | diff --git a/ivas_processing_scripts/constants.py b/ivas_processing_scripts/constants.py index c273101601f7b1f8ad1c158cf2eda8bd05ed2d81..3e7ce483c95a905ce6f7b09b72875514720d688a 100755 --- a/ivas_processing_scripts/constants.py +++ b/ivas_processing_scripts/constants.py @@ -69,10 +69,10 @@ DEFAULT_CONFIG = { } DEFAULT_CONFIG_EVS = { "cod": { - "bin": find_binary("IVAS_cod", raise_error=False), + "bin": find_binary("EVS_cod", raise_error=False), }, "dec": { - "bin": find_binary("IVAS_dec", raise_error=False), + "bin": find_binary("EVS_dec", raise_error=False), }, } DEFAULT_CONFIG_IVAS = {