diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-03-16 20:13:28 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-03-16 20:13:28 +0000 |
| commit | 5c49cd8e07ca0f676f759bfb8e1e4a94636e2af6 (patch) | |
| tree | d8d453ffd3502d82418494650e44a6dae9ff5359 /libmpdemux/stream.c | |
| parent | 79102684ed09aef64829bb0ef67469dfccf5afe3 (diff) | |
| download | mpv-5c49cd8e07ca0f676f759bfb8e1e4a94636e2af6.tar.bz2 mpv-5c49cd8e07ca0f676f759bfb8e1e4a94636e2af6.tar.xz | |
this is a combo patch that:
1) adds an experimental TS demuxer to mplayer
2) adds an input (streaming) interface from DVB cards.
It compiles and runs with the following versions of the drivers:
dvb-kernel (HEAD) (with stock kernel 2.4.20) and 0.9.4 (with kernel 2.4.18)
patch by Nico <nsabbi@libero.it>
some cleanups, ts demuxer fixes by me
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9611 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/stream.c')
| -rw-r--r-- | libmpdemux/stream.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/libmpdemux/stream.c b/libmpdemux/stream.c index 18b45c56e4..ac1fb49d75 100644 --- a/libmpdemux/stream.c +++ b/libmpdemux/stream.c @@ -106,6 +106,15 @@ int stream_fill_buffer(stream_t *s){ case STREAMTYPE_DS: len = demux_read_data((demux_stream_t*)s->priv,s->buffer,STREAM_BUFFER_SIZE); break; + +#ifdef HAS_DVBIN_SUPPORT + case STREAMTYPE_DVB: + len = dvb_streaming_read(s->fd, s->buffer, STREAM_BUFFER_SIZE, s->priv); + break; +#endif + + + default: len=0; } if(len<=0){ s->eof=1; s->buf_pos=s->buf_len=0; return 0; } @@ -309,6 +318,12 @@ void free_stream(stream_t *s){ close_cdda(s); break; #endif +#ifdef HAS_DVBIN_SUPPORT + case STREAMTYPE_DVB: + dvbin_close(s->priv); + break; +#endif + #ifdef USE_DVDREAD case STREAMTYPE_DVD: dvd_close(s->priv); |