Commit b0765ffd authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Merge branch '744_step3_code_changes' to... 

Merge branch '744_step3_code_changes' to '922-use-precomputed-HRTF-average-LR-energies-and-IAC-in-all-renderers'
parents f55d62bf 85814fe3

lib_com/options.h

+3 −0
Original line number Diff line number Diff line
@@ -155,6 +155,9 @@ 
#define FIX_638_ENERGIE_IAC_ROM_TABLES                  /* Orange : Missing left/right and coherence late reverb tables in binary format*/

#define FIX_OLD_BINARY_FORMAT                           /* Orange: temporary to maintain bitexactness */

#define FIX_WARNING_RENDER_CONFIG                       /* Orange: fix warning on windows build */

#define FIX_WARNING_SPLIT_RENDER                        /* Orange: fix warning on windows build vscode */

#define FIX_INV_DIFFUSE_WEIGHT                          /* Orange : Fix error in energy compensation in late binaural reverb*/

#define FIX_20_MS_FRAME_LEN_TABLES_CONVERTER            /* Orange : generate_tables_converter tools can generate rom for 5 and 20 ms frame length */

#define FIX_957_REMOVE_PANNING_DEAD_CODE                /* VA: Remove obsolete non-diegetic panning related code. */



/* #################### End BE switches ################################## */

lib_rend/lib_rend.c

+6 −0
Original line number Diff line number Diff line
@@ -2941,7 +2941,13 @@ static ivas_error setRendInputActiveSplitPostRend( 
#ifdef NONBE_FIX_BINARY_BINAURAL_READING

    ,

#if defined _MSC_VER && !defined __clang__

#ifdef _MSC_VER

#pragma warning( disable : 4100 )

#endif

    hrtf_handles *hrtfs

#ifdef _MSC_VER

#pragma warning( default : 4100 )

#endif

#else

    hrtf_handles *hrtfs __attribute__( ( unused ) ) /* avoid unused parameter warning when compiling with clang */

#endif

lib_util/split_render_file_read_write.c

+4 −0
Original line number Diff line number Diff line
@@ -298,7 +298,11 @@ ivas_error split_rend_read_bits_from_file( 
        return IVAS_ERR_FAILED_FILE_READ;

    }



#ifdef FIX_WARNING_SPLIT_RENDER

    header_len = (int32_t) strlen( header );

#else

    header_len = strlen( header );

#endif



    /* read frame header */

    for ( i = 0; i < header_len; i++ )