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

Added ROM tables containing HRTF statistics for reverb coloration and... 

Added ROM tables containing HRTF statistics for reverb coloration and correlation filtering in Word32 format
parent d2ae3897

apps/decoder.c

+2 −0
Original line number Diff line number Diff line
@@ -735,6 +735,7 @@ cleanup: 
        destroy_td_hrtf( hHrtfBinary.hHrtfTD );

        destroy_hrtf_statistics( hHrtfBinary.hHrtfStatistics );

    }

#ifndef FIX_BASOP_2059_REVERB_MEMORY

#ifdef FIX_1990_SANITIZER_IN_REVERB_LOAD

    // TODO:

    /* This free differs from float version.
@@ -742,6 +743,7 @@ cleanup: 
    IVAS_DEC_HRTF_STATISTICS_HANDLE *hHrtfStatistics = NULL;

    IVAS_DEC_GetHrtfStatisticsHandle( hIvasDec, &hHrtfStatistics );

    destroy_hrtf_statistics( hHrtfStatistics );

#endif

#endif

    IVAS_DEC_Close( &hIvasDec );

    CustomLsReader_close( &hLsCustomReader );

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ 
#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define FIX_1435_MOVE_STEREO_PANNING                    /* VA: issue 1435: do the EVS stereo panning in the renderer */

#define FIX_BASOP_2059_REVERB_MEMORY                    /* Philips: Fix for reverb memory non-optimality */

#define FIX_BASOP_2201_HARMONIZE_HRTF_FILE_READER_CREND /* OR : Fix issue basop 2201 hrtf_file_reader crend differs between basop ivas-main and ivas-float-update */

#define FIX_2245_INIT_FD_CNG_EVS                        /* Dolby/VA: Issue 2245: initialize FD CNG with EVS-type of init function */

#define FIX_2252_SCALING_SAVE_HB_SYNTH                  /* VA: issue 2252: fix use-of-uninit-value in save_hb_synth_fx[] scaling in FOA decoding with bitstream that starts with an SID */

lib_rend/ivas_hrtf_fx.c

+22 −0
Original line number Diff line number Diff line
@@ -343,6 +343,27 @@ ivas_error ivas_HRTF_statistics_init_fx( 
    HrtfStatistics->average_energy_r = NULL;

    HrtfStatistics->inter_aural_coherence = NULL;



#ifdef FIX_BASOP_2059_REVERB_MEMORY

    SWITCH(sampleRate)

    {

        case 48000:

            HrtfStatistics->average_energy_l = defaultHRIR_left_avg_power_48kHz_fx;

            HrtfStatistics->average_energy_r = defaultHRIR_left_avg_power_48kHz_fx;

            HrtfStatistics->inter_aural_coherence = defaultHRIR_left_avg_power_48kHz_fx;

            BREAK;

        case 32000:

            HrtfStatistics->average_energy_l = defaultHRIR_left_avg_power_32kHz_fx;

            HrtfStatistics->average_energy_r = defaultHRIR_left_avg_power_32kHz_fx;

            HrtfStatistics->inter_aural_coherence = defaultHRIR_left_avg_power_32kHz_fx;

            BREAK;

        case 16000:

            HrtfStatistics->average_energy_l = defaultHRIR_left_avg_power_16kHz_fx;

            HrtfStatistics->average_energy_r = defaultHRIR_left_avg_power_16kHz_fx;

            HrtfStatistics->inter_aural_coherence = defaultHRIR_left_avg_power_16kHz_fx;

            BREAK;

    }

#else



    SWITCH( sampleRate )

    {

        case 48000:
@@ -418,6 +439,7 @@ ivas_error ivas_HRTF_statistics_init_fx( 
    HrtfStatistics->fromROM = TRUE;

#ifdef FIX_1990_SANITIZER_IN_REVERB_LOAD

    HrtfStatistics->fromROM = FALSE; // TODO: temporary hack until HRTF statistics ROM tables are converted from Word16 to Word32

#endif

#endif



    *hHrtfStatistics = HrtfStatistics;

lib_rend/ivas_rom_binaural_crend_head.h

+21 −0
Original line number Diff line number Diff line
@@ -327,6 +327,26 @@ extern const Word16 CRendBin_Combined_BRIR_coeff_diffuse_im_16kHz_fx[BINAURAL_CH 


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



#ifdef FIX_BASOP_2059_REVERB_MEMORY

/* Sample Rate = 48000 */



extern const Word32 defaultHRIR_coherence_48kHz_fx[LR_IAC_LENGTH_NR_FC];

extern const Word32 defaultHRIR_left_avg_power_48kHz_fx[LR_IAC_LENGTH_NR_FC];

extern const Word32 defaultHRIR_right_avg_power_48kHz_fx[LR_IAC_LENGTH_NR_FC];



/* Sample Rate = 32000 */



extern const Word32 defaultHRIR_coherence_32kHz_fx[LR_IAC_LENGTH_NR_FC];

extern const Word32 defaultHRIR_left_avg_power_32kHz_fx[LR_IAC_LENGTH_NR_FC];

extern const Word32 defaultHRIR_right_avg_power_32kHz_fx[LR_IAC_LENGTH_NR_FC];



/* Sample Rate = 16000 */



extern const Word32 defaultHRIR_coherence_16kHz_fx[LR_IAC_LENGTH_NR_FC_16KHZ];

extern const Word32 defaultHRIR_left_avg_power_16kHz_fx[LR_IAC_LENGTH_NR_FC_16KHZ];

extern const Word32 defaultHRIR_right_avg_power_16kHz_fx[LR_IAC_LENGTH_NR_FC_16KHZ];



#else

/* Sample Rate = 48000 */



extern const Word16 defaultHRIR_Q_48kHz_fx;
@@ -348,4 +368,5 @@ extern const Word16 defaultHRIR_coherence_16kHz_fx[LR_IAC_LENGTH_NR_FC_16KHZ]; 
extern const Word16 defaultHRIR_left_avg_power_16kHz_fx[LR_IAC_LENGTH_NR_FC_16KHZ];

extern const Word16 defaultHRIR_right_avg_power_16kHz_fx[LR_IAC_LENGTH_NR_FC_16KHZ];



#endif

#endif /* _IVAS_ROM_BINAURAL_CREND_HEAD_ */

lib_rend/ivas_rom_binaural_crend_head_fx.c

+273 −7

File changed.

Preview size limit exceeded, changes collapsed.