Commit f15da7f7 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into 123_basop_test-for-ci-with-ivas-codec-ref

parents c145b97b 41953b39

Makefile

+3 −0
Original line number Diff line number Diff line
@@ -76,6 +76,9 @@ LDLIBS += -lm 


# Clang sanitizer compiler options

CCCLANG = clang

ifeq "$(CLANG)" "0"

CC       = $(CCCLANG)

endif

ifeq "$(CLANG)" "1"

CC       = $(CCCLANG)

CFLAGS  += -fsanitize=memory

Workspace_msvc/lib_dec.vcxproj

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ 
      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>

      <OmitFramePointers>false</OmitFramePointers>

      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>

      <AdditionalIncludeDirectories>..\lib_basop;..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;..\lib_isar;..\lib_rend;..\lib_lc3plus;.%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <AdditionalIncludeDirectories>..\lib_basop;..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;..\lib_isar;..\lib_rend;..\lib_lc3plus;..\lib_util;.%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <StringPooling>true</StringPooling>

      <ExceptionHandling />

apps/decoder.c

+2 −4
Original line number Diff line number Diff line
@@ -1800,10 +1800,8 @@ static void usage_dec( void ) 
    fprintf( stdout, "                      output configuration. ID1, ID2, ID3, ID4 specify the directivity pattern IDs used for\n" );

    fprintf( stdout, "                      ISMs 1,2,3 and 4 respectively. This options needs to be accompanied by a render_config file,\n" );

    fprintf( stdout, "                      otherwise a default directivity pattern is used.\n" );

    fprintf( stdout, "-aeid ID            : Acoustic environment ID (number > 0) or\n" );

    fprintf( stdout, "                      a sequence thereof in the format [ID1:duration1,ID2:duration2...]\n" );

    fprintf( stdout, "                      without braces and spaces, with ':' character separating ID from duration and ',' separating\n" );

    fprintf( stdout, "                      ID and duration pairs, where duration is specified in frames\n" );

    fprintf( stdout, "-aeid ID | File     : Acoustic environment ID (number > 0)\n" );

    fprintf( stdout, "                      alternatively, it can be a text file where each line contains \"ID duration\"\n" );

    fprintf( stdout, "                      for BINAURAL_ROOM_REVERB output configuration.\n" );

    fprintf( stdout, "-obj_edit File      : Object editing instructions file or NULL for built-in example\n" );

    fprintf( stdout, "-level level        : Complexity level, level = (1, 2, 3), will be defined after characterisation. \n" );

apps/renderer.c

+1 −4
Original line number Diff line number Diff line
@@ -1354,15 +1354,12 @@ int main( 
    {

        masaIds[i] = 0u;

    }

#ifdef FIX_1377_HANDLE_ERROR_CODE



    if ( ( error = IVAS_REND_SetObjectIDs( hIvasRend ) ) != IVAS_ERR_OK )

    {

        fprintf( stderr, "\nIVAS_REND_SetObjectIDs: %s\n", ivas_error_to_string( error ) );

        goto cleanup;

    }

#else

    IVAS_REND_SetObjectIDs( hIvasRend );

#endif



    for ( i = 0; i < args.inConfig.numMultiChannelBuses; ++i )

    {

lib_basop/move.h

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
*******************************************************************************************************/



/*====================================================================================

    EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0

    EVS Codec 3GPP TS26.452 Nov 04, 2021. Version 16.4.0

  ====================================================================================*/



#ifndef _MOVE_H