Commit 891f33cc authored by Michael Niedermayer's avatar Michael Niedermayer

avformat/h261dec: optimize probe

about 3 times faster
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent c79c7ffc
...@@ -25,33 +25,30 @@ ...@@ -25,33 +25,30 @@
static int h261_probe(AVProbeData *p) static int h261_probe(AVProbeData *p)
{ {
uint32_t code= -1;
int i; int i;
int valid_psc=0; int valid_psc=0;
int invalid_psc=0; int invalid_psc=0;
int next_gn=0; int next_gn=0;
int src_fmt=0; int src_fmt=0;
GetBitContext gb;
init_get_bits8(&gb, p->buf, p->buf_size); for(i=0; i<p->buf_size; i++){
if ((AV_RB16(&p->buf[i]) - 1) < 0xFFU) {
int shift = av_log2_16bit(p->buf[i+1]);
uint32_t code = AV_RB64(&p->buf[FFMAX(i-1, 0)]) >> (24+shift);
if ((code & 0xffff0000) == 0x10000) {
int gn= (code>>12)&0xf;
if(!gn)
src_fmt= code&8;
if(gn != next_gn) invalid_psc++;
else valid_psc++;
for(i=0; i<p->buf_size*8; i++){ if(src_fmt){ // CIF
if ((code & 0x01ff0000) || !(code & 0xff00)) { static const int lut[16]={1,2,3,4,5,6,7,8,9,10,11,12,0,1,2,3};
code = (code<<8) + get_bits(&gb, 8); next_gn = lut[gn];
i += 7; }else{ //QCIF
} else static const int lut[16]={1,3,4,5,6,0,1,2,3,4,5,6,0,1,2,3,4};
code = (code<<1) + get_bits1(&gb); next_gn = lut[gn];
if ((code & 0xffff0000) == 0x10000) { }
int gn= (code>>12)&0xf;
if(!gn)
src_fmt= code&8;
if(gn != next_gn) invalid_psc++;
else valid_psc++;
if(src_fmt){ // CIF
next_gn= (gn+1 )%13;
}else{ //QCIF
next_gn= (gn+1+!!gn)% 7;
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment