Commit aafe0274 authored by Ripinder Singh's avatar Ripinder Singh
Browse files

Fix for build errors 



Signed-off-by: default avatarRipinder Singh <ripinder.singh@dolby.com>
parent e43b8bcc

lib_dec/lib_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -346,11 +346,11 @@ void IVAS_DEC_Close( 
        ( *phIvasDec )->hVoIP = NULL;

    }



    /* destroy Split binaural renderer (ISAR) handle */

#ifndef IVAS_RTPDUMP

    ivas_destroy_handle_isar( &( *phIvasDec )->st_ivas->hSplitBinRend );



#endif

    /* destroy Split binaural renderer (ISAR) handle */

    if ( ( *phIvasDec )->st_ivas )

    {

#ifdef IVAS_RTPDUMP

lib_util/evs_rtp_payload.c

+1 −25
Original line number Diff line number Diff line
@@ -37,9 +37,7 @@ 
#include <assert.h>

#include <stdio.h>

#include "evs_rtp_payload.h"

#include "options.h"



#ifndef IVAS_RTPDUMP

static void evsPayload_unpackFrame_compact_amrWbIo( const char *payload, uint16_t payloadSizeBits, uint16_t iProtectedSize, unsigned char **framePtr, uint16_t *frameSizeInBits )

{

    uint16_t i, iBit0;
@@ -124,27 +122,7 @@ bool evsPayload_unpackFrame( bool hf_only, char *payload, uint16_t payloadSizeBy 
    return evsHeaderFullPayload_unpackFrame( payload, payloadSizeBytes, frameIndex, isAMRWB_IOmode,

                                             frameFollowing, frameTypeIndex, qBit, framePtr, frameSizeInBits );

}

#endif



#ifdef IVAS_RTPDUMP

void evsHeaderFullPayload_parseToc( uint8_t toc, bool *isAMRWB_IOmode, bool *frameFollowing, uint16_t *frameTypeIndex, bool *qBit, int32_t *bitrate )

{

    bool evsModeBit = ( toc & 0x20 ) != 0;

    *isAMRWB_IOmode = evsModeBit;

    *frameFollowing = ( toc & 0x40 ) != 0;

    *frameTypeIndex = toc & 0x0f;

    if ( *isAMRWB_IOmode )

    {

        *qBit = ( toc & 0x10 ) != 0;

        *bitrate = AMRWB_IOmode2rate[*frameTypeIndex];

    }

    else

    {

        *qBit = false; /* Q-bit is unused in EVS Primary mode */

        *bitrate = PRIMARYmode2rate[*frameTypeIndex];

    }

}

#else

static void evsHeaderFullPayload_parseToc( uint8_t toc, bool *isAMRWB_IOmode, bool *frameFollowing, uint16_t *frameTypeIndex, bool *qBit, int32_t *bitrate )

{

    bool evsModeBit = ( toc & 0x20 ) != 0;
@@ -162,9 +140,8 @@ static void evsHeaderFullPayload_parseToc( uint8_t toc, bool *isAMRWB_IOmode, bo 
        *bitrate = AMRWB_IOmode2rate[*frameTypeIndex];

    }

}

#endif



#ifndef IVAS_RTPDUMP



bool evsHeaderFullPayload_unpackFrame( char *payload, uint16_t payloadSizeBytes, uint16_t frameIndex, bool *isAMRWB_IOmode, bool *frameFollowing, uint16_t *frameTypeIndex, bool *qBit, unsigned char **frame, uint16_t *frameSizeInBits )

{

    bool someIsAMRWB_IOmode, someFrameFollowing = true, someQBit;
@@ -296,4 +273,3 @@ void EVS_RTPDUMP_DEPACKER_close( EVS_RTPDUMP_DEPACKER *self ) 
    }

    RTPDUMP_Close( &self->rtpdump, 0 );

}
 
#endif

lib_util/evs_rtp_payload.h

+1 −9
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ extern "C" 
        0       /* NO_DATA */

    };



#ifndef IVAS_RTPDUMP

    static const uint16_t evsPayloadProtectedSizes[22] = {

        48,

        56,
@@ -160,14 +159,8 @@ extern "C" 
    };



    bool evsPayload_unpackFrame( bool hf_only, char *payload, uint16_t payloadSizeBytes, uint16_t frameIndex, bool *isAMRWB_IOmode, bool *frameFollowing, uint16_t *frameTypeIndex, bool *qBit, unsigned char **framePtr, uint16_t *frameSizeBits );

#endif



#ifdef IVAS_RTPDUMP

    void evsHeaderFullPayload_parseToc( uint8_t toc, bool *isAMRWB_IOmode, bool *frameFollowing, uint16_t *frameTypeIndex, bool *qBit, int32_t *bitrate );

#else

static void evsHeaderFullPayload_parseToc( uint8_t toc, bool *isAMRWB_IOmode, bool *frameFollowing, uint16_t *frameTypeIndex, bool *qBit, int32_t *bitrate );

#endif

#ifndef IVAS_RTPDUMP



    bool evsHeaderFullPayload_unpackFrame( char *payload, uint16_t payloadSizeBytes, uint16_t frameIndex, bool *isAMRWB_IOmode, bool *frameFollowing, uint16_t *frameTypeIndex, bool *qBit, unsigned char **frame, uint16_t *frameSizeBits );



    typedef struct
@@ -202,7 +195,6 @@ static void evsHeaderFullPayload_parseToc( uint8_t toc, bool *isAMRWB_IOmode, bo 
        uint16_t *frameSizeBits );



    void EVS_RTPDUMP_DEPACKER_close( EVS_RTPDUMP_DEPACKER *self );

#endif



#ifdef __cplusplus

}