Mercurial > libavformat.hg

comparison mpeg.c @ 5422:3e5fefc4b475 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Flip the comparission direction of vid+audio+priv1 and pspack, it appears to have been wrong. Fixes issue1571.
author michael
date Tue, 08 Dec 2009 12:19:30 +0000
parents a4a45f236eec
children beac179b6765
comparison
equal deleted inserted replaced
5421:26a5d390beb0 5422:3e5fefc4b475
77 score= AVPROBE_SCORE_MAX/4; 77 score= AVPROBE_SCORE_MAX/4;
78 78
79 //av_log(NULL, AV_LOG_ERROR, "%d %d %d %d %d len:%d\n", sys, priv1, pspack,vid, audio, p->buf_size); 79 //av_log(NULL, AV_LOG_ERROR, "%d %d %d %d %d len:%d\n", sys, priv1, pspack,vid, audio, p->buf_size);
80 if(sys>invalid && sys*9 <= pspack*10) 80 if(sys>invalid && sys*9 <= pspack*10)
81 return pspack > 2 ? AVPROBE_SCORE_MAX/2+2 : AVPROBE_SCORE_MAX/4; // +1 for .mpg 81 return pspack > 2 ? AVPROBE_SCORE_MAX/2+2 : AVPROBE_SCORE_MAX/4; // +1 for .mpg
82 if(priv1 + vid + audio > invalid && (priv1+vid+audio)*9 <= pspack*10) 82 if(pspack > invalid && (priv1+vid+audio)*10 >= pspack*9)
83 return pspack > 2 ? AVPROBE_SCORE_MAX/2+2 : AVPROBE_SCORE_MAX/4; // +1 for .mpg 83 return pspack > 2 ? AVPROBE_SCORE_MAX/2+2 : AVPROBE_SCORE_MAX/4; // +1 for .mpg
84 if((!!vid ^ !!audio) && (audio > 4 || vid > 1) && !sys && !pspack && p->buf_size>2048 && vid + audio > invalid) /* PES stream */ 84 if((!!vid ^ !!audio) && (audio > 4 || vid > 1) && !sys && !pspack && p->buf_size>2048 && vid + audio > invalid) /* PES stream */
85 return (audio > 12 || vid > 3) ? AVPROBE_SCORE_MAX/2+2 : AVPROBE_SCORE_MAX/4; 85 return (audio > 12 || vid > 3) ? AVPROBE_SCORE_MAX/2+2 : AVPROBE_SCORE_MAX/4;
86 86
87 //02-Penguin.flac has sys:0 priv1:0 pspack:0 vid:0 audio:1 87 //02-Penguin.flac has sys:0 priv1:0 pspack:0 vid:0 audio:1