diff options
| author | ben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-08-04 19:36:41 +0000 |
|---|---|---|
| committer | ben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-08-04 19:36:41 +0000 |
| commit | 7c4ced0cbb6d4dea7e390aaaa57b49ea5d410f1f (patch) | |
| tree | 96a3797dcffd84a3ea122cad7acfe4e1b42670f0 /stream | |
| parent | 74f76ea788d9af5a37d668de0e53afe13a305aaa (diff) | |
| download | mpv-7c4ced0cbb6d4dea7e390aaaa57b49ea5d410f1f.tar.bz2 mpv-7c4ced0cbb6d4dea7e390aaaa57b49ea5d410f1f.tar.xz | |
moved some definitions from rtp.h to rtp.c as they're not exported or used anywhere else
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19325 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream')
| -rw-r--r-- | stream/rtp.c | 18 | ||||
| -rw-r--r-- | stream/rtp.h | 18 |
2 files changed, 18 insertions, 18 deletions
diff --git a/stream/rtp.c b/stream/rtp.c index 03073f2651..db522df9b5 100644 --- a/stream/rtp.c +++ b/stream/rtp.c @@ -39,6 +39,22 @@ #define MAXRTPPACKETSIN 32 // The number of max packets being reordered +struct rtpbits { + unsigned int v:2; /* version: 2 */ + unsigned int p:1; /* is there padding appended: 0 */ + unsigned int x:1; /* number of extension headers: 0 */ + unsigned int cc:4; /* number of CSRC identifiers: 0 */ + unsigned int m:1; /* marker: 0 */ + unsigned int pt:7; /* payload type: 33 for MPEG2 TS - RFC 1890 */ + unsigned int sequence:16; /* sequence number: random */ +}; + +struct rtpheader { /* in network byte order */ + struct rtpbits b; + int timestamp; /* start: random */ + int ssrc; /* random */ +}; + struct rtpbuffer { unsigned char data[MAXRTPPACKETSIN][STREAM_BUFFER_SIZE]; @@ -48,6 +64,8 @@ struct rtpbuffer }; static struct rtpbuffer rtpbuf; +static int getrtp2(int fd, struct rtpheader *rh, char** data, int* lengthData); + // RTP Reordering functions // Algorithm works as follows: // If next packet is in sequence just copy it to buffer diff --git a/stream/rtp.h b/stream/rtp.h index c244eff2f4..3bda4a526a 100644 --- a/stream/rtp.h +++ b/stream/rtp.h @@ -15,24 +15,6 @@ #include <winsock2.h> #endif -struct rtpbits { - unsigned int v:2; /* version: 2 */ - unsigned int p:1; /* is there padding appended: 0 */ - unsigned int x:1; /* number of extension headers: 0 */ - unsigned int cc:4; /* number of CSRC identifiers: 0 */ - unsigned int m:1; /* marker: 0 */ - unsigned int pt:7; /* payload type: 33 for MPEG2 TS - RFC 1890 */ - unsigned int sequence:16; /* sequence number: random */ -}; - -struct rtpheader { /* in network byte order */ - struct rtpbits b; - int timestamp; /* start: random */ - int ssrc; /* random */ -}; - - -static int getrtp2(int fd, struct rtpheader *rh, char** data, int* lengthData); int read_rtp_from_server(int fd, char *buffer, int length); #endif |