diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-05 00:39:07 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-05 00:39:07 +0000 |
| commit | fa788640e26698f98070cc01be09dc5071580881 (patch) | |
| tree | 3963d1dd69d48ad440e02251286001d90f5fbb01 /libmpdemux/demuxer.c | |
| parent | 11bc29e6cc3aaa2a70562f1142609d2800e2f6b9 (diff) | |
| download | mpv-fa788640e26698f98070cc01be09dc5071580881.tar.bz2 mpv-fa788640e26698f98070cc01be09dc5071580881.tar.xz | |
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
see <http://www.live.com/mplayer/> for details.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6911 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demuxer.c')
| -rw-r--r-- | libmpdemux/demuxer.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 1ad4090f4b..826293ff3d 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -150,6 +150,7 @@ extern void demux_close_fli(demuxer_t* demuxer); extern void demux_close_nuv(demuxer_t* demuxer); extern void demux_close_audio(demuxer_t* demuxer); extern void demux_close_ogg(demuxer_t* demuxer); +extern void demux_close_rtp(demuxer_t* demuxer); extern void demux_close_demuxers(demuxer_t* demuxer); extern void demux_close_avi(demuxer_t *demuxer); @@ -179,6 +180,10 @@ void free_demuxer(demuxer_t *demuxer){ demux_close_audio(demuxer); break; case DEMUXER_TYPE_OGG: demux_close_ogg(demuxer); break; +#ifdef STREAMING_LIVE_DOT_COM + case DEMUXER_TYPE_RTP: + demux_close_rtp(demuxer); break; +#endif case DEMUXER_TYPE_DEMUXERS: demux_close_demuxers(demuxer); return; case DEMUXER_TYPE_AVI: @@ -255,6 +260,7 @@ int demux_mov_fill_buffer(demuxer_t *demux,demux_stream_t* ds); int demux_vivo_fill_buffer(demuxer_t *demux); int demux_real_fill_buffer(demuxer_t *demuxer); int demux_nuv_fill_buffer(demuxer_t *demux); +int demux_rtp_fill_buffer(demuxer_t *demux, demux_stream_t* ds); #ifdef USE_TV #include "tv.h" extern tvi_handle_t *tv_handler; @@ -296,6 +302,9 @@ int demux_fill_buffer(demuxer_t *demux,demux_stream_t *ds){ case DEMUXER_TYPE_DEMUXERS: return demux_demuxers_fill_buffer(demux,ds); case DEMUXER_TYPE_OGG: return demux_ogg_fill_buffer(demux); case DEMUXER_TYPE_RAWAUDIO: return demux_rawaudio_fill_buffer(demux,ds); +#ifdef STREAMING_LIVE_DOT_COM + case DEMUXER_TYPE_RTP: return demux_rtp_fill_buffer(demux, ds); +#endif } return 0; } @@ -793,6 +802,11 @@ if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_AUDIO){ demuxer = NULL; } } +//=============== Try to open as a RTP stream): =========== + if(file_format==DEMUXER_TYPE_RTP) { + demuxer=new_demuxer(stream,DEMUXER_TYPE_RTP,audio_id,video_id,dvdsub_id); + } + //=============== Unknown, exiting... =========================== if(file_format==DEMUXER_TYPE_UNKNOWN || demuxer == NULL){ mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_FormatNotRecognized); @@ -949,6 +963,12 @@ switch(file_format){ break; } #endif +#ifdef STREAMING_LIVE_DOT_COM + case DEMUXER_TYPE_RTP: { + demux_open_rtp(demuxer); + break; + } +#endif } // switch(file_format) pts_from_bps=0; // !!! return demuxer; |