Commit 33d5f13a authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'using-evs-binaries' into 'test_runner_binaries'

Changed IVAS to EVS for evs binaries :P

See merge request !25
parents fdf3f029 a7939ef8
Loading
Loading
Loading
Loading
Loading
+8 −7
Original line number Diff line number Diff line
@@ -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"
	fs: 48000
@@ -296,7 +296,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 ##########################
@@ -387,13 +387,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
```
@@ -518,6 +518,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.
+5 −5
Original line number Diff line number Diff line
@@ -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 ##########################
@@ -248,13 +248,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
      ### Bitstream options
+1 −0
Original line number Diff line number Diff line
@@ -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                                       |
+2 −2
Original line number Diff line number Diff line
@@ -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 = {