Commit 7eb1d2f9 authored by vaclav's avatar vaclav
Browse files

Merge branch 'main' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec

parents 218ceee1 15d38e6c

lib_com/ivas_fb_mixer.c

+7 −3
Original line number Diff line number Diff line
@@ -474,7 +474,11 @@ void ivas_FB_mixer_close( 


void ivas_fb_mixer_pcm_ingest(

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

#ifdef FIX_264_AUDIO_CHANNELS_TO_HEAP

    float *pcm_in[], /* i  : input audio channels        */

#else

    float pcm_in[][L_FRAME48k], /* i  : input audio channels        */

#endif

    float **ppOut_pcm,       /* o  : output audio channels       */

    const int16_t frame_len, /* i  : frame length                */

    const int16_t HOA_md_ind[IVAS_SPAR_MAX_CH] )

lib_com/ivas_prot.h

+249 −10

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/ivas_sba_config.c

+7 −3
Original line number Diff line number Diff line
@@ -316,7 +316,11 @@ void ivas_sba_get_spar_hoa_md_flag( 
 *-------------------------------------------------------------------*/



void ivas_sba_zero_vert_comp(

#ifdef FIX_264_AUDIO_CHANNELS_TO_HEAP

    float *sba_data[], /* i  : SBA signals                 */

#else

    float sba_data[][L_FRAME48k], /* i  : SBA signals                 */

#endif

    const int16_t sba_order,  /* i  : SBA order                   */

    const int16_t sba_planar, /* i  : SBA planar flag             */

    const int16_t input_frame /* i  : frame length                */

lib_com/options.h

+3 −0
Original line number Diff line number Diff line
@@ -248,6 +248,9 @@ 


#define FIX_674_MISSING_TABLES_FOR_TDREND_REVERB        /* Eri: add tables for 32kHz, 16kHz (and update 48kHz) for left/right energies and coherence for late reverb in TD renderer path. Also read tables from binary when hrtf binaries are used. */



#define FIX_264_AUDIO_CHANNELS_TO_HEAP                  /* VA: issue 243: Move audio channels memory from stack to heap */





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



/* #################### Start NON-BE CR switches ########################## */

lib_dec/ivas_agc_dec.c

+9 −4
Original line number Diff line number Diff line
@@ -173,8 +173,13 @@ void ivas_spar_agc_dec_close( 


void ivas_agc_dec_process(

    ivas_agc_dec_state_t *hAgcDec, /* i/o: AGC decoder handle       */

#ifdef FIX_264_AUDIO_CHANNELS_TO_HEAP

    float *pcm_in[],  /* i  : input audio channels     */

    float *pcm_out[], /* o  : output audio channels    */

#else

    float pcm_in[][L_FRAME48k],  /* i  : input audio channels     */

    float pcm_out[][L_FRAME48k], /* o  : output audio channels    */

#endif

    const int16_t n_channels,  /* i  : number of channels       */

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

)