comparison raw.c @ 5191:9affc096944c libavformat

Make h261 and mpegvideo probe a little more robust so they dont fail with slightly different probetest.
author michael
date Tue, 15 Sep 2009 13:27:13 +0000
parents 2d15ea28c450
children c872818a8e1f
comparison
equal deleted inserted replaced
5190:4277da592002 5191:9affc096944c
324 if ((code & 0x1f0) == VIDEO_ID) pes++; 324 if ((code & 0x1f0) == VIDEO_ID) pes++;
325 else if((code & 0x1e0) == AUDIO_ID) pes++; 325 else if((code & 0x1e0) == AUDIO_ID) pes++;
326 } 326 }
327 } 327 }
328 if(seq && seq*9<=pic*10 && pic*9<=slice*10 && !pspack && !pes) 328 if(seq && seq*9<=pic*10 && pic*9<=slice*10 && !pspack && !pes)
329 return AVPROBE_SCORE_MAX/2+1; // +1 for .mpg 329 return pic>1 ? AVPROBE_SCORE_MAX/2+1 : AVPROBE_SCORE_MAX/4; // +1 for .mpg
330 return 0; 330 return 0;
331 } 331 }
332 #endif 332 #endif
333 333
334 #if CONFIG_CAVSVIDEO_DEMUXER 334 #if CONFIG_CAVSVIDEO_DEMUXER
513 }else{ //QCIF 513 }else{ //QCIF
514 next_gn= (gn+1+!!gn)% 7; 514 next_gn= (gn+1+!!gn)% 7;
515 } 515 }
516 } 516 }
517 } 517 }
518 if(valid_psc > 2*invalid_psc + 4){ 518 if(valid_psc > 2*invalid_psc + 6){
519 return 50; 519 return 50;
520 }else if(valid_psc > 2*invalid_psc + 2) 520 }else if(valid_psc > 2*invalid_psc + 2)
521 return 25; 521 return 25;
522 return 0; 522 return 0;
523 } 523 }