RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix all demuxers wich where using a global var to enable themself. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9752 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
albeu 2003-03-30 17:12:11 +00:00
parent 93ad150457
commit fc77d4acd3
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libmpdemux/demuxer.c
View File

@ -569,11 +569,21 @@ extern int ts_check_file(demuxer_t * demuxer);
extern demuxer_t* init_avi_with_ogg(demuxer_t* demuxer); extern demuxer_t* init_avi_with_ogg(demuxer_t* demuxer);
extern int use_rawaudio;
extern int use_rawvideo;
int extension_parsing=1; // 0=off 1=mixed (used only for unstable formats) int extension_parsing=1; // 0=off 1=mixed (used only for unstable formats)
/*
NOTE : Several demuxers may be opened at the same time so
demuxers should NEVER rely on an external var to enable them
self. If a demuxer can't do any autodection it should only use
file_format. The user can explictly set file_format with the -demuxer
option so there is really no need for another extra var.
For conivence an option can be added to set file_format directly
to the right type (ex: rawaudio,rawvideo).
Also the stream can override the file_format so a demuxer wich rely
on a special stream type can set file_format at the stream level
(ex: tv,mf).
*/
static demuxer_t* demux_open_stream(stream_t *stream,int file_format,int audio_id,int video_id,int dvdsub_id,char* filename){ static demuxer_t* demux_open_stream(stream_t *stream,int file_format,int audio_id,int video_id,int dvdsub_id,char* filename){
//int file_format=(*file_format_ptr); //int file_format=(*file_format_ptr);
@ -588,38 +598,25 @@ sh_video_t *sh_video=NULL;
//printf("demux_open(%p,%d,%d,%d,%d) \n",stream,file_format,audio_id,video_id,dvdsub_id); //printf("demux_open(%p,%d,%d,%d,%d) \n",stream,file_format,audio_id,video_id,dvdsub_id);
if ( mf_support ) if(file_format == DEMUXER_TYPE_RAWAUDIO) {
{
mp_msg(MSGT_DEMUXER,MSGL_INFO,"forced mf.\n");
file_format=DEMUXER_TYPE_MF;
}
if(stream->type == STREAMTYPE_CDDA || use_rawaudio) {
demuxer = new_demuxer(stream,DEMUXER_TYPE_RAWAUDIO,audio_id,video_id,dvdsub_id); demuxer = new_demuxer(stream,DEMUXER_TYPE_RAWAUDIO,audio_id,video_id,dvdsub_id);
file_format = DEMUXER_TYPE_RAWAUDIO;
} }
if(file_format == DEMUXER_TYPE_RAWVIDEO) { if(file_format == DEMUXER_TYPE_RAWVIDEO) {
demuxer = new_demuxer(stream,DEMUXER_TYPE_RAWVIDEO,audio_id,video_id,dvdsub_id); demuxer = new_demuxer(stream,DEMUXER_TYPE_RAWVIDEO,audio_id,video_id,dvdsub_id);
//file_format = DEMUXER_TYPE_RAWVIDEO;
} }
#ifdef USE_TV #ifdef USE_TV
//=============== Try to open as TV-input: ================= //=============== Try to open as TV-input: =================
if((tv_param_on == 1) && if(file_format==DEMUXER_TYPE_TV){
(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_TV)){
demuxer=new_demuxer(stream,DEMUXER_TYPE_TV,audio_id,video_id,dvdsub_id); demuxer=new_demuxer(stream,DEMUXER_TYPE_TV,audio_id,video_id,dvdsub_id);
mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedTV); mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedTV);
file_format=DEMUXER_TYPE_TV;
} }
#endif #endif
//=============== Try to open as multi file: ================= //=============== Try to open as multi file: =================
if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MF){ if(file_format==DEMUXER_TYPE_MF){
if ( mf_support ){
demuxer=new_demuxer(stream,DEMUXER_TYPE_MF,audio_id,video_id,dvdsub_id); demuxer=new_demuxer(stream,DEMUXER_TYPE_MF,audio_id,video_id,dvdsub_id);
file_format=DEMUXER_TYPE_MF;
mp_msg( MSGT_DEMUXER,MSGL_INFO,"[demuxer] mf support.\n" ); mp_msg( MSGT_DEMUXER,MSGL_INFO,"[demuxer] mf support.\n" );
}
} }
//=============== Try to open as AVI file: ================= //=============== Try to open as AVI file: =================