FS-6194 --resolve

This commit is contained in:
Peter Olsson 2014-02-09 13:10:44 +01:00
parent dd9b729f5e
commit 05144df25a

View File

@ -68,18 +68,27 @@
* fully pack the bit fields. * fully pack the bit fields.
*/ */
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable : 4214)
#endif
typedef struct { typedef struct {
unsigned cc:4; /* CSRC count */ unsigned char cc:4; /* CSRC count */
unsigned x:1; /* header extension flag */ unsigned char x:1; /* header extension flag */
unsigned p:1; /* padding flag */ unsigned char p:1; /* padding flag */
unsigned version:2; /* protocol version */ unsigned char version:2; /* protocol version */
unsigned pt:7; /* payload type */ unsigned char pt:7; /* payload type */
unsigned m:1; /* marker bit */ unsigned char m:1; /* marker bit */
uint16_t seq; /* sequence number */ uint16_t seq; /* sequence number */
uint32_t ts; /* timestamp */ uint32_t ts; /* timestamp */
uint32_t ssrc; /* synchronization source */ uint32_t ssrc; /* synchronization source */
} srtp_hdr_t; } srtp_hdr_t;
#ifdef _MSC_VER
#pragma warning(pop)
#endif
#else /* BIG_ENDIAN */ #else /* BIG_ENDIAN */
typedef struct { typedef struct {
@ -111,15 +120,24 @@ typedef struct {
#ifndef WORDS_BIGENDIAN #ifndef WORDS_BIGENDIAN
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable : 4214)
#endif
typedef struct { typedef struct {
unsigned rc:5; /* reception report count */ unsigned char rc:5; /* reception report count */
unsigned p:1; /* padding flag */ unsigned char p:1; /* padding flag */
unsigned version:2; /* protocol version */ unsigned char version:2; /* protocol version */
unsigned pt:8; /* payload type */ unsigned char pt:8; /* payload type */
uint16_t len; /* length */ uint16_t len; /* length */
uint32_t ssrc; /* synchronization source */ uint32_t ssrc; /* synchronization source */
} srtcp_hdr_t; } srtcp_hdr_t;
#ifdef _MSC_VER
#pragma warning(pop)
#endif
typedef struct { typedef struct {
unsigned int index:31; /* srtcp packet index in network order! */ unsigned int index:31; /* srtcp packet index in network order! */
unsigned int e:1; /* encrypted? 1=yes */ unsigned int e:1; /* encrypted? 1=yes */