Commit d827dfb6 authored by emerit's avatar emerit
Browse files

on going merge

parent e9359b92

lib_com/ivas_cnst.h

+12 −0
Original line number Diff line number Diff line
@@ -1639,6 +1639,18 @@ typedef enum 


#define BINAURAL_COHERENCE_DIFFERENCE_BINS      9                           /* Number of bins for direction-dependent diffuse-field binaural coherence */



#ifndef FIX_POINT_HRTF_FILE_FORMAT

typedef enum 

{

    BINAURAL_INPUT_AUDIO_CONFIG_INVALID,

    BINAURAL_INPUT_AUDIO_CONFIG_COMBINED,       /* 5_1, 5_1_2, 5_1_4, 7_1, 7_1_4 */

    BINAURAL_INPUT_AUDIO_CONFIG_HOA3,           /*  HOA3 */

    BINAURAL_INPUT_AUDIO_CONFIG_HOA2,           /* HOA2 */

    BINAURAL_INPUT_AUDIO_CONFIG_FOA,            /* FOA */

    BINAURAL_INPUT_AUDIO_CONFIG_UNDEFINED       /* Not used */



} BINAURAL_INPUT_AUDIO_CONFIG;

#endif



#define HEADROT_ORDER                           3

#define HEADROT_SHMAT_DIM                       ( ( HEADROT_ORDER + 1 ) * ( HEADROT_ORDER + 1 ) )

lib_com/ivas_prot_fx.h

+9 −3
Original line number Diff line number Diff line
@@ -3640,8 +3640,14 @@ void ivas_init_binaural_hrtf_fx( 


ivas_error ivas_allocate_binaural_hrtf_fx(

    HRTFS_FASTCONV *HrtfFastConv,                       /* i/o: FASTCONV HRTF structure     */

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

    const int16_t allocate_init_flag /* i  : Memory allocation flag                          */

#ifdef FIX_POINT_HRTF_FILE_FORMAT

    const Word16 n_channels,        /* i : number of input channels                         */

#else  

    const AUDIO_CONFIG input_config,                    /* i  : input audio configuration   */

    const BINAURAL_INPUT_AUDIO_CONFIG bin_input_config, /* i  : binaural input audio config */

    const RENDERER_TYPE renderer_type,                  /* i  : renderer type               */  

#endif

    const Word16 allocate_init_flag /* i  : Memory allocation flag                          */

);



void ivas_binRenderer_fx(

lib_dec/ivas_binRenderer_internal.c

+2 −1
Original line number Diff line number Diff line
@@ -210,9 +210,10 @@ static ivas_error ivas_binRenderer_convModuleOpen( 
        hBinRenderer->nInChannels = sub( audioCfg2channels( input_config ), isLoudspeaker );

        move16();

    }

#ifdef FIX_1123_FASTCONV_PARAMBIN_16BIT_ROM

    hBinRenConvModule->numTaps = hHrtf->ntaps;

    move16();



#endif

    IF( EQ_16( renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) )

    {

        /* Use variable order filtering */

lib_dec/ivas_init_dec.c

+1 −0
Original line number Diff line number Diff line
@@ -1344,6 +1344,7 @@ ivas_error ivas_init_decoder_front( 
    return error;

}





/*-------------------------------------------------------------------*

 * ivas_init_decoder()

 *

lib_dec/lib_dec.h

+0 −1
Original line number Diff line number Diff line
@@ -127,7 +127,6 @@ void IVAS_DEC_Close( 


/* Decoding functions - should be called with a configured decoder handle */





/*! r: error code */

ivas_error IVAS_DEC_FeedFrame_Serial(

  IVAS_DEC_HANDLE hIvasDec,                   /* i/o: IVAS decoder handle                                                     */