Commit 017ec74c authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch '111-stereo-dmx-evs-use-evs-decoding' into 'main' 

Resolve "Adding -stereo_dmx_evs should use EVS decoding"

See merge request !209
parents e2169125 622a7a8e

experiments/characterization/BS1534-19/config/BS1534-19.yml

+2 −2
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ conditions_to_generate: 
            opts:

                - -stereo_dmx_evs

        dec:

            bin: ivas_processing_scripts/bin/IVAS_dec_fx

            bin: ivas_processing_scripts/bin/EVS_dec_fx

    c08:

        type: ivas

        ivas_rend:
@@ -118,7 +118,7 @@ conditions_to_generate: 
            opts:

                - -stereo_dmx_evs

        dec:

            bin: ivas_processing_scripts/bin/IVAS_dec_fx

            bin: ivas_processing_scripts/bin/EVS_dec_fx



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

### Post-processing

ivas_processing_scripts/processing/ivas.py

+2 −1
Original line number Diff line number Diff line
@@ -232,6 +232,7 @@ class IVAS(Processing): 
            # done this way to ensure `output_format` is replaced in the correct position

            cmd.remove("-stereo_dmx_evs")

            cmd[cmd.index("-stereo")] = "-stereo_dmx_evs"

            self.use_evs_dec = True # signal the decoder to use EVS commandline



        run(cmd, logger=logger)
@@ -392,7 +393,7 @@ class IVAS(Processing): 
        else:

            output_format = self.out_fmt.name



        if output_format == "":

        if output_format == "" or getattr(self, "use_evs_dec", None):

            cmd.extend(

                [

                    str(self.out_fs // 1000),