Commit 021a3acf authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch '90-harmonize-output-scaling-in-combined-formats' into 'main' 

Resolve "Harmonize output scaling in combined formats"

See merge request !179
parents f12cd70c 89018bbc

ivas_processing_scripts/audiotools/convert/osba.py

+5 −5
Original line number Diff line number Diff line
@@ -81,14 +81,14 @@ def convert_osba( 


        # combine results

        try:

            out.audio = 0.5 * (out_ism.audio + out_sba.audio)

            out.audio = out_ism.audio + out_sba.audio

        except ValueError as e:

            if (

                out_ism.audio.shape[0] != out_sba.audio.shape[0]

                and out_sba.audio.shape[0] == osba.audio.shape[0]

            ):

                out.audio = 0.5 * out_sba.audio

                out.audio[: out_ism.audio.shape[0], :] += 0.5 * out_ism.audio

                out.audio = out_sba.audio

                out.audio[: out_ism.audio.shape[0], :] += out_ism.audio

            else:

                raise e
@@ -104,7 +104,7 @@ def convert_osba( 
        render_sba_to_cba(sba, out_sba)



        # combine results

        out.audio = 0.5 * (out_ism.audio + out_sba.audio)

        out.audio = out_ism.audio + out_sba.audio



    # OSBA -> SBA

    elif isinstance(out, audio.SceneBasedAudio):
@@ -118,7 +118,7 @@ def convert_osba( 
        render_sba_to_sba(sba, out_sba)



        # combine results

        out.audio = 0.5 * (out_ism.audio + out_sba.audio)

        out.audio = out_ism.audio + out_sba.audio



    # OSBA -> OMASA

    elif isinstance(out, audio.OMASAAudio):