Commit d3413dd5 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_638_ENERGIE_IAC_ROM_TABLES

parent 1e778f66

apps/decoder.c

+0 −4
Original line number Diff line number Diff line
@@ -746,7 +746,6 @@ int main( 
#endif



#ifndef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

        if ( ( *hHrtfTD != NULL ) && ( error = load_reverb_binary( *hHrtfTD, hrtfReader ) ) != IVAS_ERR_OK )

        {
@@ -764,7 +763,6 @@ int main( 
        }

#endif

#endif

#endif



#ifndef NONBE_FIX_BINARY_BINAURAL_READING

        IVAS_DEC_HRTF_CREND_HANDLE hSetOfHRTF = NULL;
@@ -855,7 +853,6 @@ int main( 
#endif



#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

        if ( ( error = IVAS_DEC_GetHrtfStatisticsHandle( hIvasDec, &hHrtfStatistics ) ) != IVAS_ERR_OK )

        {
@@ -881,7 +878,6 @@ int main( 
            goto cleanup;

        }

#endif

#endif

#endif

    }

apps/renderer.c

+0 −4
Original line number Diff line number Diff line
@@ -1057,7 +1057,6 @@ int main( 
            }



#ifndef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES

            if ( ( hHrtfTD != NULL ) && ( error = load_reverb_binary( *hHrtfTD, hrtfFileReader ) ) != IVAS_ERR_OK )

            {

                if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
@@ -1066,7 +1065,6 @@ int main( 
                    goto cleanup;

                }

            }

#endif

#endif



            if ( ( error = IVAS_REND_GetHrtfCRendHandle( hIvasRend, &hSetOfHRTF ) ) != IVAS_ERR_OK )
@@ -1127,7 +1125,6 @@ int main( 
            }



#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES

            if ( ( error = IVAS_REND_GetHrtfStatisticsHandle( hIvasRend, &hHrtfStatistics ) ) != IVAS_ERR_OK )

            {

                fprintf( stderr, "\nIVAS_REND_GetHrtfStatisticsHandle failed\n\n" );
@@ -1145,7 +1142,6 @@ int main( 
                    destroy_hrtf_statistics( hHrtfStatistics );

                }

            }

#endif

#endif

        }

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -151,7 +151,6 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



#define FIX_638_ENERGIE_IAC_ROM_TABLES                  /* Orange: Missing left/right and coherence late reverb tables in binary format*/

#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 */

lib_rend/ivas_objectRenderer_mix.c

+0 −2
Original line number Diff line number Diff line
@@ -38,9 +38,7 @@ 
#include "ivas_error.h"

#include "wmc_auto.h"

#include "ivas_rom_rend.h"

#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES

#include "ivas_rom_binaural_crend_head.h"

#endif

#ifdef DEBUGGING

#include "debug.h"

#endif

lib_rend/ivas_rom_binaural_crend_head.c

+0 −2
Original line number Diff line number Diff line
@@ -7228,7 +7228,6 @@ const float CRendBin_Combined_BRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS][247 
};



























#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES





























/********************** default HRIR reverb rom tables **********************/
























@@ -7475,7 +7474,6 @@ const float defaultHRIR_right_avg_power_16kHz[LR_IAC_LENGTH_NR_FC_16KHZ] =













        0.408843f, 0.386537f, 0.364127f, 0.342285f, 0.321676f, 0.302809f, 0.286016f, 0.271535f, 0.259640f, 















        0.250692f, 0.245099f, 0.243192f};



























#endif











































#undef WMC_TOOL_SKIP