Mercurial > libavcodec.hg
comparison huffyuv.c @ 11959:447f1cd16355 libavcodec
huffyuv: remove unnecessary size argument from generate_len_table()
author | mru |
---|---|
date | Fri, 25 Jun 2010 19:28:10 +0000 |
parents | eef5eced3032 |
children |
comparison
equal
deleted
inserted
replaced
11958:51f89053fca5 | 11959:447f1cd16355 |
---|---|
229 } else | 229 } else |
230 break; | 230 break; |
231 } | 231 } |
232 } | 232 } |
233 | 233 |
234 static void generate_len_table(uint8_t *dst, const uint64_t *stats, int size){ | 234 static void generate_len_table(uint8_t *dst, const uint64_t *stats){ |
235 HeapElem h[256]; | 235 HeapElem h[256]; |
236 int up[2*256]; | 236 int up[2*256]; |
237 int len[2*256]; | 237 int len[2*256]; |
238 int offset, i, next; | 238 int offset, i, next; |
239 int size = 256; | |
239 | 240 |
240 for(offset=1; ; offset<<=1){ | 241 for(offset=1; ; offset<<=1){ |
241 for(i=0; i<size; i++){ | 242 for(i=0; i<size; i++){ |
242 h[i].name = i; | 243 h[i].name = i; |
243 h[i].val = (stats[i] << 8) + offset; | 244 h[i].val = (stats[i] << 8) + offset; |
644 s->stats[i][j]= 100000000/(d+1); | 645 s->stats[i][j]= 100000000/(d+1); |
645 } | 646 } |
646 } | 647 } |
647 | 648 |
648 for(i=0; i<3; i++){ | 649 for(i=0; i<3; i++){ |
649 generate_len_table(s->len[i], s->stats[i], 256); | 650 generate_len_table(s->len[i], s->stats[i]); |
650 | 651 |
651 if(generate_bits_table(s->bits[i], s->len[i])<0){ | 652 if(generate_bits_table(s->bits[i], s->len[i])<0){ |
652 return -1; | 653 return -1; |
653 } | 654 } |
654 | 655 |
1222 p->pict_type= FF_I_TYPE; | 1223 p->pict_type= FF_I_TYPE; |
1223 p->key_frame= 1; | 1224 p->key_frame= 1; |
1224 | 1225 |
1225 if(s->context){ | 1226 if(s->context){ |
1226 for(i=0; i<3; i++){ | 1227 for(i=0; i<3; i++){ |
1227 generate_len_table(s->len[i], s->stats[i], 256); | 1228 generate_len_table(s->len[i], s->stats[i]); |
1228 if(generate_bits_table(s->bits[i], s->len[i])<0) | 1229 if(generate_bits_table(s->bits[i], s->len[i])<0) |
1229 return -1; | 1230 return -1; |
1230 size+= store_table(s, s->len[i], &buf[size]); | 1231 size+= store_table(s, s->len[i], &buf[size]); |
1231 } | 1232 } |
1232 | 1233 |