virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-06-19 19:03:00 +02:00
Code Issues Releases Activity

avoid too many false detections

Browse Source 
Originally committed as revision 1537 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Fabrice Bellard
2003-02-02 20:04:03 +00:00
parent 4c7e861929
commit fa7773216a
2 changed files with 37 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavformat/mpeg.c
+9 -6
View File
@@ -405,15 +405,19 @@ static int mpeg_mux_end(AVFormatContext *ctx)
static int mpegps_probe(AVProbeData *p) static int mpegps_probe(AVProbeData *p)
{ {
int code, c, i; int code;
code = 0xff; const uint8_t *d;
/* we search the first start code. If it is a packet start code, /* we search the first start code. If it is a packet start code,
then we decide it is mpeg ps. We do not send highest value to then we decide it is mpeg ps. We do not send highest value to
give a chance to mpegts */ give a chance to mpegts */
for(i=0;i<p->buf_size;i++) { /* NOTE: the search range was restricted to avoid too many false
c = p->buf[i]; detections */
code = (code << 8) | c;
if (p->buf_size < 6)
return 0;
d = p->buf;
code = (d[0] << 24) | (d[1] << 16) | (d[2] << 8) | (d[3]);
if ((code & 0xffffff00) == 0x100) { if ((code & 0xffffff00) == 0x100) {
if (code == PACK_START_CODE || if (code == PACK_START_CODE ||
code == SYSTEM_HEADER_START_CODE || code == SYSTEM_HEADER_START_CODE ||
@@ -427,7 +431,6 @@ static int mpegps_probe(AVProbeData *p)
else else
return 0; return 0;
} }
}
return 0; return 0;
} }
libavformat/raw.c
+9 -6
View File
@@ -153,15 +153,19 @@ static int video_read_header(AVFormatContext *s,
/* XXX: improve that by looking at several start codes */ /* XXX: improve that by looking at several start codes */
static int mpegvideo_probe(AVProbeData *p) static int mpegvideo_probe(AVProbeData *p)
{ {
int code, c, i; int code;
code = 0xff; const uint8_t *d;
/* we search the first start code. If it is a sequence, gop or /* we search the first start code. If it is a sequence, gop or
picture start code then we decide it is an mpeg video picture start code then we decide it is an mpeg video
stream. We do not send highest value to give a chance to mpegts */ stream. We do not send highest value to give a chance to mpegts */
for(i=0;i<p->buf_size;i++) { /* NOTE: the search range was restricted to avoid too many false
c = p->buf[i]; detections */
code = (code << 8) | c;
if (p->buf_size < 6)
return 0;
d = p->buf;
code = (d[0] << 24) | (d[1] << 16) | (d[2] << 8) | (d[3]);
if ((code & 0xffffff00) == 0x100) { if ((code & 0xffffff00) == 0x100) {
if (code == SEQ_START_CODE || if (code == SEQ_START_CODE ||
code == GOP_START_CODE || code == GOP_START_CODE ||
@@ -170,7 +174,6 @@ static int mpegvideo_probe(AVProbeData *p)
else else
return 0; return 0;
} }
}
return 0; return 0;
} }