comparison svq1.c @ 862:058194d7ade6 libavcodec

* fixing some minor const warnings
author kabi
date Tue, 12 Nov 2002 15:00:04 +0000
parents eacc2dd8fd9d
children 22ee74da2cd3
comparison
equal deleted inserted replaced
861:243cc33da3eb 862:058194d7ade6
589 }\ 589 }\
590 dst += (pitch / 4);\ 590 dst += (pitch / 4);\
591 } 591 }
592 592
593 #define SVQ1_CALC_CODEBOOK_ENTRIES(cbook)\ 593 #define SVQ1_CALC_CODEBOOK_ENTRIES(cbook)\
594 codebook = (uint32_t *) cbook[level];\ 594 codebook = (const uint32_t *) cbook[level];\
595 bit_cache = get_bits (bitbuf, 4*stages);\ 595 bit_cache = get_bits (bitbuf, 4*stages);\
596 /* calculate codebook entries for this vector */\ 596 /* calculate codebook entries for this vector */\
597 for (j=0; j < stages; j++) {\ 597 for (j=0; j < stages; j++) {\
598 entries[j] = (((bit_cache >> (4*(stages - j - 1))) & 0xF) + 16*j) << (level + 1);\ 598 entries[j] = (((bit_cache >> (4*(stages - j - 1))) & 0xF) + 16*j) << (level + 1);\
599 }\ 599 }\
603 static int svq1_decode_block_intra (bit_buffer_t *bitbuf, uint8_t *pixels, int pitch ) { 603 static int svq1_decode_block_intra (bit_buffer_t *bitbuf, uint8_t *pixels, int pitch ) {
604 uint32_t bit_cache; 604 uint32_t bit_cache;
605 vlc_code_t *vlc; 605 vlc_code_t *vlc;
606 uint8_t *list[63]; 606 uint8_t *list[63];
607 uint32_t *dst; 607 uint32_t *dst;
608 uint32_t *codebook; 608 const uint32_t *codebook;
609 int entries[6]; 609 int entries[6];
610 int i, j, m, n; 610 int i, j, m, n;
611 int mean, stages; 611 int mean, stages;
612 int x, y, width, height, level; 612 unsigned x, y, width, height, level;
613 uint32_t n1, n2, n3, n4; 613 uint32_t n1, n2, n3, n4;
614 614
615 /* initialize list for breadth first processing of vectors */ 615 /* initialize list for breadth first processing of vectors */
616 list[0] = pixels; 616 list[0] = pixels;
617 617
679 static int svq1_decode_block_non_intra (bit_buffer_t *bitbuf, uint8_t *pixels, int pitch ) { 679 static int svq1_decode_block_non_intra (bit_buffer_t *bitbuf, uint8_t *pixels, int pitch ) {
680 uint32_t bit_cache; 680 uint32_t bit_cache;
681 vlc_code_t *vlc; 681 vlc_code_t *vlc;
682 uint8_t *list[63]; 682 uint8_t *list[63];
683 uint32_t *dst; 683 uint32_t *dst;
684 uint32_t *codebook; 684 const uint32_t *codebook;
685 int entries[6]; 685 int entries[6];
686 int i, j, m, n; 686 int i, j, m, n;
687 int mean, stages; 687 int mean, stages;
688 int x, y, width, height, level; 688 int x, y, width, height, level;
689 uint32_t n1, n2, n3, n4; 689 uint32_t n1, n2, n3, n4;