summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2006-02-08 17:35:44 +0000
committerMichael Niedermayer <michaelni@gmx.at>2006-02-08 17:35:44 +0000
commit9870a7bdb897fe66bfd029ff1ba90f9b3653ecf2 (patch)
treef19bcaa9e3877a594f63eb3a7a5ce89e989d3ca2
parent47f388503b1b94b8ddba9d9e257921f34d71c063 (diff)
downloadffmpeg-streaming-9870a7bdb897fe66bfd029ff1ba90f9b3653ecf2.zip
ffmpeg-streaming-9870a7bdb897fe66bfd029ff1ba90f9b3653ecf2.tar.gz
replace probe() by one similar to MPEG-ES
Originally committed as revision 4964 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/mpeg.c31
1 files changed, 10 insertions, 21 deletions
diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c
index 11a2e32..b45dca0 100644
--- a/libavformat/mpeg.c
+++ b/libavformat/mpeg.c
@@ -1262,32 +1262,21 @@ static int mpeg_mux_end(AVFormatContext *ctx)
static int mpegps_probe(AVProbeData *p)
{
+ uint32_t code= -1;
+ int sys=0, pspack=0;
int i;
- int size= FFMIN(20, p->buf_size);
- uint32_t code=0xFF;
- /* 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 */
- /* NOTE: the search range was restricted to avoid too many false
- detections */
-
- for (i = 0; i < size; i++) {
- code = (code << 8) | p->buf[i];
+ for(i=0; i<p->buf_size; i++){
+ code = (code<<8) + p->buf[i];
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 - 2;
- else
- return 0;
+ switch(code){
+ case SYSTEM_HEADER_START_CODE: sys++; break;
+ case PACK_START_CODE: pspack++; break;
+ }
}
}
+ if(sys && sys*9 <= pspack*10)
+ return AVPROBE_SCORE_MAX/2+2; // +1 for .mpg
return 0;
}
OpenPOWER on IntegriCloud