Commit 3a88a297 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

remove scaling factor for OSBA to OMASA

parent 335d6dc3
Loading
Loading
Loading
Loading
Loading
+8 −4
Original line number Diff line number Diff line
@@ -244,7 +244,9 @@ def main():
    # validate required arguments
    if args.input is None or args.in_fmt is None or args.output is None:
        parser.print_usage()
        raise SystemExit("the following arguments are required: -i/--in, -if/--in_fmt, -o/--out")
        raise SystemExit(
            "the following arguments are required: -i/--in, -if/--in_fmt, -o/--out"
        )

    elif args.input is not None:
        if not args.out_fs:
@@ -280,7 +282,9 @@ def main():
        else:
            # input was a dir so output should be a dir too
            if args.output.is_file():
                raise NotADirectoryError(f"Input directory '{args.input}' specified with file output to '{args.output}' - please specify an output directory instead")
                raise NotADirectoryError(
                    f"Input directory '{args.input}' specified with file output to '{args.output}' - please specify an output directory instead"
                )
            if not args.output.exists():
                args.output.mkdir()
                print(f"Created output directory {args.output}")
+5 −5
Original line number Diff line number Diff line
@@ -128,15 +128,15 @@ def convert_osba(
                "OSBA to OMASA conversion only possible if number of ISM objects matches"
            )

        # only render SBA part
        # only render SBA part to MASA
        out_sba = audio.fromtype(out.name[4:])
        out_sba.metadata_file = out.metadata_files[-1]
        render_sba_to_masa(sba, out_sba)

        out.audio = np.concatenate(
            (osba.audio[:, : osba.num_ism_channels], out_sba.audio), axis=1
        )
        out.audio *= 0.5
        # ism audio is passed through
        ism_audio = osba.audio[:, : osba.num_ism_channels]

        out.audio = np.concatenate((ism_audio, out_sba.audio), axis=1)

    # OSBA -> OSBA
    elif isinstance(out, audio.OSBAAudio):