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

Merge branch '1432-makefiles-add-ambi_converter-to-default-build-targets' into 'main' 

Resolve "Makefiles: Add "ambi_converter" to default build targets"

See merge request !2358
parents 3ae058c0 d2f8b072

Makefile

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

apps/ambi_converter.c

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

readme.txt

+18 −2
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) 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,6 +412,21 @@ 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_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!





                       RUNNING THE SELF TEST