Commit 5f3a1729 authored by emerit's avatar emerit
Browse files

gix non BE test

parent 681b3533

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -190,7 +190,8 @@ 
#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES

#define NONBE_FIX_AVG_IAC_CLDFB_REVERB

#endif

#define FIX_OLD_BINARY_FORMAT      

#define FIX_OLD_BINARY_FORMAT                           /* Orange: trick to make tests succesful when changing hrtf binary format between ref and new branch*/      

#define FIX_OLD_BINARY_FILE                             /* Orange: current hrtf binary file in ref branch contains wrong values for fastconv value. This switch can be activated to compre running codec with and without hrtf file*/      

#endif

#define NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA                 /* Nokia: issue 944: fix FEC error in OMASA */

#define NONBE_FIX_949_MC_5MS_FRAMING                    /*Dlb: Issue 949: fix for 5ms framing/rendering in MC mode */

lib_util/hrtf_file_reader.c

+6 −6
Original line number Diff line number Diff line
@@ -1673,17 +1673,17 @@ static ivas_error create_fastconv_HRTF_from_rawdata( 
        }

        hrtf_data_rptr += sizeof( uint16_t );



#ifdef USE_NEW_HRTF_BINARY_FILE_FORMAT

        memcpy( ( *hHRTF )->fastconvReverberationTimes, hrtf_data_rptr, CLDFB_NO_CHANNELS_MAX * sizeof( float ) );

        hrtf_data_rptr += CLDFB_NO_CHANNELS_MAX * sizeof( float );

        memcpy( ( *hHRTF )->fastconvReverberationEneCorrections, hrtf_data_rptr, CLDFB_NO_CHANNELS_MAX * sizeof( float ) );

        hrtf_data_rptr += CLDFB_NO_CHANNELS_MAX * sizeof( float );

#else // old binary file is wrong

#ifdef FIX_OLD_BINARY_FILE // old binary file contains wrong value use default one instead

        extern const Word32 fastconvReverberationTimes[CLDFB_NO_CHANNELS_MAX];

        memcpy( ( *hHRTF )->fastconvReverberationEneCorrections, hrtf_data_rptr, CLDFB_NO_CHANNELS_MAX * sizeof( float ) );

        hrtf_data_rptr += CLDFB_NO_CHANNELS_MAX * sizeof( float );

        memcpy( ( *hHRTF )->fastconvReverberationTimes, fastconvReverberationTimes, CLDFB_NO_CHANNELS_MAX * sizeof( float ) );

        hrtf_data_rptr += CLDFB_NO_CHANNELS_MAX * sizeof( float );

#else

        memcpy( ( *hHRTF )->fastconvReverberationTimes, hrtf_data_rptr, CLDFB_NO_CHANNELS_MAX * sizeof( float ) );

        hrtf_data_rptr += CLDFB_NO_CHANNELS_MAX * sizeof( float );

        memcpy( ( *hHRTF )->fastconvReverberationEneCorrections, hrtf_data_rptr, CLDFB_NO_CHANNELS_MAX * sizeof( float ) );

        hrtf_data_rptr += CLDFB_NO_CHANNELS_MAX * sizeof( float );

#endif

    }