From c309d113763d9ff2918fbde4dc326b39a2dc193c Mon Sep 17 00:00:00 2001 From: veeravt Date: Wed, 26 Apr 2023 15:11:20 +0200 Subject: [PATCH 1/5] Changed IVAS to EVS for evs binaries :P --- README.md | 14 +++++++------- examples/TEMPLATE.yml | 6 +++--- ivas_processing_scripts/constants.py | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index d70343e2..911a0023 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 ``` diff --git a/examples/TEMPLATE.yml b/examples/TEMPLATE.yml index 441250ae..4f600adf 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 ########################## @@ -243,12 +243,12 @@ conditions_to_generate: - [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 + 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 + bin: ~/git/ivas-codec/EVS_dec ### Decoder output sampling rate; default = null (same as input) # fs: 48000 diff --git a/ivas_processing_scripts/constants.py b/ivas_processing_scripts/constants.py index c2731016..3e7ce483 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 = { -- GitLab From 20ebb92d9cb925bd6ea6e0d3dbe2b651f2521770 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Thu, 27 Apr 2023 11:03:33 +0200 Subject: [PATCH 2/5] add reference to EVS 26.443 v17.0.0 --- README.md | 1 + ivas_processing_scripts/bin/README.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/README.md b/README.md index 911a0023..b70fab00 100755 --- a/README.md +++ b/README.md @@ -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/ivas_processing_scripts/bin/README.txt b/ivas_processing_scripts/bin/README.txt index f8fe6ac0..06b0f077 100755 --- a/ivas_processing_scripts/bin/README.txt +++ b/ivas_processing_scripts/bin/README.txt @@ -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 | -- GitLab From 77e0e404121eaeb1701cfeca2b9a8d6f6fc8ab71 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Thu, 27 Apr 2023 11:04:57 +0200 Subject: [PATCH 3/5] rename file --- ivas_processing_scripts/bin/{README.txt => README.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ivas_processing_scripts/bin/{README.txt => README.md} (100%) diff --git a/ivas_processing_scripts/bin/README.txt b/ivas_processing_scripts/bin/README.md similarity index 100% rename from ivas_processing_scripts/bin/README.txt rename to ivas_processing_scripts/bin/README.md -- GitLab From e89c945e890c143263bf97d4f32380ffe1d74ab6 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Thu, 27 Apr 2023 11:08:19 +0200 Subject: [PATCH 4/5] leave out path for EVS_cod, EVS_dec - this should hopefull work together with branch 1-problem-with-relative-directories-for-input-items; at least we shouldn't point toe the IVAS repo --- examples/TEMPLATE.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/TEMPLATE.yml b/examples/TEMPLATE.yml index 4f600adf..fc0766bb 100755 --- a/examples/TEMPLATE.yml +++ b/examples/TEMPLATE.yml @@ -243,12 +243,12 @@ conditions_to_generate: - [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/EVS_cod + 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/EVS_dec + bin: EVS_dec ### Decoder output sampling rate; default = null (same as input) # fs: 48000 -- GitLab From a7939ef876e6ef6094c70d12fbbd1dc013c4321f Mon Sep 17 00:00:00 2001 From: veeravt Date: Thu, 27 Apr 2023 11:45:42 +0200 Subject: [PATCH 5/5] Changed IVAS_ to EVS_. --- examples/TEMPLATE.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/TEMPLATE.yml b/examples/TEMPLATE.yml index fc0766bb..854c0cea 100755 --- a/examples/TEMPLATE.yml +++ b/examples/TEMPLATE.yml @@ -242,12 +242,12 @@ 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) + ### 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) + ### 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 -- GitLab