Mercurial > mplayer.hg

comparison libmpdemux/open.c @ 9610:76c6d8f1ebf5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author arpi
date Sun, 16 Mar 2003 20:13:28 +0000
parents aa0dd1f998d9
children b320a02fa57b
comparison
equal deleted inserted replaced
9609:bb8593ea37cb 9610:76c6d8f1ebf5
27 #include "demux_rtp.h" 27 #include "demux_rtp.h"
28 int isSDPFile = 0; 28 int isSDPFile = 0;
29 #endif 29 #endif
30 static URL_t* url; 30 static URL_t* url;
31 #endif 31 #endif
32
33 int dvbin_param_on=0;
32 34
33 int dvd_title=0; 35 int dvd_title=0;
34 int dvd_chapter=1; 36 int dvd_chapter=1;
35 int dvd_last_chapter=0; 37 int dvd_last_chapter=0;
36 int dvd_angle=1; 38 int dvd_angle=1;
73 #ifdef USE_TV 75 #ifdef USE_TV
74 #include "tv.h" 76 #include "tv.h"
75 77
76 extern int stream_open_tv(stream_t *stream, tvi_handle_t *tvh); 78 extern int stream_open_tv(stream_t *stream, tvi_handle_t *tvh);
77 #endif 79 #endif
80
81 #ifdef HAS_DVBIN_SUPPORT
82 #include "dvbin.h"
83 #endif
84
85
78 86
79 #ifdef HAVE_CDDA 87 #ifdef HAVE_CDDA
80 stream_t* open_cdda(char* dev,char* track); 88 stream_t* open_cdda(char* dev,char* track);
81 #ifdef STREAMING 89 #ifdef STREAMING
82 stream_t* cddb_open(char* dev,char* track); 90 stream_t* cddb_open(char* dev,char* track);
476 stream->priv=(void*)d; 484 stream->priv=(void*)d;
477 return stream; 485 return stream;
478 } 486 }
479 #endif 487 #endif
480 488
489 #ifdef HAS_DVBIN_SUPPORT
490 if(dvbin_param_on == 1)
491 {
492 stream = new_stream(-1, STREAMTYPE_DVB);
493 if (!stream)
494 return(NULL);
495 if (!dvb_streaming_start(stream))
496 return NULL;
497
498 return stream;
499 }
500 #endif
501
502
503
504
481 //============ Check for TV-input or multi-file input ==== 505 //============ Check for TV-input or multi-file input ====
482 if( (mf_support == 1) 506 if( (mf_support == 1)
483 #ifdef USE_TV 507 #ifdef USE_TV
484 || (tv_param_on == 1) 508 || (tv_param_on == 1)
485 #endif 509 #endif