mirror of https://github.com/mpv-player/mpv
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
This commit is contained in:
parent
74f76ea788
commit
7c4ced0cbb
18
stream/rtp.c
18
stream/rtp.c
|
@ -39,6 +39,22 @@
|
||||||
|
|
||||||
#define MAXRTPPACKETSIN 32 // The number of max packets being reordered
|
#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
|
struct rtpbuffer
|
||||||
{
|
{
|
||||||
unsigned char data[MAXRTPPACKETSIN][STREAM_BUFFER_SIZE];
|
unsigned char data[MAXRTPPACKETSIN][STREAM_BUFFER_SIZE];
|
||||||
|
@ -48,6 +64,8 @@ struct rtpbuffer
|
||||||
};
|
};
|
||||||
static struct rtpbuffer rtpbuf;
|
static struct rtpbuffer rtpbuf;
|
||||||
|
|
||||||
|
static int getrtp2(int fd, struct rtpheader *rh, char** data, int* lengthData);
|
||||||
|
|
||||||
// RTP Reordering functions
|
// RTP Reordering functions
|
||||||
// Algorithm works as follows:
|
// Algorithm works as follows:
|
||||||
// If next packet is in sequence just copy it to buffer
|
// If next packet is in sequence just copy it to buffer
|
||||||
|
|
18
stream/rtp.h
18
stream/rtp.h
|
@ -15,24 +15,6 @@
|
||||||
#include <winsock2.h>
|
#include <winsock2.h>
|
||||||
#endif
|
#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);
|
int read_rtp_from_server(int fd, char *buffer, int length);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue