Mercurial > libavcodec.hg

comparison dsputil.c @ 10961:34a65026fa06 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move array specifiers outside DECLARE_ALIGNED() invocations
author mru
date Fri, 22 Jan 2010 03:25:11 +0000
parents 28edcc8c54c0
children d27deb92257b
comparison
equal deleted inserted replaced
10960:10759fd39860 10961:34a65026fa06
85 22, 30, 7, 15, 23, 31, 38, 46, 85 22, 30, 7, 15, 23, 31, 38, 46,
86 53, 61, 54, 62, 39, 47, 55, 63, 86 53, 61, 54, 62, 39, 47, 55, 63,
87 }; 87 };
88 88
89 /* not permutated inverse zigzag_direct + 1 for MMX quantizer */ 89 /* not permutated inverse zigzag_direct + 1 for MMX quantizer */
90 DECLARE_ALIGNED_16(uint16_t, inv_zigzag_direct16[64]); 90 DECLARE_ALIGNED_8(uint16_t, inv_zigzag_direct16)[64];
91 91
92 const uint8_t ff_alternate_horizontal_scan[64] = { 92 const uint8_t ff_alternate_horizontal_scan[64] = {
93 0, 1, 2, 3, 8, 9, 16, 17, 93 0, 1, 2, 3, 8, 9, 16, 17,
94 10, 11, 4, 5, 6, 7, 15, 14, 94 10, 11, 4, 5, 6, 7, 15, 14,
95 13, 12, 19, 18, 24, 25, 32, 33, 95 13, 12, 19, 18, 24, 25, 32, 33,
3786 return sum; 3786 return sum;
3787 } 3787 }
3788 3788
3789 static int dct_sad8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int stride, int h){ 3789 static int dct_sad8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int stride, int h){
3790 MpegEncContext * const s= (MpegEncContext *)c; 3790 MpegEncContext * const s= (MpegEncContext *)c;
3791 DECLARE_ALIGNED_16(uint64_t, aligned_temp[sizeof(DCTELEM)*64/8]); 3791 DECLARE_ALIGNED_16(uint64_t, aligned_temp)[sizeof(DCTELEM)*64/8];
3792 DCTELEM * const temp= (DCTELEM*)aligned_temp; 3792 DCTELEM * const temp= (DCTELEM*)aligned_temp;
3793 3793
3794 assert(h==8); 3794 assert(h==8);
3795 3795
3796 s->dsp.diff_pixels(temp, src1, src2, stride); 3796 s->dsp.diff_pixels(temp, src1, src2, stride);
3851 } 3851 }
3852 #endif 3852 #endif
3853 3853
3854 static int dct_max8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int stride, int h){ 3854 static int dct_max8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int stride, int h){
3855 MpegEncContext * const s= (MpegEncContext *)c; 3855 MpegEncContext * const s= (MpegEncContext *)c;
3856 DECLARE_ALIGNED_16(uint64_t, aligned_temp[sizeof(DCTELEM)*64/8]); 3856 DECLARE_ALIGNED_16(uint64_t, aligned_temp)[sizeof(DCTELEM)*64/8];
3857 DCTELEM * const temp= (DCTELEM*)aligned_temp; 3857 DCTELEM * const temp= (DCTELEM*)aligned_temp;
3858 int sum=0, i; 3858 int sum=0, i;
3859 3859
3860 assert(h==8); 3860 assert(h==8);
3861 3861
3868 return sum; 3868 return sum;
3869 } 3869 }
3870 3870
3871 static int quant_psnr8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int stride, int h){ 3871 static int quant_psnr8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int stride, int h){
3872 MpegEncContext * const s= (MpegEncContext *)c; 3872 MpegEncContext * const s= (MpegEncContext *)c;
3873 DECLARE_ALIGNED_16(uint64_t, aligned_temp[sizeof(DCTELEM)*64*2/8]); 3873 DECLARE_ALIGNED_16(uint64_t, aligned_temp)[sizeof(DCTELEM)*64*2/8];
3874 DCTELEM * const temp= (DCTELEM*)aligned_temp; 3874 DCTELEM * const temp= (DCTELEM*)aligned_temp;
3875 DCTELEM * const bak = ((DCTELEM*)aligned_temp)+64; 3875 DCTELEM * const bak = ((DCTELEM*)aligned_temp)+64;
3876 int sum=0, i; 3876 int sum=0, i;
3877 3877
3878 assert(h==8); 3878 assert(h==8);
3893 } 3893 }
3894 3894
3895 static int rd8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int stride, int h){ 3895 static int rd8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int stride, int h){
3896 MpegEncContext * const s= (MpegEncContext *)c; 3896 MpegEncContext * const s= (MpegEncContext *)c;
3897 const uint8_t *scantable= s->intra_scantable.permutated; 3897 const uint8_t *scantable= s->intra_scantable.permutated;
3898 DECLARE_ALIGNED_16(uint64_t, aligned_temp[sizeof(DCTELEM)*64/8]); 3898 DECLARE_ALIGNED_16(uint64_t, aligned_temp)[sizeof(DCTELEM)*64/8];
3899 DECLARE_ALIGNED_16(uint64_t, aligned_src1[8]); 3899 DECLARE_ALIGNED_16(uint64_t, aligned_src1)[8];
3900 DECLARE_ALIGNED_16(uint64_t, aligned_src2[8]); 3900 DECLARE_ALIGNED_16(uint64_t, aligned_src2)[8];
3901 DCTELEM * const temp= (DCTELEM*)aligned_temp; 3901 DCTELEM * const temp= (DCTELEM*)aligned_temp;
3902 uint8_t * const lsrc1 = (uint8_t*)aligned_src1; 3902 uint8_t * const lsrc1 = (uint8_t*)aligned_src1;
3903 uint8_t * const lsrc2 = (uint8_t*)aligned_src2; 3903 uint8_t * const lsrc2 = (uint8_t*)aligned_src2;
3904 int i, last, run, bits, level, distortion, start_i; 3904 int i, last, run, bits, level, distortion, start_i;
3905 const int esc_length= s->ac_esc_length; 3905 const int esc_length= s->ac_esc_length;
3972 } 3972 }
3973 3973
3974 static int bit8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int stride, int h){ 3974 static int bit8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int stride, int h){
3975 MpegEncContext * const s= (MpegEncContext *)c; 3975 MpegEncContext * const s= (MpegEncContext *)c;
3976 const uint8_t *scantable= s->intra_scantable.permutated; 3976 const uint8_t *scantable= s->intra_scantable.permutated;
3977 DECLARE_ALIGNED_16(uint64_t, aligned_temp[sizeof(DCTELEM)*64/8]); 3977 DECLARE_ALIGNED_16(uint64_t, aligned_temp)[sizeof(DCTELEM)*64/8];
3978 DCTELEM * const temp= (DCTELEM*)aligned_temp; 3978 DCTELEM * const temp= (DCTELEM*)aligned_temp;
3979 int i, last, run, bits, level, start_i; 3979 int i, last, run, bits, level, start_i;
3980 const int esc_length= s->ac_esc_length; 3980 const int esc_length= s->ac_esc_length;
3981 uint8_t * length; 3981 uint8_t * length;
3982 uint8_t * last_length; 3982 uint8_t * last_length;