Commit 33909c4b authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch 'main' of ssh://forge.3gpp.org:29419/ivas-codec-pc/ivas-codec... 

Merge branch 'main' of ssh://forge.3gpp.org:29419/ivas-codec-pc/ivas-codec into 1419-enable-rendering-to-all-output-formats-for-evs-mono-and-ivas-stereo-bitstreams-non-spatial
parents d66d77c6 d2b4a887

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" );

lib_com/ivas_cnst.h

+4 −0
Original line number Diff line number Diff line
@@ -1487,6 +1487,10 @@ typedef enum 


#define VBAP_NUM_SEARCH_SECTORS                 4



#ifdef NONBE_FIX_1426_STEREO_PANNING_BETWEEN_OPT_LEVEL

#define LS_ANGLE_RAD_30_DEG                     0.52359879f                /* 30.0f * PI_OVER_180 */

#define INV_TAN_LS_ANGLE_RAD_30_DEG             1.7320507f                 /* 1.0f/tanf(30.0f * PI_OVER_180) */

#endif



/*----------------------------------------------------------------------------------*

 * Binaural Rendering Constants

lib_com/ivas_prot.h

+1 −1
Original line number Diff line number Diff line
@@ -1148,7 +1148,7 @@ void ivas_param_ism_dec_render( 
    const uint16_t nSamplesAsked,                               /* i  : number of CLDFB slots requested             */

    uint16_t *nSamplesRendered,                                 /* o  : number of CLDFB slots rendered              */

    uint16_t *nSamplesAvailable,                                /* o  : number of CLDFB slots still to render       */

    float *output_f[]                                           /* o  : rendered time signal                        */

    float *output_f[]                                           /* i/o: synthesized core-coder TCs / rendered signal*/

);



void ivas_param_ism_params_to_masa_param_mapping(

lib_com/options.h

+4 −1
Original line number Diff line number Diff line
@@ -191,7 +191,10 @@ 
#define NONBE_FIX_NONBE_BETWEEN_OPTIMIZATION_LEVELS    /* FhG: fix non-BE in DFT stereo encoder between optimization levels */

#define NONBE_FIX_NONBE_BETWEEN_OPTIMIZATION_LEVELS_2  /* FhG: fix even more non-BEnesses */

#define NONBE_1324_TC_BUFFER_MEMOERY_KEEP               /* VA: issue 1324: do not reset TSM memory in JBM bitrate switching */

#define FIX_1330_JBM_MEMORY_FIX                         /* VA: basop issue: 2179 fix non-BE difference in FIX_1330_JBM_MEMORY */

#define NONBE_1380_OMASA_BUILD_DIFF                     /* Nokia: Fix for issue #1380: Large differences in OMASA output between Debug and Release builds */

#define NONBE_FIX_1426_STEREO_PANNING_BETWEEN_OPT_LEVEL /* Nokia: Adjustments in remaining stereo panning functions to make them BE between Debug and Release */





/* ##################### End NON-BE switches ########################### */