Commit f0a33da8 authored by multrus's avatar multrus
Browse files

rename sba_format to sba_fmt

parent f968e962

README.md

+2 −2
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ conditions_to_generate: 
          ### Decoder output sampling rate; default = null (same as input)

          # fs: 48000

	  ### Option to use SBA format of lower or same order (planar also possible) for SBA input formats

      # sba_format: "PLANARFOA"

      # sba_fmt: "PLANARFOA"

```



</details>
@@ -474,7 +474,7 @@ For the encoding stage `cod` and the decoding stage `dec`, the path to the IVAS_ 
Additionally some resampling can be applied by using the key `fs` followed by the desired sampling rate.

The general bitstream processing configuration can be locally overwritten for each EVS and IVAS condition with the key `tx`.

The additional key `evs_lfe_9k6bps_nb` is only available for EVS conditions and ensures a bitrate of 9.6kbps and narrow band processing of the LFE channel(s).

Also only available for EVS conditions is the `sba_format` key where a SBA format of lower order than the input can be specified for SBA input formats.

Also only available for EVS conditions is the `sba_fmt` key where a SBA format of lower order than the input can be specified for SBA input formats.

#### IVAS

The configuration of the IVAS condition is similar to the EVS condition. However, only one bitrate for all channels (and metadata) can be specified.

In addition to that, the encoder and decoder take some additional arguments defined by the key `opts`.

examples/TEMPLATE.yml

+1 −1
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ conditions_to_generate: 
      # tx:

          ### For possible arguments see overall bitstream modification

      ### Option to use SBA format of lower or same order (planar also possible) for SBA input formats

      # sba_format: "PLANARFOA"

      # sba_fmt: "PLANARFOA"



################################################

### Post-processing

experiments/selection/P800-5/config/P800-5.yml

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ conditions_to_generate: 
            - 7200

        cod:

            opts: ["-max_band", "FB"]

        sba_format: "PLANARFOA"

        sba_fmt: "PLANARFOA"

    c10:

        type: evs

        bitrates:

ivas_processing_scripts/processing/chains.py

+2 −2
Original line number Diff line number Diff line
@@ -320,13 +320,13 @@ def get_processing_chain( 
                    "tx": tx_cfg,

                    "preamble": preamble,

                    "evs_lfe_9k6bps_nb": evs_lfe_9k6bps_nb,

                    "sba_format": cond_cfg.get("sba_format", tmp_in_fmt),

                    "sba_fmt": cond_cfg.get("sba_fmt", tmp_in_fmt),

                }

            )

        )

        # update values to reflect decoder output

        tmp_in_fs = dec_cfg.get("fs", tmp_in_fs)

        tmp_in_fmt = cond_cfg.get("sba_format", cfg.input["fmt"])

        tmp_in_fmt = cond_cfg.get("sba_fmt", cfg.input["fmt"])



    elif cond_cfg["type"] == "ivas":

        cod_cfg = cond_cfg["cod"]

ivas_processing_scripts/processing/evs.py

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ class EVS(Processing): 
            self.out_fs = self.in_fs



        # consider SBA format for condition

        condition_fmt = audio.fromtype(self.sba_format)

        condition_fmt = audio.fromtype(self.sba_fmt)

        if isinstance(self.in_fmt, audio.SceneBasedAudio):

            if not isinstance(condition_fmt, audio.SceneBasedAudio) or (

                condition_fmt.num_channels > self.in_fmt.num_channels