Commit f5e561ee authored by emerit's avatar emerit
Browse files

bug fix l/r energies and iac computation NONBE_FIX_AVG_IAC_CLDFB_REVERB

parent e4514f1e
Loading
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -1632,6 +1632,9 @@ typedef enum
#define MAX_INTERPOLATION_STEPS                 12

#define LR_IAC_LENGTH_NR_FC                     ( RV_LENGTH_NR_FC )
#ifdef NONBE_FIX_AVG_IAC_CLDFB_REVERB
#define LR_IAC_LENGTH_NR_FC_16KHZ               ( RV_LENGTH_NR_FC_16KHZ )
#endif

/* ----- Enums - TD Renderer ----- */

@@ -1684,7 +1687,9 @@ typedef enum
#define RV_FILTER_MAX_FFT_SIZE                  ( 512 )
#define RV_FILTER_MAX_HISTORY                   ( 512 - 160 )               /* for longest history */
#define RV_LENGTH_NR_FC                         ( RV_FILTER_MAX_FFT_SIZE / 2 ) + 1

#ifdef NONBE_FIX_AVG_IAC_CLDFB_REVERB
#define RV_LENGTH_NR_FC_16KHZ                   ( RV_FILTER_MAX_FFT_SIZE / 4 ) + 1
#endif
#define IVAS_REVERB_DEFAULT_N_BANDS             31


+1 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@
#define NONBE_FIX_856_TCX_LTP_SYNTH_FILTER                    /* FhG: issue 856: correct filtering length for tcx-ltp synth filtering*/
#define NONBE_UNIFIED_DECODING_PATHS                          /* FhG: unify decoding paths   */
#define NONBE_FIX_BINARY_BINAURAL_READING                     /* Add support for reading binaural binary file */
#define NONBE_FIX_AVG_IAC_CLDFB_REVERB                        /* Add computation avg energy and iac tables for rom and binaural binary file */
#ifdef NONBE_UNIFIED_DECODING_PATHS
#define NONBE_UNIFIED_DECODING_PATHS_FIX                      /* VA: issue 876: fixes within NONBE_UNIFIED_DECODING_PATHS */
#endif
+11 −1
Original line number Diff line number Diff line
@@ -714,6 +714,14 @@ void ivas_reverb_get_hrtf_set_properties(
        const float norm_freq = out_freq_step * out_bin_idx;

        /* Computing the bin index in the source data */
#ifdef NONBE_FIX_AVG_IAC_CLDFB_REVERB
        if ( in_freq_count == out_freq_count )
        {
            base_idx = out_bin_idx;
        }
        else
        {
#endif
        const float tbl_index = ( norm_freq - inp_freq_offset ) / inp_freq_step;

        if ( tbl_index <= 0.0f ) /* In case of extrapolation (below 1st bin), choose nearest */
@@ -731,7 +739,9 @@ void ivas_reverb_get_hrtf_set_properties(
                relative_pos = 1.0f;
            }
        }

#ifdef NONBE_FIX_AVG_IAC_CLDFB_REVERB
        }
#endif
        /* Computing 2 bins data for later interpolation */

        /* Zeroing before accumalation for average value computing */
+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@
*******************************************************************************************************/
/*
 * Generated on 27-Nov-2023 with Matlab version 23.2.0.2365128 (R2023b) by MUXE6256 on PCWIN64
 * Generated on 29-Nov-2023 with Matlab version 23.2.0.2365128 (R2023b) by MUXE6256 on PCWIN64
 * Binaural rendering data set based on BRIRs
 * Tables derived from Mozart IIS BRIRs.*/
+2 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@
/* Tables generated by the script at "scripts/binauralRenderer_interface/fastconv/generate_tables_for_fastconv.m */
/* Can be replaced by your own generated HRIR tables */
/*
 * Generated on 27-Nov-2023 with Matlab version 23.2.0.2365128 (R2023b) by MUXE6256 on PCWIN64
 * Generated on 29-Nov-2023 with Matlab version 23.2.0.2365128 (R2023b) by MUXE6256 on PCWIN64
*/
@@ -46955,7 +46955,7 @@ const float fastconvReverberationEneCorrections[CLDFB_NO_CHANNELS_MAX] =
/*
 * Generated on 27-Nov-2023 with Matlab version 23.2.0.2365128 (R2023b) by MUXE6256 on PCWIN64
 * Generated on 29-Nov-2023 with Matlab version 23.2.0.2365128 (R2023b) by MUXE6256 on PCWIN64
 * Binaural rendering data set based on BRIRs 
 Tables derived from Mozart IIS BRIRs.*/
Loading