From 7d2a337edc4a0a4713ec651b474c8467e3f9b5d7 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Wed, 5 Nov 2025 20:31:15 +0100 Subject: [PATCH 1/4] add ambi_converter to default build targets --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 48c102c6ab..b2a42917c4 100644 --- a/Makefile +++ b/Makefile @@ -169,7 +169,7 @@ DEPS = $(addprefix $(OBJDIR)/,$(SRCS_LIBCOM:.c=.P) $(SRCS_LIBDEBUG:.c=.P) $(SRCS .PHONY: all clean -all: $(CLI_APIENC) $(CLI_APIDEC) $(CLI_APIREND) $(CLI_APIPOSTREND) +all: $(CLI_APIENC) $(CLI_APIDEC) $(CLI_APIREND) $(CLI_APIPOSTREND) $(CLI_AMBICONVERT) $(OBJDIR): $(QUIET)mkdir -p $(OBJDIR) -- GitLab From 8fc3d71d26ffe4d751bba65329781d88b1f20aa0 Mon Sep 17 00:00:00 2001 From: Dominik Weckbecker Date: Thu, 6 Nov 2025 09:33:48 +0100 Subject: [PATCH 2/4] add usage info for ambi_converter to readme.txt --- readme.txt | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/readme.txt b/readme.txt index 54b602c995..4f3d248de9 100644 --- a/readme.txt +++ b/readme.txt @@ -411,7 +411,22 @@ omitted, the LFE input is downmixed to all channels with a factor of 1/N. Positi the LFE channel. Maximum number of supported loudskpeakers N is 16. An example custom loudspeaker layout file is available: ls_setup_16ch_8+4+4.txt - +The usage of the "ambi_conveter" program +------------------------------------------ + +Usage: ./ambi_converter input_file output_file input_convention output_convention + +input_convention and output convention must be an integer number in [0,5] +the following conventions are supported: +0 : ACN-SN3D +1 : ACN-N3D +2 : FuMa-MaxN +3 : FuMa-FuMa +4 : SID-SN3D +5 : SID-N3D + +Either the input or the output convention must always be ACN-SN3D! + RUNNING THE SELF TEST ===================== -- GitLab From a41116af15a55e4eecd6372447ffb5b439ba2ae9 Mon Sep 17 00:00:00 2001 From: Dominik Weckbecker Date: Thu, 6 Nov 2025 12:06:50 +0100 Subject: [PATCH 3/4] improve readme.txt --- readme.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/readme.txt b/readme.txt index 4f3d248de9..9a8cefd818 100644 --- a/readme.txt +++ b/readme.txt @@ -33,12 +33,13 @@ These files represent the 3GPP EVS Codec Extension for Immersive Voice and Audio Services (IVAS) floating-point C simulation. All code is writtten -in ISO/IEC C99. The system is implemented as four separate programs: +in ISO/IEC C99. The system is implemented as five separate programs: IVAS_cod IVAS Encoder IVAS_dec IVAS Decoder IVAS_rend IVAS External Renderer ISAR_post_rend ISAR Post Renderer + ambi_converter Ambisonics format converter For encoding using the coder program, the input is a binary audio file (*.8k, *.16k, *.32k, *.48k) and the output is a binary @@ -411,10 +412,10 @@ omitted, the LFE input is downmixed to all channels with a factor of 1/N. Positi the LFE channel. Maximum number of supported loudskpeakers N is 16. An example custom loudspeaker layout file is available: ls_setup_16ch_8+4+4.txt -The usage of the "ambi_conveter" program +The usage of the "ambi_converter" program ------------------------------------------ -Usage: ./ambi_converter input_file output_file input_convention output_convention +Usage: ambi_converter input_file output_file input_convention output_convention input_convention and output convention must be an integer number in [0,5] the following conventions are supported: -- GitLab From 4e0712de9049fc8b799be8fdb979bbf326d8bfdb Mon Sep 17 00:00:00 2001 From: Dominik Weckbecker Date: Thu, 6 Nov 2025 12:31:49 +0100 Subject: [PATCH 4/4] align usage info in ambi_c-nverter with readme.txt --- apps/ambi_converter.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/ambi_converter.c b/apps/ambi_converter.c index ea880d26a9..b3fbf85706 100644 --- a/apps/ambi_converter.c +++ b/apps/ambi_converter.c @@ -78,8 +78,8 @@ int main( int argc, char *argv[] ) if ( argc != 5 ) { printf( "----------------------------------------------------------------------------------\n" ); - printf( "Usage:\n" ); - printf( "./ambi_converter input_file output_file input_convention output_convention\n" ); + printf( "\n" ); + printf( "Usage: ambi_converter input_file output_file input_convention output_convention\n" ); printf( "\n" ); printf( "input_convention and output convention must be an integer number in [0,5]\n" ); printf( "the following conventions are supported:\n" ); -- GitLab