Commit 9e70640e authored by BOHMRR's avatar BOHMRR
Browse files

Merge branch 'main' into 14-add-sba-planar-and-order-bits-br-24-to-192

parents 062deef1 c435e0f4

lib_com/ivas_prot.h

+4 −4
Original line number Diff line number Diff line
@@ -5206,7 +5206,7 @@ ivas_error ivas_render_config_init_from_rom( 
#ifdef FIX_I68_MC_REVERB_FOR_514

ivas_error ivas_reverb_open( 

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

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

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

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

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

    const int32_t output_Fs                                     /* i  : output sampling rate                    */
@@ -5226,7 +5226,7 @@ void ivas_reverb_close( 


ivas_error ivas_reverb_process(

    REVERB_HANDLE hReverb,                                      /* i/o: reverb state                            */

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

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

    const int16_t mix_signals,                                  /* i  : add reverb to output signal             */

    float pcm_in[][L_FRAME48k],                                 /* i  : the PCM audio to apply reverb on        */

    float pcm_out[][L_FRAME48k],                                /* o  : the PCM audio with reverb applied       */
@@ -5374,7 +5374,7 @@ void ivas_reverb_calc_color_levels( 


void ivas_reverb_prepare_cldfb_params(

    ivas_roomAcoustics_t *pInput_params,

    AUDIO_CONFIG renderer_config,

    AUDIO_CONFIG input_audio_config,

    int16_t use_brir,

    const int32_t output_Fs,

    float *pOutput_t60,
@@ -5397,7 +5397,7 @@ void ivas_reverb_get_hrtf_set_properties( 
    float **ppHrtf_set_L_im,

    float **ppHrtf_set_R_re,

    float **ppHrtf_set_R_im,

    const AUDIO_CONFIG inp_audio_format,

    const AUDIO_CONFIG input_audio_config,

    const int16_t hrtf_count,

    const int16_t in_freq_count,

    const int16_t out_freq_count,

lib_com/options.h

+1 −3
Original line number Diff line number Diff line
@@ -154,12 +154,10 @@ 
#define ORDER_BITS_ADDITION                             /* Adding order and planar bits to more spar bitrates */



#define DIRAC_DRCT_GAIN_TUNING



#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 */



/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

lib_com/prot.h

+5 −0
Original line number Diff line number Diff line
@@ -2777,6 +2777,11 @@ void fb_tbe_dec( 
    const float fb_exc[], /* i  : FB excitation from the SWB part         */

    float *hb_synth,      /* i/o: high-band synthesis                     */

    float *fb_synth_ref   /* o  : high-band synthesis 16-20 kHz           */

#ifdef FIX_I25_FBE_FB_BITS

    ,

    const int16_t output_frame /* i:  output frame length                      */

#endif



);



void calc_tilt_bwe(

lib_dec/evs_dec.c

+13 −5
Original line number Diff line number Diff line
@@ -319,7 +319,11 @@ ivas_error evs_dec( 
            /* FB TBE decoder */

            if ( output_frame == L_FRAME48k && st->extl == FB_TBE )

            {

#ifdef FIX_I25_FBE_FB_BITS

                fb_tbe_dec( st, fb_exc, hb_synth, NULL, L_FRAME48k );

#else

                fb_tbe_dec( st, fb_exc, hb_synth, NULL );

#endif

            }

        }

        else if ( st->extl == SWB_BWE || st->extl == FB_BWE || ( st->output_Fs >= 32000 && st->core == ACELP_CORE && st->bwidth > NB && st->bws_cnt > 0 && !st->ppp_mode_dec && !( st->nelp_mode_dec == 1 && st->bfi == 1 ) ) )
@@ -600,7 +604,11 @@ ivas_error evs_dec( 


                        if ( st->extl == FB_TBE && output_frame == L_FRAME48k )

                        {

#ifdef FIX_I25_FBE_FB_BITS

                            fb_tbe_dec( st, fb_exc, hb_synth, NULL, L_FRAME48k );

#else

                            fb_tbe_dec( st, fb_exc, hb_synth, NULL );

#endif

                        }

                    }

                    mvr2r( hb_synth, st->hBWE_TD->old_hb_synth, output_frame );

lib_dec/ivas_core_dec.c

+13 −6
Original line number Diff line number Diff line
@@ -531,10 +531,17 @@ ivas_error ivas_core_dec( 
            swb_tbe_dec( st, hStereoICBWE, bwe_exc_extended[n], voice_factors[n], old_syn_12k8_16k[n], tmp_buffer /*fb_exc*/, hb_synth[n], pitch_buf[n] );



            /* FB TBE decoder */

#ifdef FIX_I25_FBE_FB_BITS

            if ( st->extl == FB_TBE )

            {

                fb_tbe_dec( st, tmp_buffer /*fb_exc*/, hb_synth[n], tmp_buffer /*fb_synth_ref*/, output_frame );

            }

#else

            if ( output_frame == L_FRAME48k && st->extl == FB_TBE )

            {

                fb_tbe_dec( st, tmp_buffer /*fb_exc*/, hb_synth[n], tmp_buffer /*fb_synth_ref*/ );

            }

#endif

        }

        else if ( st->extl == SWB_BWE || st->extl == FB_BWE || ( output_Fs >= 32000 && st->core == ACELP_CORE && st->bwidth > NB && st->bws_cnt > 0 && !st->ppp_mode_dec && !( st->nelp_mode_dec == 1 && st->bfi == 1 ) ) )

        {