RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avoid too many false detections 

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
libavformat/mpeg.c
View File

@ -405,28 +405,31 @@ static int mpeg_mux_end(AVFormatContext *ctx)
static int mpegps_probe(AVProbeData *p)
{
int code, c, i;
code = 0xff;
int code;
const uint8_t *d;
/* 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
give a chance to mpegts */
for(i=0;i<p->buf_size;i++) {
c = p->buf[i];
code = (code << 8) | c;
if ((code & 0xffffff00) == 0x100) {
if (code == PACK_START_CODE ||
code == SYSTEM_HEADER_START_CODE ||
(code >= 0x1e0 && code <= 0x1ef) ||
(code >= 0x1c0 && code <= 0x1df) ||
code == PRIVATE_STREAM_2 ||
code == PROGRAM_STREAM_MAP ||
code == PRIVATE_STREAM_1 ||
code == PADDING_STREAM)
return AVPROBE_SCORE_MAX - 1;
else
return 0;
}
/* NOTE: the search range was restricted to avoid too many false
detections */
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 == PACK_START_CODE ||
code == SYSTEM_HEADER_START_CODE ||
(code >= 0x1e0 && code <= 0x1ef) ||
(code >= 0x1c0 && code <= 0x1df) ||
code == PRIVATE_STREAM_2 ||
code == PROGRAM_STREAM_MAP ||
code == PRIVATE_STREAM_1 ||
code == PADDING_STREAM)
return AVPROBE_SCORE_MAX - 1;
else
return 0;
}
return 0;
}

29
libavformat/raw.c
View File

@ -153,23 +153,26 @@ static int video_read_header(AVFormatContext *s,
/* XXX: improve that by looking at several start codes */
static int mpegvideo_probe(AVProbeData *p)
{
int code, c, i;
code = 0xff;
int code;
const uint8_t *d;
/* we search the first start code. If it is a sequence, gop or
picture start code then we decide it is an mpeg video
stream. We do not send highest value to give a chance to mpegts */
for(i=0;i<p->buf_size;i++) {
c = p->buf[i];
code = (code << 8) | c;
if ((code & 0xffffff00) == 0x100) {
if (code == SEQ_START_CODE ||
code == GOP_START_CODE ||
code == PICTURE_START_CODE)
return 50 - 1;
else
return 0;
}
/* NOTE: the search range was restricted to avoid too many false
detections */
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 == SEQ_START_CODE ||
code == GOP_START_CODE ||
code == PICTURE_START_CODE)
return 50 - 1;
else
return 0;
}
return 0;
}