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

moved mpeg-ps/es probing code to demux_mpg.c

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15671 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
nicodvb 2005-06-06 21:30:53 +00:00
parent 8f224ba1bc
commit 2b1fef3a98
2 changed files with 110 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
libmpdemux/demux_mpg.c
View File

@ -387,20 +387,100 @@ static int demux_mpg_read_packet(demuxer_t *demux,int id){
return 0; return 0;
} }
int num_elementary_packets100=0; static int num_elementary_packets100=0;
int num_elementary_packets101=0; static int num_elementary_packets101=0;
int num_elementary_packets12x=0; static int num_elementary_packets12x=0;
int num_elementary_packets1B6=0; static int num_elementary_packets1B6=0;
int num_elementary_packetsPES=0; static int num_elementary_packetsPES=0;
int num_h264_slice=0; //combined slice static int num_h264_slice=0; //combined slice
int num_h264_dpa=0; //DPA Slice static int num_h264_dpa=0; //DPA Slice
int num_h264_dpb=0; //DPB Slice static int num_h264_dpb=0; //DPB Slice
int num_h264_dpc=0; //DPC Slice static int num_h264_dpc=0; //DPC Slice
int num_h264_idr=0; //IDR Slice static int num_h264_idr=0; //IDR Slice
int num_h264_sps=0; static int num_h264_sps=0;
int num_h264_pps=0; static int num_h264_pps=0;
int num_mp3audio_packets=0; static int num_mp3audio_packets=0;
int demux_mpg_probe(demuxer_t *demuxer) {
int pes=1;
int tmp;
off_t tmppos;
int file_format = DEMUXER_TYPE_UNKNOWN;
tmppos=stream_tell(demuxer->stream);
tmp=stream_read_dword(demuxer->stream);
if(tmp==0x1E0 || tmp==0x1C0) {
tmp=stream_read_word(demuxer->stream);
if(tmp>1 && tmp<=2048) pes=0; // demuxer->synced=3; // PES...
}
stream_seek(demuxer->stream,tmppos);
num_elementary_packets100=0;
num_elementary_packets101=0;
num_elementary_packets1B6=0;
num_elementary_packets12x=0;
num_elementary_packetsPES=0;
num_h264_slice=0; //combined slice
num_h264_dpa=0; //DPA Slice
num_h264_dpb=0; //DPB Slice
num_h264_dpc=0; //DPC Slice
num_h264_idr=0; //IDR Slice
num_h264_sps=0;
num_h264_pps=0;
num_mp3audio_packets=0;
if(demux_mpg_open(demuxer))
file_format=DEMUXER_TYPE_MPEG_PS;
else {
mp_msg(MSGT_DEMUX,MSGL_V,"MPEG packet stats: p100: %d p101: %d p1B6: %d p12x: %d sli: %d a: %d b: %d c: %d idr: %d sps: %d pps: %d PES: %d MP3: %d, synced: %d\n",
num_elementary_packets100,num_elementary_packets101,
num_elementary_packets1B6,num_elementary_packets12x,
num_h264_slice, num_h264_dpa,
num_h264_dpb, num_h264_dpc=0,
num_h264_idr, num_h264_sps=0,
num_h264_pps,
num_elementary_packetsPES,num_mp3audio_packets, demuxer->synced);
//MPEG packet stats: p100: 458 p101: 458 PES: 0 MP3: 1103 (.m2v)
if(num_mp3audio_packets>50 && num_mp3audio_packets>2*num_elementary_packets100
&& abs(num_elementary_packets100-num_elementary_packets101)>2)
return file_format;
// some hack to get meaningfull error messages to our unhappy users:
if(num_elementary_packets100>=2 && num_elementary_packets101>=2 &&
abs(num_elementary_packets101+8-num_elementary_packets100)<16) {
if(num_elementary_packetsPES>=4 && num_elementary_packetsPES>=num_elementary_packets100-4) {
return file_format;
}
file_format=DEMUXER_TYPE_MPEG_ES; // <-- hack is here :)
} else
#if 1
// fuzzy mpeg4-es detection. do NOT enable without heavy testing of mpeg formats detection!
if(num_elementary_packets1B6>3 && num_elementary_packets12x>=1 &&
num_elementary_packetsPES==0 && num_elementary_packets100<=num_elementary_packets12x &&
demuxer->synced<2) {
file_format=DEMUXER_TYPE_MPEG4_ES;
} else
#endif
#if 1
// fuzzy h264-es detection. do NOT enable without heavy testing of mpeg formats detection!
if((num_h264_slice>3 || (num_h264_dpa>3 && num_h264_dpb>3 && num_h264_dpc>3)) &&
/* FIXME num_h264_sps>=1 && */ num_h264_pps>=1 && num_h264_idr>=1 &&
num_elementary_packets1B6==0 && num_elementary_packetsPES==0 &&
demuxer->synced<2) {
file_format=DEMUXER_TYPE_H264_ES;
} else
#endif
{
if(demuxer->synced==2)
mp_msg(MSGT_DEMUXER,MSGL_ERR,"MPEG: " MSGTR_MissingVideoStreamBug);
else
mp_msg(MSGT_DEMUXER,MSGL_V,MSGTR_NotSystemStream);
}
}
return file_format;
}
int demux_mpg_es_fill_buffer(demuxer_t *demux){ int demux_mpg_es_fill_buffer(demuxer_t *demux){
// Elementary video stream // Elementary video stream

119
libmpdemux/demuxer.c
View File

@ -584,21 +584,6 @@ float ds_get_next_pts(demux_stream_t *ds) {
// ==================================================================== // ====================================================================
// feed-back from demuxers:
extern int num_elementary_packets100; // for MPEG-ES fileformat detection
extern int num_elementary_packets101;
extern int num_elementary_packetsPES;
extern int num_elementary_packets1B6;
extern int num_elementary_packets12x;
extern int num_h264_slice; //combined slice
extern int num_h264_dpa; //DPA Slice
extern int num_h264_dpb; //DPB Slice
extern int num_h264_dpc; //DPC Slice
extern int num_h264_idr; //IDR Slice
extern int num_h264_sps;
extern int num_h264_pps;
extern int num_mp3audio_packets;
// commandline options, flags: // commandline options, flags:
extern int force_ni; extern int force_ni;
extern int pts_from_bps; extern int pts_from_bps;
@ -617,6 +602,7 @@ int demux_open_fli(demuxer_t* demuxer);
int demux_open_mf(demuxer_t* demuxer); int demux_open_mf(demuxer_t* demuxer);
int demux_open_film(demuxer_t* demuxer); int demux_open_film(demuxer_t* demuxer);
int demux_open_roq(demuxer_t* demuxer); int demux_open_roq(demuxer_t* demuxer);
int demux_mpg_probe(demuxer_t *demuxer);
#ifdef HAVE_LIBDV095 #ifdef HAVE_LIBDV095
int demux_open_rawdv(demuxer_t* demuxer); int demux_open_rawdv(demuxer_t* demuxer);
extern int rawdv_check_file(demuxer_t *demuxer); extern int rawdv_check_file(demuxer_t *demuxer);
@ -1000,96 +986,25 @@ if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_LMLM4){
demuxer = NULL; demuxer = NULL;
} }
} }
//=============== 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; demuxer=new_demuxer(stream,DEMUXER_TYPE_MPEG_PS,audio_id,video_id,dvdsub_id);
int tmp; file_format = demux_mpg_probe(demuxer);
off_t tmppos; mp_msg(MSGT_DEMUXER,MSGL_V,"demux_mpg_probe returned file_format %d\n", file_format);
file_format=DEMUXER_TYPE_UNKNOWN; if(file_format==DEMUXER_TYPE_UNKNOWN) {
while(pes>=0){ free_demuxer(demuxer);
demuxer=new_demuxer(stream,DEMUXER_TYPE_MPEG_PS,audio_id,video_id,dvdsub_id); demuxer=new_demuxer(stream,DEMUXER_TYPE_MPEG_PS,audio_id,video_id,dvdsub_id);
demuxer->synced = 3;
// try to pre-detect PES: file_format = demux_mpg_probe(demuxer);
tmppos=stream_tell(demuxer->stream); mp_msg(MSGT_DEMUXER,MSGL_V,"demux_mpg_probe returned file_format %d\n", file_format);
tmp=stream_read_dword(demuxer->stream); if(file_format==DEMUXER_TYPE_MPEG_PS)
if(tmp==0x1E0 || tmp==0x1C0){
tmp=stream_read_word(demuxer->stream);
if(tmp>1 && tmp<=2048) pes=0; // demuxer->synced=3; // PES...
}
stream_seek(demuxer->stream,tmppos);
if(!pes) demuxer->synced=3; // hack!
num_elementary_packets100=0;
num_elementary_packets101=0;
num_elementary_packets1B6=0;
num_elementary_packets12x=0;
num_elementary_packetsPES=0;
num_h264_slice=0; //combined slice
num_h264_dpa=0; //DPA Slice
num_h264_dpb=0; //DPB Slice
num_h264_dpc=0; //DPC Slice
num_h264_idr=0; //IDR Slice
num_h264_sps=0;
num_h264_pps=0;
num_mp3audio_packets=0;
if(demux_mpg_open(demuxer)){
if(!pes)
mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"MPEG-PES"); mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"MPEG-PES");
else } else if(file_format==DEMUXER_TYPE_MPEG_PS)
mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"MPEG-PS"); mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"MPEG-PS");
file_format=DEMUXER_TYPE_MPEG_PS;
} else { if(file_format != DEMUXER_TYPE_MPEG_PS) {
mp_msg(MSGT_DEMUX,MSGL_V,"MPEG packet stats: p100: %d p101: %d p1B6: %d p12x: %d sli: %d a: %d b: %d c: %d idr: %d sps: %d pps: %d PES: %d MP3: %d \n", free_demuxer(demuxer);
num_elementary_packets100,num_elementary_packets101, demuxer = NULL;
num_elementary_packets1B6,num_elementary_packets12x,
num_h264_slice, num_h264_dpa,
num_h264_dpb, num_h264_dpc=0,
num_h264_idr, num_h264_sps=0,
num_h264_pps,
num_elementary_packetsPES,num_mp3audio_packets);
//MPEG packet stats: p100: 458 p101: 458 PES: 0 MP3: 1103 (.m2v)
if(num_mp3audio_packets>50 && num_mp3audio_packets>2*num_elementary_packets100
&& abs(num_elementary_packets100-num_elementary_packets101)>2)
break; // it's .MP3
// some hack to get meaningfull error messages to our unhappy users:
if(num_elementary_packets100>=2 && num_elementary_packets101>=2 &&
abs(num_elementary_packets101+8-num_elementary_packets100)<16){
if(num_elementary_packetsPES>=4 && num_elementary_packetsPES>=num_elementary_packets100-4){
--pes;continue; // tricky...
}
file_format=DEMUXER_TYPE_MPEG_ES; // <-- hack is here :)
} else
#if 1
// fuzzy mpeg4-es detection. do NOT enable without heavy testing of mpeg formats detection!
if(num_elementary_packets1B6>3 && num_elementary_packets12x>=1 &&
num_elementary_packetsPES==0 && num_elementary_packets100<=num_elementary_packets12x &&
demuxer->synced<2){
file_format=DEMUXER_TYPE_MPEG4_ES;
} else
#endif
#if 1
// fuzzy h264-es detection. do NOT enable without heavy testing of mpeg formats detection!
if((num_h264_slice>3 || (num_h264_dpa>3 && num_h264_dpb>3 && num_h264_dpc>3)) &&
/* FIXME num_h264_sps>=1 && */ num_h264_pps>=1 && num_h264_idr>=1 &&
num_elementary_packets1B6==0 && num_elementary_packetsPES==0 &&
demuxer->synced<2){
file_format=DEMUXER_TYPE_H264_ES;
} else
#endif
{
if(demuxer->synced==2)
mp_msg(MSGT_DEMUXER,MSGL_ERR,"MPEG: " MSGTR_MissingVideoStreamBug);
else
mp_msg(MSGT_DEMUXER,MSGL_V,MSGTR_NotSystemStream);
}
if (demuxer && file_format != DEMUXER_TYPE_MPEG_PS) {
free_demuxer(demuxer);
demuxer = NULL;
}
}
break;
} }
} }
//=============== Try to open as MPEG-ES file: ================= //=============== Try to open as MPEG-ES file: =================