Mercurial > mplayer.hg
changeset 19319:c565b6ac1d2a
moved some definitions from rtp.h to rtp.c as they're not exported or used anywhere else
| author | ben |
|---|---|
| date | Fri, 04 Aug 2006 19:36:41 +0000 |
| parents | a3ddd3320b47 |
| children | 06eef86d21cc |
| files | stream/rtp.c stream/rtp.h |
| diffstat | 2 files changed, 18 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/stream/rtp.c Fri Aug 04 19:31:53 2006 +0000 +++ b/stream/rtp.c Fri Aug 04 19:36:41 2006 +0000 @@ -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 @@ }; 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
--- a/stream/rtp.h Fri Aug 04 19:31:53 2006 +0000 +++ b/stream/rtp.h Fri Aug 04 19:36:41 2006 +0000 @@ -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