RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-20 13:52:10 +00:00
Code Issues Releases Wiki Activity

Repairing breakage to RTP streaming. Patch by Ross Finlayson <finlayson@live.com>

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9458 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
bertrand 2003-02-18 22:33:44 +00:00
parent 14c4084899
commit 12322d2517
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libmpdemux/demux_rtp.cpp
View File

@ -112,6 +112,9 @@ extern "C" void demux_open_rtp(demuxer_t* demuxer) {
RTSPClient* rtspClient = NULL;
unsigned flags = 0;
if (demuxer == NULL || demuxer->stream == NULL) break; // shouldn't happen
demuxer->stream->eof = 0; // just in case
// Look at the stream's 'priv' field to see if we were initiated
// via a SDP description:
char* sdpDescription = (char*)(demuxer->stream->priv);

18
libmpdemux/video.c
View File

@ -25,6 +25,10 @@
/* biCompression constant */
#define BI_RGB 0L
#ifdef STREAMING_LIVE_DOT_COM
#include "demux_rtp.h"
#endif
static mp_mpeg_header_t picture;
static int telecine=0;
@ -82,13 +86,6 @@ switch(d_video->demuxer->file_format){
#endif
break;
}
#ifdef STREAMING_LIVE_DOT_COM
case DEMUXER_TYPE_RTP:
// If the RTP stream is a MPEG stream, then we use this code to check
// for MPEG headers:
if (!demux_is_mpeg_rtp_stream(d_video->demuxer)) break;
// otherwise fall through to...
#endif
case DEMUXER_TYPE_MPEG4_ES: {
videobuf_len=0; videobuf_code_len=0;
mp_msg(MSGT_DECVIDEO,MSGL_V,"Searching for Video Object Start code... ");fflush(stdout);
@ -129,6 +126,13 @@ switch(d_video->demuxer->file_format){
sh_video->format=0x10000004;
break;
}
#ifdef STREAMING_LIVE_DOT_COM
case DEMUXER_TYPE_RTP:
// If the RTP stream is a MPEG stream, then we use this code to check
// for MPEG headers:
if (!demux_is_mpeg_rtp_stream(d_video->demuxer)) break;
// otherwise fall through to...
#endif
case DEMUXER_TYPE_PVA:
case DEMUXER_TYPE_MPEG_ES:
case DEMUXER_TYPE_MPEG_PS: {