Commit 25892568 authored by emerit's avatar emerit
Browse files

fix test non BE

parent 397e5e5a

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -106,7 +106,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

/* #################### End BASOP porting switches ############################ */

lib_util/hrtf_file_reader.c

+7 −7
Original line number Diff line number Diff line
@@ -1916,21 +1916,21 @@ static ivas_error create_fastconv_HRTF_from_rawdata( 
        hrtf_data_rptr += sizeof( uint16_t );





#ifdef USE_NEW_HRTF_BINARY_FILE_FORMAT

#ifdef FIX_OLD_BINARY_FILE // old binary file is wrong

        extern const Word32 fastconvReverberationTimes_fx[CLDFB_NO_CHANNELS_MAX];

        memcpy( f_tmp_brir_reverb, hrtf_data_rptr, CLDFB_NO_CHANNELS_MAX * sizeof( float ) );

        hrtf_data_rptr += CLDFB_NO_CHANNELS_MAX * sizeof( float );

        floatToFixed_arrL( f_tmp_brir_reverb, ( *hHRTF )->fastconvReverberationTimes_fx, Q31, CLDFB_NO_CHANNELS_MAX );

        floatToFixed_arrL( f_tmp_brir_reverb, ( *hHRTF )->fastconvReverberationEneCorrections_fx, Q31, CLDFB_NO_CHANNELS_MAX );



        memcpy( f_tmp_brir_reverb, hrtf_data_rptr, CLDFB_NO_CHANNELS_MAX * sizeof( float ) );

        memcpy( f_tmp_brir_reverb, fastconvReverberationTimes_fx, CLDFB_NO_CHANNELS_MAX * sizeof( float ) );

        hrtf_data_rptr += CLDFB_NO_CHANNELS_MAX * sizeof( float );

        floatToFixed_arrL( f_tmp_brir_reverb, ( *hHRTF )->fastconvReverberationEneCorrections_fx, Q31, CLDFB_NO_CHANNELS_MAX );

#else // old binary file is wrong

        extern const Word32 fastconvReverberationTimes_fx[CLDFB_NO_CHANNELS_MAX];

#else

        memcpy( f_tmp_brir_reverb, hrtf_data_rptr, CLDFB_NO_CHANNELS_MAX * sizeof( float ) );

        hrtf_data_rptr += CLDFB_NO_CHANNELS_MAX * sizeof( float );

        floatToFixed_arrL( f_tmp_brir_reverb, ( *hHRTF )->fastconvReverberationEneCorrections_fx, Q31, CLDFB_NO_CHANNELS_MAX );

        floatToFixed_arrL( f_tmp_brir_reverb, ( *hHRTF )->fastconvReverberationTimes_fx, Q31, CLDFB_NO_CHANNELS_MAX );



        memcpy( f_tmp_brir_reverb, fastconvReverberationTimes_fx, CLDFB_NO_CHANNELS_MAX * sizeof( float ) );

        memcpy( f_tmp_brir_reverb, hrtf_data_rptr, CLDFB_NO_CHANNELS_MAX * sizeof( float ) );

        hrtf_data_rptr += CLDFB_NO_CHANNELS_MAX * sizeof( float );

        floatToFixed_arrL( f_tmp_brir_reverb, ( *hHRTF )->fastconvReverberationEneCorrections_fx, Q31, CLDFB_NO_CHANNELS_MAX );

#endif