diff options
author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2014-06-22 22:30:28 +0200 |
---|---|---|
committer | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2014-07-07 19:24:21 +0200 |
commit | 983c99113d912ae4003a7fa18c0abd039c42e16d (patch) | |
tree | ccc7786f882442320dcfb7aa3e10816d04aef660 /openbsc/src | |
parent | 6019b5a5083e91f207572b805c1f4a7902c7c5db (diff) |
rtp: Share the rtp header between the proxy and the mgcp code
Diffstat (limited to 'openbsc/src')
-rw-r--r-- | openbsc/src/libmgcp/mgcp_network.c | 37 | ||||
-rw-r--r-- | openbsc/src/libtrau/rtp_proxy.c | 23 |
2 files changed, 2 insertions, 58 deletions
diff --git a/openbsc/src/libmgcp/mgcp_network.c b/openbsc/src/libmgcp/mgcp_network.c index 219d3f990..6e79e60b4 100644 --- a/openbsc/src/libmgcp/mgcp_network.c +++ b/openbsc/src/libmgcp/mgcp_network.c @@ -34,47 +34,12 @@ #include <openbsc/mgcp.h> #include <openbsc/mgcp_internal.h> +#include <openbsc/rtp.h> #include <openbsc/osmux.h> #warning "Make use of the rtp proxy code" -/* attempt to determine byte order */ -#include <sys/param.h> -#include <limits.h> -#include <time.h> - -#ifndef __BYTE_ORDER -# ifdef __APPLE__ -# define __BYTE_ORDER __DARWIN_BYTE_ORDER -# define __LITTLE_ENDIAN __DARWIN_LITTLE_ENDIAN -# define __BIG_ENDIAN __DARWIN_BIG_ENDIAN -# else -# error "__BYTE_ORDER should be defined by someone" -# endif -#endif - -/* according to rtp_proxy.c RFC 3550 */ -struct rtp_hdr { -#if __BYTE_ORDER == __LITTLE_ENDIAN - uint8_t csrc_count:4, - extension:1, - padding:1, - version:2; - uint8_t payload_type:7, - marker:1; -#elif __BYTE_ORDER == __BIG_ENDIAN - uint8_t version:2, - padding:1, - extension:1, - csrc_count:4; - uint8_t marker:1, - payload_type:7; -#endif - uint16_t sequence; - uint32_t timestamp; - uint32_t ssrc; -} __attribute__((packed)); #define RTP_SEQ_MOD (1 << 16) #define RTP_MAX_DROPOUT 3000 diff --git a/openbsc/src/libtrau/rtp_proxy.c b/openbsc/src/libtrau/rtp_proxy.c index 15673234b..67c0c7005 100644 --- a/openbsc/src/libtrau/rtp_proxy.c +++ b/openbsc/src/libtrau/rtp_proxy.c @@ -36,6 +36,7 @@ #include <openbsc/rtp_proxy.h> #include <openbsc/mncc.h> #include <openbsc/trau_upqueue.h> +#include <openbsc/rtp.h> /* attempt to determine byte order */ #include <sys/param.h> @@ -76,28 +77,6 @@ struct rtcp_hdr { #define RTCP_IE_CNAME 1 -/* according to RFC 3550 */ -struct rtp_hdr { -#if __BYTE_ORDER == __LITTLE_ENDIAN - uint8_t csrc_count:4, - extension:1, - padding:1, - version:2; - uint8_t payload_type:7, - marker:1; -#elif __BYTE_ORDER == __BIG_ENDIAN - uint8_t version:2, - padding:1, - extension:1, - csrc_count:4; - uint8_t marker:1, - payload_type:7; -#endif - uint16_t sequence; - uint32_t timestamp; - uint32_t ssrc; -} __attribute__((packed)); - struct rtp_x_hdr { uint16_t by_profile; uint16_t length; |