June 2006 - MPlayer-cvslog - lists.mplayerhq.hu

r18809 - branches/1.0pre8_branch
by rtogni 24 Jun '06

24 Jun '06

Author: rtogni Date: Sat Jun 24 16:09:19 2006 New Revision: 18809 Modified: branches/1.0pre8_branch/ (props changed) Log: Use libav* -r5466 for pre8 branch

1 0

r18808 - trunk/libmpdemux/rtp.c
by nicodvb 24 Jun '06

24 Jun '06

Author: nicodvb Date: Sat Jun 24 11:41:41 2006 New Revision: 18808 Modified: trunk/libmpdemux/rtp.c Log: exit() is not allowed in any other function than main(); removed Modified: trunk/libmpdemux/rtp.c ============================================================================== --- trunk/libmpdemux/rtp.c (original) +++ trunk/libmpdemux/rtp.c Sat Jun 24 11:41:41 2006 @@ -84,6 +84,8 @@ static int is_first = 1; getrtp2(fd, &rh, &data, &length); + if(!length) + return 0; seq = rh.b.sequence; newseq = seq - rtpbuf.seq[rtpbuf.first]; @@ -350,15 +352,13 @@ int headerSize; int lengthPacket; lengthPacket=recv(fd,buf,1590,0); - if (lengthPacket==0) - exit(1); - if (lengthPacket<0) { + if (lengthPacket<0) mp_msg(MSGT_NETWORK,MSGL_ERR,"rtp: socket read error\n"); - exit(2); - } - if (lengthPacket<12) { + else if (lengthPacket<12) mp_msg(MSGT_NETWORK,MSGL_ERR,"rtp: packet too small (%d) to be an rtp frame (>12bytes)\n", lengthPacket); - exit(3); + if(lengthPacket<12) { + *lengthData = 0; + return 0; } rh->b.v = (unsigned int) ((buf[0]>>6)&0x03); rh->b.p = (unsigned int) ((buf[0]>>5)&0x01);

1 0

r18807 - trunk/libmpdemux/rtp.c
by nicodvb 24 Jun '06

24 Jun '06

Author: nicodvb Date: Sat Jun 24 11:30:23 2006 New Revision: 18807 Modified: trunk/libmpdemux/rtp.c Log: fprintf -> ms_msg Modified: trunk/libmpdemux/rtp.c ============================================================================== --- trunk/libmpdemux/rtp.c (original) +++ trunk/libmpdemux/rtp.c Sat Jun 24 11:30:23 2006 @@ -353,11 +353,11 @@ if (lengthPacket==0) exit(1); if (lengthPacket<0) { - fprintf(stderr,"socket read error\n"); + mp_msg(MSGT_NETWORK,MSGL_ERR,"rtp: socket read error\n"); exit(2); } if (lengthPacket<12) { - fprintf(stderr,"packet too small (%d) to be an rtp frame (>12bytes)\n", lengthPacket); + mp_msg(MSGT_NETWORK,MSGL_ERR,"rtp: packet too small (%d) to be an rtp frame (>12bytes)\n", lengthPacket); exit(3); } rh->b.v = (unsigned int) ((buf[0]>>6)&0x03); @@ -378,7 +378,7 @@ *lengthData = lengthPacket - headerSize; *data = (char*) buf + headerSize; - // fprintf(stderr,"Reading rtp: v=%x p=%x x=%x cc=%x m=%x pt=%x seq=%x ts=%x lgth=%d\n",rh->b.v,rh->b.p,rh->b.x,rh->b.cc,rh->b.m,rh->b.pt,rh->b.sequence,rh->timestamp,lengthPacket); + // mp_msg(MSGT_NETWORK,MSGL_DBG2,"Reading rtp: v=%x p=%x x=%x cc=%x m=%x pt=%x seq=%x ts=%x lgth=%d\n",rh->b.v,rh->b.p,rh->b.x,rh->b.cc,rh->b.m,rh->b.pt,rh->b.sequence,rh->timestamp,lengthPacket); return(0); }

1 0

r18806 - in trunk/libmpdemux: rtp.c rtp.h
by nicodvb 24 Jun '06

24 Jun '06

Author: nicodvb Date: Sat Jun 24 11:27:07 2006 New Revision: 18806 Modified: trunk/libmpdemux/rtp.c trunk/libmpdemux/rtp.h Log: static-ized a couple of functions Modified: trunk/libmpdemux/rtp.c ============================================================================== --- trunk/libmpdemux/rtp.c (original) +++ trunk/libmpdemux/rtp.c Sat Jun 24 11:27:07 2006 @@ -187,7 +187,7 @@ // Read next rtp packet using cache -int read_rtp_from_server(int fd, char *buffer, int length) { +static int read_rtp_from_server(int fd, char *buffer, int length) { // Following test is ASSERT (i.e. uneuseful if code is correct) if(buffer==NULL || length<STREAM_BUFFER_SIZE) { mp_msg(MSGT_NETWORK, MSGL_ERR, "RTP buffer invalid; no data return from network\n"); @@ -343,7 +343,7 @@ } -int getrtp2(int fd, struct rtpheader *rh, char** data, int* lengthData) { +static int getrtp2(int fd, struct rtpheader *rh, char** data, int* lengthData) { static char buf[1600]; unsigned int intP; char* charP = (char*) &intP; Modified: trunk/libmpdemux/rtp.h ============================================================================== --- trunk/libmpdemux/rtp.h (original) +++ trunk/libmpdemux/rtp.h Sat Jun 24 11:27:07 2006 @@ -32,6 +32,6 @@ }; -int getrtp2(int fd, struct rtpheader *rh, char** data, int* lengthData); +static int getrtp2(int fd, struct rtpheader *rh, char** data, int* lengthData); #endif

1 0

r18805 - trunk/libmpdemux/rtp.c
by nicodvb 24 Jun '06

24 Jun '06

Author: nicodvb Date: Sat Jun 24 11:10:06 2006 New Revision: 18805 Modified: trunk/libmpdemux/rtp.c Log: rtp reordering of packets; patch by Ernitron (ernitron(a)fastwebnet.it) Modified: trunk/libmpdemux/rtp.c ============================================================================== --- trunk/libmpdemux/rtp.c (original) +++ trunk/libmpdemux/rtp.c Sat Jun 24 11:10:06 2006 @@ -32,25 +32,175 @@ extern int network_bandwidth; -int read_rtp_from_server(int fd, char *buffer, int length) { + +#define DEBUG 1 +#include "../mp_msg.h" +#include "rtp.h" + +// RTP reorder routines +// Also handling of repeated UDP packets (a bug of ExtremeNetworks switches firmware) +// rtpreord procedures +// write rtp packets in cache +// get rtp packets reordered + +#define MAXRTPPACKETSIN 32 // The number of max packets being reordered + +struct rtpbuffer +{ + unsigned char data[MAXRTPPACKETSIN][STREAM_BUFFER_SIZE]; + unsigned short seq[MAXRTPPACKETSIN]; + unsigned short len[MAXRTPPACKETSIN]; + unsigned short first; +}; +static struct rtpbuffer rtpbuf; + +// RTP Reordering functions +// Algorithm works as follows: +// If next packet is in sequence just copy it to buffer +// Otherwise copy it in cache according to its sequence number +// Cache is a circular array where "rtpbuf.first" points to next sequence slot +// and keeps track of expected sequence + +// Initialize rtp cache +static void rtp_cache_reset(unsigned short seq) +{ + int i; + + rtpbuf.first = 0; + rtpbuf.seq[0] = ++seq; + + for (i=0; i<MAXRTPPACKETSIN; i++) { + rtpbuf.len[i] = 0; + } +} + +// Write in a cache the rtp packet in right rtp sequence order +static int rtp_cache(int fd, char *buffer, int length) +{ struct rtpheader rh; + int newseq; char *data; - int len; - static int got_first = 0; - static unsigned short sequence; - - if( buffer==NULL || length<0 ) return -1; - - getrtp2(fd, &rh, &data, &len); - if( got_first && rh.b.sequence != (unsigned short)(sequence+1) ) - mp_msg(MSGT_NETWORK,MSGL_ERR,"RTP packet sequence error! Expected: %d, received: %d\n", - sequence+1, rh.b.sequence); - got_first = 1; - sequence = rh.b.sequence; - memcpy(buffer, data, len); - return(len); + unsigned short seq; + static int is_first = 1; + + getrtp2(fd, &rh, &data, &length); + seq = rh.b.sequence; + + newseq = seq - rtpbuf.seq[rtpbuf.first]; + + if ((newseq == 0) || is_first) + { + is_first = 0; + + //mp_msg(MSGT_NETWORK, MSGL_DBG4, "RTP (seq[%d]=%d seq=%d, newseq=%d)\n", rtpbuf.first, rtpbuf.seq[rtpbuf.first], seq, newseq); + rtpbuf.first = ( 1 + rtpbuf.first ) % MAXRTPPACKETSIN; + rtpbuf.seq[rtpbuf.first] = ++seq; + goto feed; + } + + if (newseq > MAXRTPPACKETSIN) + { + mp_msg(MSGT_NETWORK, MSGL_DBG2, "Overrun(seq[%d]=%d seq=%d, newseq=%d)\n", rtpbuf.first, rtpbuf.seq[rtpbuf.first], seq, newseq); + rtp_cache_reset(seq); + goto feed; + } + + if (newseq < 0) + { + int i; + + // Is it a stray packet re-sent to network? + for (i=0; i<MAXRTPPACKETSIN; i++) { + if (rtpbuf.seq[i] == seq) { + mp_msg(MSGT_NETWORK, MSGL_ERR, "Stray packet (seq[%d]=%d seq=%d, newseq=%d found at %d)\n", rtpbuf.first, rtpbuf.seq[rtpbuf.first], seq, newseq, i); + return 0; // Yes, it is! + } + } + // Some heuristic to decide when to drop packet or to restart everything + if (newseq > -(3 * MAXRTPPACKETSIN)) { + mp_msg(MSGT_NETWORK, MSGL_ERR, "Too Old packet (seq[%d]=%d seq=%d, newseq=%d)\n", rtpbuf.first, rtpbuf.seq[rtpbuf.first], seq, newseq); + return 0; // Yes, it is! + } + + mp_msg(MSGT_NETWORK, MSGL_ERR, "Underrun(seq[%d]=%d seq=%d, newseq=%d)\n", rtpbuf.first, rtpbuf.seq[rtpbuf.first], seq, newseq); + + rtp_cache_reset(seq); + goto feed; + } + + mp_msg(MSGT_NETWORK, MSGL_DBG4, "Out of Seq (seq[%d]=%d seq=%d, newseq=%d)\n", rtpbuf.first, rtpbuf.seq[rtpbuf.first], seq, newseq); + newseq = ( newseq + rtpbuf.first ) % MAXRTPPACKETSIN; + memcpy (rtpbuf.data[newseq], data, length); + rtpbuf.len[newseq] = length; + rtpbuf.seq[newseq] = seq; + + return 0; + +feed: + memcpy (buffer, data, length); + return length; } +// Get next packet in cache +// Look in cache to get first packet in sequence +static int rtp_get_next(int fd, char *buffer, int length) +{ + int i; + unsigned short nextseq; + + // If we have empty buffer we loop to fill it + for (i=0; i < MAXRTPPACKETSIN -3; i++) { + if (rtpbuf.len[rtpbuf.first] != 0) break; + + length = rtp_cache(fd, buffer, length) ; + + // returns on first packet in sequence + if (length > 0) { + //mp_msg(MSGT_NETWORK, MSGL_DBG4, "Getting rtp [%d] %hu\n", i, rtpbuf.first); + return length; + } else if (length < 0) break; + + // Only if length == 0 loop continues! + } + + i = rtpbuf.first; + while (rtpbuf.len[i] == 0) { + mp_msg(MSGT_NETWORK, MSGL_ERR, "Lost packet %hu\n", rtpbuf.seq[i]); + i = ( 1 + i ) % MAXRTPPACKETSIN; + if (rtpbuf.first == i) break; + } + rtpbuf.first = i; + + // Copy next non empty packet from cache + mp_msg(MSGT_NETWORK, MSGL_DBG4, "Getting rtp from cache [%d] %hu\n", rtpbuf.first, rtpbuf.seq[rtpbuf.first]); + memcpy (buffer, rtpbuf.data[rtpbuf.first], rtpbuf.len[rtpbuf.first]); + length = rtpbuf.len[rtpbuf.first]; // can be zero? + + // Reset fisrt slot and go next in cache + rtpbuf.len[rtpbuf.first] = 0; + nextseq = rtpbuf.seq[rtpbuf.first]; + rtpbuf.first = ( 1 + rtpbuf.first ) % MAXRTPPACKETSIN; + rtpbuf.seq[rtpbuf.first] = nextseq + 1; + + return length; +} + + +// Read next rtp packet using cache +int read_rtp_from_server(int fd, char *buffer, int length) { + // Following test is ASSERT (i.e. uneuseful if code is correct) + if(buffer==NULL || length<STREAM_BUFFER_SIZE) { + mp_msg(MSGT_NETWORK, MSGL_ERR, "RTP buffer invalid; no data return from network\n"); + return 0; + } + + // loop just to skip empty packets + while ((length = rtp_get_next(fd, buffer, length)) == 0) { + mp_msg(MSGT_NETWORK, MSGL_ERR, "Got empty packet from RTP cache!?\n"); + } + + return(length); +} // Start listening on a UDP port. If multicast, join the group. static int rtp_open_socket( URL_t *url ) {

1 0

r18804 - trunk/libmpdemux/librtsp/rtsp.c
by ben 23 Jun '06

23 Jun '06

Author: ben Date: Sat Jun 24 00:23:07 2006 New Revision: 18804 Modified: trunk/libmpdemux/librtsp/rtsp.c Log: prevent a buffer overflow to occur at teardown Modified: trunk/libmpdemux/librtsp/rtsp.c ============================================================================== --- trunk/libmpdemux/librtsp/rtsp.c (original) +++ trunk/libmpdemux/librtsp/rtsp.c Sat Jun 24 00:23:07 2006 @@ -594,8 +594,10 @@ } rtsp_send_request (s, RTSP_METHOD_TEARDOWN, buf); free (buf); - - return rtsp_get_answers(s); + + /* after teardown we're done with RTSP streaming, no need to get answer as + reading more will only result to garbage and buffer overflow */ + return RTSP_STATUS_OK; } /*

1 0

r18803 - trunk/DOCS/tech/MAINTAINERS
by ben 23 Jun '06

23 Jun '06

Author: ben Date: Fri Jun 23 23:40:07 2006 New Revision: 18803 Modified: trunk/DOCS/tech/MAINTAINERS Log: added myself as the new librtsp maintainer Modified: trunk/DOCS/tech/MAINTAINERS ============================================================================== --- trunk/DOCS/tech/MAINTAINERS (original) +++ trunk/DOCS/tech/MAINTAINERS Fri Jun 23 23:40:07 2006 @@ -93,6 +93,7 @@ * libmpdvdkit2: None * libfaad2: Alex Beregszaszi * realrtsp: Roberto Togni + * librtsp: Benjamin Zores demuxers: * demux_fli.c - Roberto Togni

1 0

r18802 - in trunk/libmpdemux: Makefile librtsp librtsp/rtsp.c librtsp/rtsp.h librtsp/rtsp_session.c librtsp/rtsp_session.h realrtsp/real.h realrtsp/rtsp.c realrtsp/rtsp.h realrtsp/rtsp_session.c realrtsp/rtsp_session.h realrtsp/sdpplin.c realrtsp/sdpplin.h rtsp.c
by ben 23 Jun '06

23 Jun '06

Author: ben Date: Fri Jun 23 23:38:28 2006 New Revision: 18802 Added: trunk/libmpdemux/librtsp/ trunk/libmpdemux/librtsp/rtsp.c - copied unchanged from r18798, /trunk/libmpdemux/realrtsp/rtsp.c trunk/libmpdemux/librtsp/rtsp.h - copied unchanged from r18796, /trunk/libmpdemux/realrtsp/rtsp.h trunk/libmpdemux/librtsp/rtsp_session.c - copied, changed from r18801, /trunk/libmpdemux/realrtsp/rtsp_session.c trunk/libmpdemux/librtsp/rtsp_session.h - copied unchanged from r18801, /trunk/libmpdemux/realrtsp/rtsp_session.h Removed: trunk/libmpdemux/realrtsp/rtsp.c trunk/libmpdemux/realrtsp/rtsp.h trunk/libmpdemux/realrtsp/rtsp_session.c trunk/libmpdemux/realrtsp/rtsp_session.h Modified: trunk/libmpdemux/Makefile trunk/libmpdemux/realrtsp/real.h trunk/libmpdemux/realrtsp/sdpplin.c trunk/libmpdemux/realrtsp/sdpplin.h trunk/libmpdemux/rtsp.c Log: moved generic rtsp related files from realrtsp to librtsp Modified: trunk/libmpdemux/Makefile ============================================================================== --- trunk/libmpdemux/Makefile (original) +++ trunk/libmpdemux/Makefile Fri Jun 23 23:38:28 2006 @@ -135,11 +135,12 @@ SRCS += realrtsp/asmrp.c \ realrtsp/real.c \ realrtsp/rmff.c \ - realrtsp/rtsp.c \ - realrtsp/rtsp_session.c \ realrtsp/sdpplin.c \ realrtsp/xbuffer.c \ +SRCS += librtsp/rtsp.c \ + librtsp/rtsp_session.c \ + ifeq ($(STREAMING_LIVE555),yes) CPLUSPLUSSRCS = demux_rtp.cpp demux_rtp_codec.cpp CPLUSPLUSINCLUDE = $(LIVE_INCLUDES) @@ -185,7 +186,9 @@ $(ALSA_LIB) $(VORBIS_LIB) $(CDPARANOIA_LIB) -lz -lpthread clean: - rm -f *.o *.a *~ realrtsp/*.o realrtsp/*.a realrtsp/*~ + rm -f *.o *.a *~ \ + realrtsp/*.o realrtsp/*.a realrtsp/*~ \ + librtsp/*.o librtsp/*.a librtsp/*~ distclean: clean rm -f .depend test Copied: trunk/libmpdemux/librtsp/rtsp_session.c (from r18801, /trunk/libmpdemux/realrtsp/rtsp_session.c) ============================================================================== --- /trunk/libmpdemux/realrtsp/rtsp_session.c (original) +++ trunk/libmpdemux/librtsp/rtsp_session.c Fri Jun 23 23:38:28 2006 @@ -44,10 +44,10 @@ #include "mp_msg.h" #include "rtsp.h" #include "rtsp_session.h" -#include "real.h" -#include "rmff.h" -#include "asmrp.h" -#include "xbuffer.h" +#include "../realrtsp/real.h" +#include "../realrtsp/rmff.h" +#include "../realrtsp/asmrp.h" +#include "../realrtsp/xbuffer.h" /* #define LOG Modified: trunk/libmpdemux/realrtsp/real.h ============================================================================== --- trunk/libmpdemux/realrtsp/real.h (original) +++ trunk/libmpdemux/realrtsp/real.h Fri Jun 23 23:38:28 2006 @@ -31,7 +31,7 @@ #define HAVE_REAL_H #include "rmff.h" -#include "rtsp.h" +#include "../librtsp/rtsp.h" #define HEADER_SIZE 4096 Modified: trunk/libmpdemux/realrtsp/sdpplin.c ============================================================================== --- trunk/libmpdemux/realrtsp/sdpplin.c (original) +++ trunk/libmpdemux/realrtsp/sdpplin.c Fri Jun 23 23:38:28 2006 @@ -28,7 +28,7 @@ #include "config.h" #include "rmff.h" -#include "rtsp.h" +#include "../librtsp/rtsp.h" #include "sdpplin.h" #include "xbuffer.h" #include "mp_msg.h" Modified: trunk/libmpdemux/realrtsp/sdpplin.h ============================================================================== --- trunk/libmpdemux/realrtsp/sdpplin.h (original) +++ trunk/libmpdemux/realrtsp/sdpplin.h Fri Jun 23 23:38:28 2006 @@ -30,7 +30,7 @@ #define HAVE_SDPPLIN_H #include "rmff.h" -#include "rtsp.h" +#include "../librtsp/rtsp.h" typedef struct { Modified: trunk/libmpdemux/rtsp.c ============================================================================== --- trunk/libmpdemux/rtsp.c (original) +++ trunk/libmpdemux/rtsp.c Fri Jun 23 23:38:28 2006 @@ -37,8 +37,8 @@ #include <errno.h> #include "stream.h" -#include "realrtsp/rtsp.h" -#include "realrtsp/rtsp_session.h" +#include "librtsp/rtsp.h" +#include "librtsp/rtsp_session.h" #define RTSP_DEFAULT_PORT 554

1 0

r18801 - in trunk/libmpdemux/realrtsp: rtsp_session.c rtsp_session.h
by ben 23 Jun '06

23 Jun '06

Author: ben Date: Fri Jun 23 22:32:32 2006 New Revision: 18801 Modified: trunk/libmpdemux/realrtsp/rtsp_session.c trunk/libmpdemux/realrtsp/rtsp_session.h Log: remove some never called code Modified: trunk/libmpdemux/realrtsp/rtsp_session.c ============================================================================== --- trunk/libmpdemux/realrtsp/rtsp_session.c (original) +++ trunk/libmpdemux/realrtsp/rtsp_session.c Fri Jun 23 22:32:32 2006 @@ -191,22 +191,6 @@ return 0; } -int rtsp_session_peek_header(rtsp_session_t *this, char *buf, int maxsize) { - - int len; - - if (this->real_session) - { - len = (this->real_session->header_len < maxsize) - ? this->real_session->header_len : maxsize; - - memcpy(buf, this->real_session->header, len); - return len; - } - - return 0; -} - void rtsp_session_end(rtsp_session_t *session) { rtsp_close(session->s); Modified: trunk/libmpdemux/realrtsp/rtsp_session.h ============================================================================== --- trunk/libmpdemux/realrtsp/rtsp_session.h (original) +++ trunk/libmpdemux/realrtsp/rtsp_session.h Fri Jun 23 22:32:32 2006 @@ -34,8 +34,6 @@ int rtsp_session_read(rtsp_session_t *session, char *data, int len); -int rtsp_session_peek_header(rtsp_session_t *this, char *buf, int maxsize); - void rtsp_session_end(rtsp_session_t *session); #endif

1 0

r18800 - trunk/libmpdemux/rtsp.c
by ben 23 Jun '06

23 Jun '06

Author: ben Date: Fri Jun 23 22:28:12 2006 New Revision: 18800 Modified: trunk/libmpdemux/rtsp.c Log: prevent most RTSP streams from locking due to -idx Modified: trunk/libmpdemux/rtsp.c ============================================================================== --- trunk/libmpdemux/rtsp.c (original) +++ trunk/libmpdemux/rtsp.c Fri Jun 23 22:28:12 2006 @@ -149,6 +149,7 @@ stream->streaming_ctrl->url = check4proxies (url); stream->fd = -1; + index_mode = -1; /* prevent most RTSP streams from locking due to -idx */ if (rtsp_streaming_start (stream) < 0) { streaming_ctrl_free (stream->streaming_ctrl);

1 0