[Mplayer-cvslog] CVS: main/libmpdemux Makefile, 1.79, 1.80 network.c, 1.103, 1.104 rtp.c, 1.6, 1.7 rtp.h, 1.2, 1.3
Roberto Togni CVS
syncmail at mplayerhq.hu
Mon Jul 12 00:47:52 CEST 2004
CVS change done by Roberto Togni CVS
Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv20961
Modified Files:
Makefile network.c rtp.c rtp.h
Log Message:
Make rtp:// cohexist with LIVE.COM
Patch by Nico Sabbi
Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/Makefile,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- Makefile 24 Jun 2004 12:52:16 -0000 1.79
+++ Makefile 11 Jul 2004 22:47:49 -0000 1.80
@@ -8,7 +8,7 @@
SRCS += demux_xmms.c
endif
ifeq ($(MPLAYER_NETWORK),yes)
-SRCS += asf_streaming.c http.c network.c cookies.c asf_mmst_streaming.c pnm.c
+SRCS += asf_streaming.c http.c network.c cookies.c asf_mmst_streaming.c pnm.c rtp.c
SRCS += realrtsp/asmrp.c realrtsp/real.c realrtsp/rmff.c realrtsp/rtsp.c realrtsp/rtsp_session.c realrtsp/sdpplin.c realrtsp/xbuffer.c
ifeq ($(STREAMING_LIVE_DOT_COM),yes)
CPLUSPLUSSRCS = demux_rtp.cpp demux_rtp_codec.cpp
@@ -16,8 +16,6 @@
CPLUSPLUSINCLUDE += -I$(LIVE_LIB_DIR)/UsageEnvironment/include
CPLUSPLUSINCLUDE += -I$(LIVE_LIB_DIR)/BasicUsageEnvironment/include
CPLUSPLUSINCLUDE += -I$(LIVE_LIB_DIR)/groupsock/include
-else
-SRCS += rtp.c
endif
endif
Index: network.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/network.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- network.c 26 Jun 2004 10:40:15 -0000 1.103
+++ network.c 11 Jul 2004 22:47:49 -0000 1.104
@@ -32,9 +32,7 @@
#include "cookies.h"
#include "url.h"
#include "asf.h"
-#ifndef STREAMING_LIVE_DOT_COM
#include "rtp.h"
-#endif
#include "pnm.h"
#include "realrtsp/rtsp_session.h"
@@ -149,7 +147,6 @@
free( streaming_ctrl );
}
-#ifndef STREAMING_LIVE_DOT_COM
int
read_rtp_from_server(int fd, char *buffer, int length) {
struct rtpheader rh;
@@ -169,7 +166,6 @@
memcpy(buffer, data, len);
return(len);
}
-#endif
// Converts an address family constant to a string
@@ -704,8 +700,7 @@
#endif
}
-#ifndef STREAMING_LIVE_DOT_COM
- // Old, hacked RTP support, which works for MPEG Program Streams
+ // Old, hacked RTP support, which works for MPEG Streams
// RTP streams only:
// Checking for RTP
if( !strcasecmp(url->protocol, "rtp") ) {
@@ -715,7 +710,6 @@
}
return 0;
}
-#endif
// Checking for ASF
if( !strncasecmp(url->protocol, "mms", 3) ) {
@@ -1075,9 +1069,8 @@
}
-#ifndef STREAMING_LIVE_DOT_COM
// Start listening on a UDP port. If multicast, join the group.
-int
+static int
rtp_open_socket( URL_t *url ) {
int socket_server_fd, rxsockbufsz;
int err, err_len;
@@ -1181,12 +1174,12 @@
return socket_server_fd;
}
-int
+static int
rtp_streaming_read( int fd, char *buffer, int size, streaming_ctrl_t *streaming_ctrl ) {
return read_rtp_from_server( fd, buffer, size );
}
-int
+static int
rtp_streaming_start( stream_t *stream ) {
streaming_ctrl_t *streaming_ctrl;
int fd;
@@ -1208,7 +1201,6 @@
streaming_ctrl->status = streaming_playing_e;
return 0;
}
-#endif
int
streaming_start(stream_t *stream, int *demuxer_type, URL_t *url) {
@@ -1240,7 +1232,6 @@
// Get the bandwidth available
stream->streaming_ctrl->bandwidth = network_bandwidth;
-#ifndef STREAMING_LIVE_DOT_COM
// For RTP streams, we usually don't know the stream type until we open it.
if( !strcasecmp( stream->streaming_ctrl->url->protocol, "rtp")) {
if(stream->fd >= 0) {
@@ -1250,7 +1241,6 @@
stream->fd = -1;
ret = rtp_streaming_start( stream );
} else
-#endif
if( !strcasecmp( stream->streaming_ctrl->url->protocol, "pnm")) {
stream->fd = -1;
Index: rtp.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/rtp.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rtp.c 11 Jun 2003 16:48:07 -0000 1.6
+++ rtp.c 11 Jul 2004 22:47:49 -0000 1.7
@@ -20,30 +20,6 @@
#define DEBUG 1
#include "rtp.h"
-void initrtp(struct rtpheader *foo) { /* fill in the MPEG-2 TS deefaults */
- /* Note: MPEG-2 TS defines a timestamping base frequency of 90000 Hz. */
- foo->b.v=2;
- foo->b.p=0;
- foo->b.x=0;
- foo->b.cc=0;
- foo->b.m=0;
- foo->b.pt=33; /* MPEG-2 TS */
- foo->b.sequence=rand() & 65535;
- foo->timestamp=rand();
- foo->ssrc=rand();
-}
-
-/* Send a single RTP packet, converting the RTP header to network byte order. */
-int sendrtp(int fd, struct sockaddr_in *sSockAddr, struct rtpheader *foo, char *data, int len) {
- char *buf=(char*)alloca(len+sizeof(struct rtpheader));
- int *cast=(int *)foo;
- int *outcast=(int *)buf;
- outcast[0]=htonl(cast[0]);
- outcast[1]=htonl(cast[1]);
- memmove(outcast+2,data,len);
- fprintf(stderr,"v=%x %x\n",foo->b.v,buf[0]);
- return sendto(fd,buf,len+3,0,(struct sockaddr *)sSockAddr,sizeof(*sSockAddr));
-}
int getrtp2(int fd, struct rtpheader *rh, char** data, int* lengthData) {
static char buf[1600];
@@ -85,116 +61,4 @@
return(0);
}
-/* Send a single RTP packet, converting the RTP header to network byte order. */
-int sendrtp2(int fd, struct sockaddr_in *sSockAddr, struct rtpheader *foo, char *data, int len) {
- char *buf=(char*)alloca(len+72);
- unsigned int intP;
- char* charP = (char*) &intP;
- int headerSize;
- buf[0] = 0x00;
- buf[0] |= ((((char) foo->b.v)<<6)&0xc0);
- buf[0] |= ((((char) foo->b.p)<<5)&0x20);
- buf[0] |= ((((char) foo->b.x)<<4)&0x10);
- buf[0] |= ((((char) foo->b.cc)<<0)&0x0f);
- buf[1] = 0x00;
- buf[1] |= ((((char) foo->b.m)<<7)&0x80);
- buf[1] |= ((((char) foo->b.pt)<<0)&0x7f);
- intP = htonl(foo->b.sequence);
- memcpy(&buf[2],charP+2,2);
- intP = htonl(foo->timestamp);
- memcpy(&buf[4],&intP,4);
- /* SSRC: not implemented */
- buf[8] = 0x0f;
- buf[9] = 0x0f;
- buf[10] = 0x0f;
- buf[11] = 0x0f;
- headerSize = 12 + 4*foo->b.cc; /* in bytes */
- memcpy(buf+headerSize,data,len);
-
- // fprintf(stderr,"Sending rtp: v=%x p=%x x=%x cc=%x m=%x pt=%x seq=%x ts=%x lgth=%d\n",foo->b.v,foo->b.p,foo->b.x,foo->b.cc,foo->b.m,foo->b.pt,foo->b.sequence,foo->timestamp,len+headerSize);
-
- foo->b.sequence++;
- return sendto(fd,buf,len+headerSize,0,(struct sockaddr *)sSockAddr,sizeof(*sSockAddr));
-}
-
-
-int getrtp(int fd, struct rtpheader *rh, char** data, int* lengthData) {
- static char buf[1600];
- int headerSize;
- int lengthPacket;
-
- lengthPacket=recv(fd,buf,1590,0);
- // FIXME: error handling to write here
- headerSize = 3;
- *lengthData = lengthPacket - headerSize;
- *data = (char*) buf + headerSize;
- fprintf(stderr,"[%d] %02x %x\n",lengthPacket,buf[8],buf[0]);
- return(0);
-}
-
-/* create a sender socket. */
-int makesocket(char *szAddr,unsigned short port,int TTL,struct sockaddr_in *sSockAddr) {
- int iRet, iLoop = 1;
- struct sockaddr_in sin;
- char cTtl = (char)TTL;
- char cLoop=0;
-
- int iSocket = socket( AF_INET, SOCK_DGRAM, 0 );
-
- if (iSocket < 0) {
- fprintf(stderr,"socket() failed.\n");
- exit(1);
- }
-
- sSockAddr->sin_family = sin.sin_family = AF_INET;
- sSockAddr->sin_port = sin.sin_port = htons(port);
- sSockAddr->sin_addr.s_addr = inet_addr(szAddr);
-
- iRet = setsockopt(iSocket, SOL_SOCKET, SO_REUSEADDR, &iLoop, sizeof(int));
- if (iRet < 0) {
- fprintf(stderr,"setsockopt SO_REUSEADDR failed\n");
- exit(1);
- }
-
- iRet = setsockopt(iSocket, IPPROTO_IP, IP_MULTICAST_TTL, &cTtl, sizeof(char));
- if (iRet < 0) {
- fprintf(stderr,"setsockopt IP_MULTICAST_TTL failed. multicast in kernel?\n");
- exit(1);
- }
-
- cLoop = 1; /* !? */
- iRet = setsockopt(iSocket, IPPROTO_IP, IP_MULTICAST_LOOP,
- &cLoop, sizeof(char));
- if (iRet < 0) {
- fprintf(stderr,"setsockopt IP_MULTICAST_LOOP failed. multicast in kernel?\n");
- exit(1);
- }
-
- return iSocket;
-}
-
-/* create a receiver socket, i.e. join the multicast group. */
-int makeclientsocket(char *szAddr,unsigned short port,int TTL,struct sockaddr_in *sSockAddr) {
- int socket=makesocket(szAddr,port,TTL,sSockAddr);
- struct ip_mreq blub;
- struct sockaddr_in sin;
- unsigned int tempaddr;
- sin.sin_family=AF_INET;
- sin.sin_port=htons(port);
- sin.sin_addr.s_addr=inet_addr(szAddr);
- if (bind(socket,(struct sockaddr *) &sin,sizeof(sin))) {
- perror("bind failed");
- exit(1);
- }
- tempaddr=inet_addr(szAddr);
- if ((ntohl(tempaddr) >> 28) == 0xe) {
- blub.imr_multiaddr.s_addr = inet_addr(szAddr);
- blub.imr_interface.s_addr = 0;
- if (setsockopt(socket,IPPROTO_IP,IP_ADD_MEMBERSHIP,&blub,sizeof(blub))) {
- perror("setsockopt IP_ADD_MEMBERSHIP failed (multicast kernel?)");
- exit(1);
- }
- }
- return socket;
-}
Index: rtp.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/rtp.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rtp.h 11 Jun 2003 16:48:07 -0000 1.2
+++ rtp.h 11 Jul 2004 22:47:49 -0000 1.3
@@ -25,12 +25,6 @@
};
-void initrtp(struct rtpheader *foo); /* fill in the MPEG-2 TS deefaults */
-int sendrtp(int fd, struct sockaddr_in *sSockAddr, struct rtpheader *foo, char *data, int len);
int getrtp2(int fd, struct rtpheader *rh, char** data, int* lengthData);
-int sendrtp2(int fd, struct sockaddr_in *sSockAddr, struct rtpheader *foo, char *data, int len);
-int getrtp(int fd, struct rtpheader *rh, char** data, int* lengthData);
-int makesocket(char *szAddr,unsigned short port,int TTL,struct sockaddr_in *sSockAddr);
-int makeclientsocket(char *szAddr,unsigned short port,int TTL,struct sockaddr_in *sSockAddr);
#endif
More information about the MPlayer-cvslog
mailing list