Commit 4d9cf56c authored by multrus's avatar multrus
Browse files

Merge branch '2195_basop_portFlp2358_AmbiConvert' into 'main' 

Port Flp MR 2358 to main - Makefiles: Add "ambi_converter" to default build targets

Closes #2195

See merge request !2527
parents 924b04b3 8a8af21b

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -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)
@@ -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)

apps/ambi_converter.c

+3 −2
Original line number Diff line number Diff line
@@ -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
@@ -78,8 +79,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" );

readme.txt

+19 −1
Original line number Diff line number Diff line
@@ -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