Commit 1400b863 authored by Lauros Pajunen's avatar Lauros Pajunen
Browse files

Use 2 bits for ET-field, put 3 bits version under flag

parent 9bbf35f8

lib_util/ivas_rtp_internal.h

+8 −0
Original line number Diff line number Diff line
@@ -96,11 +96,19 @@ enum IVAS_RTP_HEADER_BITS 
    EBYTE_CMR_T_IVAS = 0xF0,       /* Initial E-byte indicating IVAS modes                    */

    EBYTE_CMR_T_NO_REQ = 0xFF,     /* If no bitrate and no CA mode requested for IVAS/EVS     */



#ifdef RTP_S4_251135_CR26253_0016_REV1

    EBYTE_BANDWIDTH_REQUEST = 0x40, /* Subsequent E-byte for Bandwidth Request                */

    EBYTE_FORMAT_REQUEST = 0x50,    /* Subsequent E-byte for Format Request                   */

    EBYTE_SUBFORMAT_REQUEST = 0x9F, /* Subsequent E-byte for SubFormat Request                */

    EBYTE_PI_INDICATOR = 0x60,      /* Subsequent E-byte for PI Indicator                     */

    EBYTE_SR_REQUEST = 0x70,        /* Subsequent E-byte for Split Rendering Request          */

#else

    EBYTE_BANDWIDTH_REQUEST = 0x80, /* Subsequent E-byte for Bandwidth Request                */

    EBYTE_FORMAT_REQUEST = 0x90,    /* Subsequent E-byte for Format Request                   */

    EBYTE_SUBFORMAT_REQUEST = 0x9F, /* Subsequent E-byte for SubFormat Request                */

    EBYTE_PI_INDICATOR = 0xA0,      /* Subsequent E-byte for PI Indicator                     */

    EBYTE_SR_REQUEST = 0xB0,        /* Subsequent E-byte for Split Rendering Request          */

#endif



    PI_HEADER_PF_LAST = 0x00,     /* Last PI header of the Payload in PI Header               */

    PI_HEADER_PF_NOT_LAST = 0x80, /* Another PI header follows after this in PI Header        */

lib_util/ivas_rtp_payload.c

+4 −0
Original line number Diff line number Diff line
@@ -1339,7 +1339,11 @@ static uint32_t parseSubsequentEByte( const IVAS_DATA_BUFFER *payload, uint32_t 
    while ( nBytes < payload->length )

    {

        uint8_t byte = payload->buffer[nBytes];

#ifdef RTP_S4_251135_CR26253_0016_REV1

        uint8_t ET = ( byte & ( ~MASK_3BIT ) );

#else

        uint8_t ET = ( byte & ( ~MASK_4BIT ) );

#endif



        if ( ( byte & EBYTE_TOC_HEADER_BIT ) == 0 )

        {