From 36b3f818b7a1456f9c792d502676aeeaae1437af Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Thu, 6 Nov 2025 20:06:48 +0100 Subject: [PATCH 1/2] port changes from MR 2358 to basop --- Makefile | 2 +- apps/ambi_converter.c | 4 ++-- readme.txt | 20 +++++++++++++++++++- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 4febdc988..6153e1cb4 100644 --- a/Makefile +++ b/Makefile @@ -181,7 +181,7 @@ DEPS = $(addprefix $(OBJDIR)/,$(SRCS_LIBBASOP:.c=.P) $(SRCS_LIBCOM:.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) diff --git a/apps/ambi_converter.c b/apps/ambi_converter.c index 76619c904..895b7c0e6 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" ); diff --git a/readme.txt b/readme.txt index 391e0a35f..d272f7a8c 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) BASOP 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 @@ -376,6 +377,23 @@ Options: -prbfi File : BFI File +The usage of the "ambi_converter" 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! + + MULTICHANNEL LOUDSPEAKER INPUT / OUTPUT CONFIGURATIONS ====================================================== The loudspeaker positions for each MC layouts are assumed to have the following azimuth and elevation -- GitLab From 8a8af21b06ca5bf70d6ca774d1e1091b0f553ca8 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Thu, 6 Nov 2025 21:16:31 +0100 Subject: [PATCH 2/2] add missing dependencies --- Makefile | 2 +- apps/ambi_converter.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6153e1cb4..3edbe9ca7 100644 --- a/Makefile +++ b/Makefile @@ -227,7 +227,7 @@ $(CLI_APIPOSTREND): $(OBJS_CLI_APPPOSTREND) $(LIB_LIBBASOP) $(LIB_LIBISAR) $(LIB $(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APPPOSTREND) -L. -livasbasop -lisar -livasutil -livasdebug -livascom -llc3plus $(LDLIBS) -o $(CLI_APIPOSTREND) $(CLI_AMBICONVERT): $(OBJS_CLI_AMBICONVERT) $(OBJS_AMBICONVERT) $(LIB_LIBBASOP) $(LIB_LIBCOM) - $(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_AMBICONVERT) $(OBJS_AMBICONVERT) -L. -livascom -livasbasop $(LDLIBS) -o $(CLI_AMBICONVERT) + $(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_AMBICONVERT) $(OBJS_AMBICONVERT) -L. -livascom -livasbasop -livasdebug $(LDLIBS) -o $(CLI_AMBICONVERT) libs: $(LIB_LIBBASOP) $(LIB_LIBENC) $(LIB_LIBDEBUG) $(LIB_LIBCOM) $(LIB_LIBDEC) $(LIB_LIBREND) $(LIB_LIBISAR) $(LIB_LC3PLUS) $(LIB_LIBUTIL) diff --git a/apps/ambi_converter.c b/apps/ambi_converter.c index 895b7c0e6..816f96619 100644 --- a/apps/ambi_converter.c +++ b/apps/ambi_converter.c @@ -35,6 +35,7 @@ #include "../lib_util/tinywavein_c.h" #include "../lib_util/tinywaveout_c.h" #include "ambi_convert.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------------------------* * Ambisonics converter program -- GitLab