From cd2f3027fd786e17b959dc9979d325da2848bcce Mon Sep 17 00:00:00 2001 From: Archit Tamarapu Date: Thu, 7 Nov 2024 13:02:59 +0100 Subject: [PATCH 1/4] [fix] MASA output metadata file written in incorrect location when using an input file from cwd --- ivas_processing_scripts/audiotools/convert/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ivas_processing_scripts/audiotools/convert/__init__.py b/ivas_processing_scripts/audiotools/convert/__init__.py index 9d53f054..08d77667 100755 --- a/ivas_processing_scripts/audiotools/convert/__init__.py +++ b/ivas_processing_scripts/audiotools/convert/__init__.py @@ -106,7 +106,7 @@ def convert_file( output.metadata_file = input.metadata_file else: # fabricate metadata file name - masa_meta_file_name = Path(out_file).parent / (Path(out_file).name + ".met") + masa_meta_file_name = Path(out_file).parent.resolve().joinpath(out_file.with_suffix(".met")) output.metadata_file = masa_meta_file_name elif isinstance(output, audio.ObjectBasedAudio): -- GitLab From 1619eab7968edaa88e9d725d3cbdc21eb639bb9b Mon Sep 17 00:00:00 2001 From: Archit Tamarapu Date: Thu, 7 Nov 2024 13:11:31 +0100 Subject: [PATCH 2/4] formatting --- ivas_processing_scripts/audiotools/convert/__init__.py | 4 +++- ivas_processing_scripts/audiotools/convert/osba.py | 2 +- ivas_processing_scripts/audiotools/convert/scenebased.py | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ivas_processing_scripts/audiotools/convert/__init__.py b/ivas_processing_scripts/audiotools/convert/__init__.py index 08d77667..ed3ca4e2 100755 --- a/ivas_processing_scripts/audiotools/convert/__init__.py +++ b/ivas_processing_scripts/audiotools/convert/__init__.py @@ -106,7 +106,9 @@ def convert_file( output.metadata_file = input.metadata_file else: # fabricate metadata file name - masa_meta_file_name = Path(out_file).parent.resolve().joinpath(out_file.with_suffix(".met")) + masa_meta_file_name = ( + Path(out_file).parent.resolve().joinpath(out_file.with_suffix(".met")) + ) output.metadata_file = masa_meta_file_name elif isinstance(output, audio.ObjectBasedAudio): diff --git a/ivas_processing_scripts/audiotools/convert/osba.py b/ivas_processing_scripts/audiotools/convert/osba.py index 55071657..26092e3a 100644 --- a/ivas_processing_scripts/audiotools/convert/osba.py +++ b/ivas_processing_scripts/audiotools/convert/osba.py @@ -81,7 +81,7 @@ def convert_osba( # combine results try: - out.audio = 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] diff --git a/ivas_processing_scripts/audiotools/convert/scenebased.py b/ivas_processing_scripts/audiotools/convert/scenebased.py index 1239d674..de7e39ae 100755 --- a/ivas_processing_scripts/audiotools/convert/scenebased.py +++ b/ivas_processing_scripts/audiotools/convert/scenebased.py @@ -196,7 +196,6 @@ def render_sba_to_masa( sba_in: audio.SceneBasedAudio, masa_out: audio.MetadataAssistedSpatialAudio, ) -> None: - num_tcs = masa_out.num_channels md_out_path = masa_out.metadata_file -- GitLab From e02f9ca5269ada6e347a2b1d9fb1e9a6cc1751b7 Mon Sep 17 00:00:00 2001 From: Archit Tamarapu Date: Thu, 7 Nov 2024 13:32:50 +0100 Subject: [PATCH 3/4] [fix] filename suffix of MASA metadata file set incorrectly --- ivas_processing_scripts/audiotools/convert/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ivas_processing_scripts/audiotools/convert/__init__.py b/ivas_processing_scripts/audiotools/convert/__init__.py index ed3ca4e2..5d177394 100755 --- a/ivas_processing_scripts/audiotools/convert/__init__.py +++ b/ivas_processing_scripts/audiotools/convert/__init__.py @@ -107,7 +107,7 @@ def convert_file( else: # fabricate metadata file name masa_meta_file_name = ( - Path(out_file).parent.resolve().joinpath(out_file.with_suffix(".met")) + Path(out_file).parent.resolve().joinpath(out_file.with_suffix(".wav.met").name) ) output.metadata_file = masa_meta_file_name -- GitLab From b847f00a1070f515ad6b6ff3a4896bea8b8649f9 Mon Sep 17 00:00:00 2001 From: Archit Tamarapu Date: Thu, 7 Nov 2024 13:33:28 +0100 Subject: [PATCH 4/4] formatting --- ivas_processing_scripts/audiotools/convert/__init__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ivas_processing_scripts/audiotools/convert/__init__.py b/ivas_processing_scripts/audiotools/convert/__init__.py index 5d177394..172cdbd2 100755 --- a/ivas_processing_scripts/audiotools/convert/__init__.py +++ b/ivas_processing_scripts/audiotools/convert/__init__.py @@ -107,7 +107,9 @@ def convert_file( else: # fabricate metadata file name masa_meta_file_name = ( - Path(out_file).parent.resolve().joinpath(out_file.with_suffix(".wav.met").name) + Path(out_file) + .parent.resolve() + .joinpath(out_file.with_suffix(".wav.met").name) ) output.metadata_file = masa_meta_file_name -- GitLab