Commit 2fb14e0d authored by liksonov's avatar liksonov
Browse files

Merge branch '68-fix-reverb-hrtf-processing-for-5-1-4-input' into 'main' 

Resolve "Fix reverb HRTF processing for 5.1.4 input audio format". Accept compiler switch.

See merge request !78
parents ccef3d57 760b8a2a

lib_com/ivas_prot.h

+0 −4
Original line number Diff line number Diff line
@@ -5206,9 +5206,7 @@ ivas_error ivas_render_config_init_from_rom( 


ivas_error ivas_reverb_open( 

    REVERB_HANDLE *hReverb,                                     /* i/o: Reverberator handle                     */

#ifdef FIX_I68_MC_REVERB_FOR_514    

    const AUDIO_CONFIG input_audio_config,                      /* i  : reverb. input audio configuration       */

#endif

    const HRTFS_HANDLE hHrtf,                                   /* i  : HRTF handle                             */

    RENDER_CONFIG_DATA *pConfig,                                /* i  : Reverb configuration                    */

    const int32_t output_Fs                                     /* i  : output sampling rate                    */
@@ -5390,9 +5388,7 @@ void ivas_reverb_get_hrtf_set_properties( 
    float **ppHrtf_set_L_im,

    float **ppHrtf_set_R_re,

    float **ppHrtf_set_R_im,

#ifdef FIX_I68_MC_REVERB_FOR_514

    const AUDIO_CONFIG input_audio_config,

#endif

    const int16_t hrtf_count,

    const int16_t in_freq_count,

    const int16_t out_freq_count,

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -152,7 +152,6 @@ 


#define DIRAC_DRCT_GAIN_TUNING                          /* issue 64: tuning of DirAC energy-compensation gains */

#define FIX_34                                          /* Nokia: Fix bug in MASA format EXT output spherical indexing */

#define FIX_I68_MC_REVERB_FOR_514                       /* Fix HRTF processing for Jot reverb in case of 5.1.4 input format */

#define FIX_I54_LS_CONVERSION                           /* FhG: fix incorrect downmix matrix for 5_1_4 to 5_1_2 and upmix matrix for 7_1 to 7_1_4 */

#define FIX_I25_FBE_FB_BITS                             /* issue 25: properly skip reading of TBE FB bits when decoder output sampling rate is not 48 kHz */

#define ORDER_BITS_ADDITION                             /* issue 14: Transmit SBA order and planar bits at all bitrates */

lib_dec/ivas_crend.c

+0 −4
Original line number Diff line number Diff line
@@ -784,11 +784,7 @@ ivas_error ivas_crend_open( 


        if ( ( ( st_ivas->hRenderConfig != NULL ) && st_ivas->hRenderConfig->roomAcoustics.late_reverb_on ) )

        {

#ifdef FIX_I68_MC_REVERB_FOR_514

            if ( ( error = ivas_reverb_open( &( hCrend->hReverb ), st_ivas->intern_config, hHrtf, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )

#else /* FIX_I68_MC_REVERB_FOR_514 */

            if ( ( error = ivas_reverb_open( &( hCrend->hReverb ), hHrtf, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )

#endif /* FIX_I68_MC_REVERB_FOR_514 */

            {

                return error;

            }

lib_dec/ivas_objectRenderer.c

+0 −4
Original line number Diff line number Diff line
@@ -308,11 +308,7 @@ ivas_error ObjRenderIVASFrame( 
        {

            if ( st_ivas->ini_frame == 0 )

            {

#ifdef FIX_I68_MC_REVERB_FOR_514

                ivas_reverb_open( &st_ivas->hCrend->hReverb, st_ivas->transport_config, NULL, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs );

#else /* FIX_I68_MC_REVERB_FOR_514 */

                ivas_reverb_open( &st_ivas->hCrend->hReverb, NULL, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs );

#endif /* FIX_I68_MC_REVERB_FOR_514 */

            }

            for ( subframe_idx = 0; subframe_idx < 4; subframe_idx++ )

            {

lib_dec/ivas_reverb.c

+0 −13
Original line number Diff line number Diff line
@@ -786,9 +786,7 @@ static void set_fft_and_datablock_sizes( 


static void set_reverb_acoustic_data( 

    ivas_reverb_params_t *pParams, 

#ifdef FIX_I68_MC_REVERB_FOR_514

    const AUDIO_CONFIG input_audio_config, 

#endif

    const HRTFS_HANDLE hHrtf, 

    ivas_roomAcoustics_t *pRoomAcoustics, 

    const int16_t subframe_len,
@@ -831,13 +829,8 @@ static void set_reverb_acoustic_data( 
        }



        /* Compute HRTF set properties using frequency-domain HRTF data */

#ifdef FIX_I68_MC_REVERB_FOR_514

        ivas_reverb_get_hrtf_set_properties( pHrtf_set_l_re, pHrtf_set_l_im, pHrtf_set_r_re, pHrtf_set_r_im, input_audio_config, hHrtf->max_num_ir, subframe_len,

                                             nr_fc_fft_filter, pParams->pHrtf_avg_pwr_response_l, pParams->pHrtf_avg_pwr_response_r, pParams->pHrtf_inter_aural_coherence );

#else /* FIX_I68_MC_REVERB_FOR_514 */

        ivas_reverb_get_hrtf_set_properties( pHrtf_set_l_re, pHrtf_set_l_im, pHrtf_set_r_re, pHrtf_set_r_im, hHrtf->max_num_ir, subframe_len,

                                             nr_fc_fft_filter, pParams->pHrtf_avg_pwr_response_l, pParams->pHrtf_avg_pwr_response_r, pParams->pHrtf_inter_aural_coherence );

#endif /* FIX_I68_MC_REVERB_FOR_514 */



        pParams->pHrtf_avg_pwr_response_l_const = (const float *) pParams->pHrtf_avg_pwr_response_l;

        pParams->pHrtf_avg_pwr_response_r_const = (const float *) pParams->pHrtf_avg_pwr_response_r;
@@ -944,9 +937,7 @@ static ivas_error setup_FDN_branches( 


ivas_error ivas_reverb_open(

    REVERB_HANDLE *hReverb,               /* i/o: Reverberator handle               */

#ifdef FIX_I68_MC_REVERB_FOR_514

    const AUDIO_CONFIG input_audio_config,/* i  : reverb. input audio configuration */

#endif

    const HRTFS_HANDLE hHrtf,             /* i  : HRTF handle                       */

    RENDER_CONFIG_HANDLE hRenderConfig,   /* i  : Renderer configuration handle     */

    const int32_t output_Fs               /* i  : output sampling rate              */
@@ -1022,11 +1013,7 @@ ivas_error ivas_reverb_open( 
    }



    /* set up reverb acoustic data on the basis of HRTF data and renderer config  */

#ifdef FIX_I68_MC_REVERB_FOR_514

    set_reverb_acoustic_data( &params, input_audio_config, hHrtf, &hRenderConfig->roomAcoustics, subframe_len, nr_fc_input, nr_fc_fft_filter );

#else /* FIX_I68_MC_REVERB_FOR_514 */

    set_reverb_acoustic_data( &params, hHrtf, &hRenderConfig->roomAcoustics, subframe_len, nr_fc_input, nr_fc_fft_filter );

#endif /* FIX_I68_MC_REVERB_FOR_514 */



    /*  set up input downmix  */

    pState->dmx_gain = calc_dmx_gain();