Commit 2492c9f7 authored by Marek Szczerba's avatar Marek Szczerba
Browse files

AE ID type changed from Word16 to UWord16

parent c67dfae9

lib_com/common_api_types.h

+1 −1
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ typedef enum 
typedef struct _IVAS_ROOM_ACOUSTICS_CONFIG

{

#ifdef IVAS_RTPDUMP_ACOUSTIC_ENVIRONMENT

    Word16 aeID; /* Acoustic environment ID */

    UWord16 aeID; /* Acoustic environment ID */

#endif

    Word16 nBands;                                                                                                                       /* Number of frequency bands for which reverb properties are provided, integer, range [2..256]        */

    Word32 pFc_input_fx[IVAS_CLDFB_NO_CHANNELS_MAX];                                                                                     /*Q16 Center frequencies for which following values are provided:                                         */

lib_dec/lib_dec.h

+1 −1
Original line number Diff line number Diff line
@@ -454,7 +454,7 @@ ivas_error IVAS_DEC_AddAcousticEnvironment( 


ivas_error IVAS_DEC_GetAcousticEnvironment(

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

    Word16 aeID,                            /* i  : Acoustic environment ID                 */

    UWord16 aeID,                           /* i  : Acoustic environment ID                 */

    IVAS_ROOM_ACOUSTICS_CONFIG_DATA *pAcEnv /* o  : Room acoustic environment data pointer  */

);

#endif

lib_dec/lib_dec_fx.c

+8 −4
Original line number Diff line number Diff line
@@ -596,7 +596,11 @@ ivas_error IVAS_DEC_Configure( 
    hDecoderConfig->Opt_delay_comp = (Word16) delayCompensationEnabled;

    hDecoderConfig->Opt_ExternalOrientation = enableExternalOrientation;

    hDecoderConfig->Opt_dpid_on = (Word16) dpidEnabled;

#ifdef IVAS_RTPDUMP_ACOUSTIC_ENVIRONMENT

    IF( NE_32( (UWord16) acousticEnvironmentId, IVAS_DEFAULT_AEID ) )

#else

    IF( NE_32( (Word32) acousticEnvironmentId, 65535 ) )

#endif

    {

        hDecoderConfig->Opt_aeid_on = TRUE;

    }
@@ -3032,7 +3036,7 @@ ivas_error IVAS_DEC_AddAcousticEnvironment( 
 *---------------------------------------------------------------------*/

ivas_error IVAS_DEC_GetAcousticEnvironment(

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

    Word16 aeID,                            /* i  : Acoustic environment ID                 */

    UWord16 aeID,                           /* i  : Acoustic environment ID                 */

    IVAS_ROOM_ACOUSTICS_CONFIG_DATA *pAcEnv /* o  : Room acoustic environment data pointer  */

)

{
@@ -3051,9 +3055,9 @@ ivas_error IVAS_DEC_GetAcousticEnvironment( 


    /* In case of default AE ID, select the first one available */

    test();

    IF( aeID == (Word16) IVAS_DEFAULT_AEID && st_ivas->acousticEnvironmentsCount > 0 )

    IF( aeID == (UWord16) IVAS_DEFAULT_AEID && st_ivas->acousticEnvironmentsCount > 0 )

    {

        aeID = (uint16_t) st_ivas->pAcousticEnvironments[0].aeID;

        aeID = (UWord16) st_ivas->pAcousticEnvironments[0].aeID;

        move32();

    }
@@ -6785,7 +6789,7 @@ ivas_error IVAS_RTP_FeedPiDataToDecoder( IVAS_DEC_HANDLE hIvasDec, PIDATA_TS *pi 
#ifdef IVAS_RTPDUMP_ACOUSTIC_ENVIRONMENT

            case IVAS_PI_ACOUSTIC_ENVIRONMENT:

            {

                Word16 aeid = piData->data.acousticEnv.aeid;

                UWord16 aeid = piData->data.acousticEnv.aeid;

#ifdef DEBUGGING

                fprintf( stdout, "PI_ACOUSTIC_ENVIRONMENT : AEID : %d\n", aeid );

#endif

lib_rend/ivas_render_config_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ ivas_error ivas_render_config_init_from_rom_fx( 
        return IVAS_ERROR( IVAS_ERR_UNEXPECTED_NULL_POINTER, "Unexpected null pointer while attempting to fill renderer configuration from ROM" );

    }

#ifdef IVAS_RTPDUMP_ACOUSTIC_ENVIRONMENT

    ( *hRenderConfig )->roomAcoustics.aeID = (Word16) IVAS_DEFAULT_AEID;

    ( *hRenderConfig )->roomAcoustics.aeID = (UWord16) IVAS_DEFAULT_AEID;

    move16();

#endif

    ( *hRenderConfig )->roomAcoustics.nBands = IVAS_REVERB_DEFAULT_N_BANDS;