RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-26 10:14:33 +00:00
Code Issues Releases Wiki Activity

file format detection reordered to get better hits

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3257 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2001-12-01 22:12:58 +00:00
parent c5347864c0
commit 0f1fa8e4fc
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
libmpdemux/demuxer.c
View File

@ -385,19 +385,6 @@ if((tv_param_on == 1) &&
file_format=DEMUXER_TYPE_TV; file_format=DEMUXER_TYPE_TV;
} }
#endif #endif
//=============== Try to open as FLI file: =================
if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_FLI){
demuxer=new_demuxer(stream,DEMUXER_TYPE_FLI,audio_id,video_id,dvdsub_id);
{
int size=stream_read_dword_le(demuxer->stream);
int id=stream_read_word_le(demuxer->stream);
// chech for the FLI file magic number
if((id==0xAF11) || (id==0xAF12)){
mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedFLIfile);
file_format=DEMUXER_TYPE_FLI;
}
}
}
//=============== Try to open as AVI file: ================= //=============== Try to open as AVI file: =================
if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_AVI){ if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_AVI){
@ -430,6 +417,27 @@ if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MOV){
file_format=DEMUXER_TYPE_MOV; file_format=DEMUXER_TYPE_MOV;
} }
} }
//=============== Try to open as VIVO file: =================
if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_VIVO){
demuxer=new_demuxer(stream,DEMUXER_TYPE_VIVO,audio_id,video_id,dvdsub_id);
if(vivo_check_file(demuxer)){
mp_msg(MSGT_DEMUXER,MSGL_INFO,"Detected VIVO file format!\n");
file_format=DEMUXER_TYPE_VIVO;
}
}
//=============== Try to open as FLI file: =================
if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_FLI){
demuxer=new_demuxer(stream,DEMUXER_TYPE_FLI,audio_id,video_id,dvdsub_id);
{
int size=stream_read_dword_le(demuxer->stream);
int id=stream_read_word_le(demuxer->stream);
// chech for the FLI file magic number
if((id==0xAF11) || (id==0xAF12)){
mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedFLIfile);
file_format=DEMUXER_TYPE_FLI;
}
}
}
//=============== Try to open as MPEG-PS file: ================= //=============== Try to open as MPEG-PS file: =================
if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MPEG_PS){ if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MPEG_PS){
int pes=1; int pes=1;
@ -477,14 +485,6 @@ if(file_format==DEMUXER_TYPE_MPEG_ES){ // little hack, see above!
mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedMPEGESfile); mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedMPEGESfile);
} }
} }
//=============== Try to open as VIVO file: =================
if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_VIVO){
demuxer=new_demuxer(stream,DEMUXER_TYPE_VIVO,audio_id,video_id,dvdsub_id);
if(vivo_check_file(demuxer)){
mp_msg(MSGT_DEMUXER,MSGL_INFO,"Detected VIVO file format!\n");
file_format=DEMUXER_TYPE_VIVO;
}
}
//=============== Unknown, exiting... =========================== //=============== Unknown, exiting... ===========================
if(file_format==DEMUXER_TYPE_UNKNOWN){ if(file_format==DEMUXER_TYPE_UNKNOWN){
mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_FormatNotRecognized); mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_FormatNotRecognized);