Commit caeaf269 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch 'cldfb_state_buffers_jbm_struct_cleanup_msan_fixes' into 'main' 

cldfb state float buffers cleanup, jbm structure cleanup, msan fixes

See merge request !355
parents 1b76f43f 825aff9f

lib_com/cldfb.c

+6 −2
Original line number Diff line number Diff line
@@ -731,6 +731,8 @@ void cldfbAnalysis_ts_fx( 
        Copy32( timeIn_fx, timeBuffer_fx + offset, frameSize );

    }



    h_cldfb->Q_cldfb_state = *q_cldfb;



    /* only process needed cols */

    if ( samplesToProcess > -1 )

    {
@@ -968,6 +970,7 @@ void cldfbAnalysis_ts_fx_fixed_q( 
    /* prepare input buffer */

    timeBuffer_fx = buffer_fx;

    Copy32( h_cldfb->cldfb_state_fx, timeBuffer_fx, offset );

    h_cldfb->Q_cldfb_state = *q_cldfb;



    if ( samplesToProcess > -1 )

    {
@@ -1659,7 +1662,7 @@ ivas_error openCldfb_ivas( 
	hs->cldfb_state_length = buf_len;//Temporarily added to store the length of buffer

	hs->cldfb_size = buf_len; /*for having original size at intermediatery conversion, will be removed on removing conversion*/

    set32_fx(hs->cldfb_state_fx, 0, buf_len);

    hs->Q_cldfb_state = Q31;

    hs->Q_cldfb_state = Q11;

#endif // IVAS_FLOAT_FIXED
@@ -1756,7 +1759,7 @@ ivas_error openCldfb_ivas_fx( 
    hs->cldfb_state_length = buf_len; // Temporarily added to store the length of buffer

	hs->cldfb_size = buf_len; /*for having original size at intermediatery conversion, will be removed on removing conversion*/

    set32_fx(hs->cldfb_state_fx, 0, buf_len);



    hs->Q_cldfb_state = Q11;

    /* TODO: remove the floating point dependency */



    IF ( ( hs->cldfb_state = (float *) malloc( buf_len * sizeof( float ) ) ) == NULL )
@@ -2609,6 +2612,7 @@ void cldfb_reset_memory_fx( 
	hs->cldfb_state_length = memory_length;

		/* save the memory */

	set32_fx(hs->cldfb_state_fx, 0, memory_length);

    hs->Q_cldfb_state = Q11;



    return;

}

lib_com/ivas_fb_mixer.c

+1287 −35

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/ivas_prot_fx.h

+17 −0
Original line number Diff line number Diff line
@@ -2225,4 +2225,21 @@ void ivas_lfe_window_init_fx( 
Word16 param_mc_get_num_cldfb_syntheses_fx(

    Decoder_Struct *st_ivas /* i  : Parametric MC handle */

);



ivas_error ivas_FB_mixer_open_fx(

  IVAS_FB_MIXER_HANDLE *hFbMixer_out, /* i/o: FB mixer handle           */

  const Word32 sampling_rate,         /* i  : sampling rate             */

  IVAS_FB_CFG *fb_cfg,                /* i  : FB config. handle         */

  const Word16 spar_reconfig_flag     /* i  : SPAR reconfiguration flag */

);



void ivas_fb_mixer_cross_fading_fx(

  IVAS_FB_MIXER_HANDLE hFbMixer,

  Word32 **ppOut_pcm_fx,

  Word32 *pMdft_out_old_fx,

  Word32 *pMdft_out_new_fx,

  const int16_t ch,

  const int16_t frame_len,

  const int16_t cf_offset );



#endif

lib_com/ivas_rom_com.c

+1373 −0

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/ivas_rom_com.h

+18 −0
Original line number Diff line number Diff line
@@ -532,6 +532,11 @@ extern const Word16 ivas_fb_cf_1ms_16k_fx[IVAS_FB_1MS_16K_SAMP]; 
extern const float ivas_fb_resp_cheby_ramp_32del[IVAS_FB_1MS_32K_SAMP + 1];

extern const float ivas_fb_resp_cheby_ramp_16del[IVAS_FB_1MS_16K_SAMP + 1];



#ifdef IVAS_FLOAT_FIXED

extern const Word32 ivas_fb_resp_cheby_ramp_32del_fx[IVAS_FB_1MS_32K_SAMP + 1];

extern const Word32 ivas_fb_resp_cheby_ramp_16del_fx[IVAS_FB_1MS_16K_SAMP + 1];

#endif



extern const int16_t ivas_num_active_bands[FB - WB + 1];



/*------------------------------------------------------------------------------------------*
@@ -582,5 +587,18 @@ extern const ACPL_QUANT_TABLE ivas_mc_paramupmix_beta_quant_table[9]; 
extern const ACPL_QUANT_TABLE_FX ivas_mc_paramupmix_alpha_quant_table_fx;

extern const ACPL_QUANT_TABLE_FX ivas_mc_paramupmix_beta_quant_table_fx[9];

#endif // IVAS_FLOAT_FIXED



#ifdef IVAS_FLOAT_FIXED

extern const Word32 ivas_han_win_48k_fx[L_FRAME32k];

extern const Word32 ivas_han_win_32k_fx[L_FRAME32k];

extern const Word32 ivas_han_win_16k_fx[L_FRAME32k];



extern const Word32 ivas_sine_delay_32_fx[32];

extern const Word32 ivas_sine_frame_len_640_fx[577];



extern const Word32 ivas_fb_fr_12band_1ms_re_fx[IVAS_FB_12_1MS_LEN];

extern const Word32 ivas_fb_fr_12band_1ms_im_fx[IVAS_FB_12_1MS_LEN];

#endif



/* IVAS_ROM_COM_H */

#endif