Commit b0a067ff authored by emerit's avatar emerit
Browse files

FIX 638 ok

parent ab79e0e3

apps/decoder.c

+7 −0
Original line number Diff line number Diff line
@@ -744,6 +744,13 @@ int main( 
            goto cleanup;

        }



#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES

        if ( ( error = load_reverb_binary( hHrtfTD, hrtfReader ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );

            goto cleanup;

        }

#endif

        IVAS_DEC_HRTF_CREND_HANDLE hSetOfHRTF = NULL;

        if ( ( error = IVAS_DEC_GetHrtfCRendHandle( hIvasDec, &hSetOfHRTF ) ) != IVAS_ERR_OK )

        {

lib_com/ivas_cnst.h

+4 −1
Original line number Diff line number Diff line
@@ -118,7 +118,10 @@ typedef enum 
    RENDERER_NON_DIEGETIC_DOWNMIX,

    RENDERER_OSBA_STEREO,

    RENDERER_OSBA_AMBI,

    RENDERER_OSBA_LS

    RENDERER_OSBA_LS,

 #ifdef FIX_638_ENERGIE_IAC_ROM_TABLES   

    RENDERER_BINAURAL_REVERB_ALL,

#endif    

} RENDERER_TYPE;



#ifdef DEBUGGING

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ 
#define NONBE_FIX_746_NONDIEGETIC_MD                          /* Eri: Issue 746: The non-diegetic panning flag affects the encoder bitstream even if extended metadata is not enabled. Crashes the decoder.*/



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



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

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



/* ################## End DEVELOPMENT switches ######################### */

lib_rend/ivas_objectRenderer_mix.c

+3 −0
Original line number Diff line number Diff line
@@ -38,6 +38,9 @@ 
#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

+4083 −3778

File changed.

Preview size limit exceeded, changes collapsed.