comparison dsputil.c @ 11195:d464f498e19f libavcodec

Use LOCAL_ALIGNED macro for local arrays
author mru
date Wed, 17 Feb 2010 20:36:20 +0000
parents e5ebf3a17d9d
children 0fc1cdd984b7
comparison
equal deleted inserted replaced
11194:7b3f6955462b 11195:d464f498e19f
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(DCTELEM, temp)[64]; 3791 LOCAL_ALIGNED_16(DCTELEM, temp, [64]);
3792 3792
3793 assert(h==8); 3793 assert(h==8);
3794 3794
3795 s->dsp.diff_pixels(temp, src1, src2, stride); 3795 s->dsp.diff_pixels(temp, src1, src2, stride);
3796 s->dsp.fdct(temp); 3796 s->dsp.fdct(temp);
3850 } 3850 }
3851 #endif 3851 #endif
3852 3852
3853 static int dct_max8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int stride, int h){ 3853 static int dct_max8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int stride, int h){
3854 MpegEncContext * const s= (MpegEncContext *)c; 3854 MpegEncContext * const s= (MpegEncContext *)c;
3855 DECLARE_ALIGNED_16(DCTELEM, temp)[64]; 3855 LOCAL_ALIGNED_16(DCTELEM, temp, [64]);
3856 int sum=0, i; 3856 int sum=0, i;
3857 3857
3858 assert(h==8); 3858 assert(h==8);
3859 3859
3860 s->dsp.diff_pixels(temp, src1, src2, stride); 3860 s->dsp.diff_pixels(temp, src1, src2, stride);
3866 return sum; 3866 return sum;
3867 } 3867 }
3868 3868
3869 static int quant_psnr8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int stride, int h){ 3869 static int quant_psnr8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int stride, int h){
3870 MpegEncContext * const s= (MpegEncContext *)c; 3870 MpegEncContext * const s= (MpegEncContext *)c;
3871 DECLARE_ALIGNED_16(DCTELEM, temp)[64*2]; 3871 LOCAL_ALIGNED_16(DCTELEM, temp, [64*2]);
3872 DCTELEM * const bak = temp+64; 3872 DCTELEM * const bak = temp+64;
3873 int sum=0, i; 3873 int sum=0, i;
3874 3874
3875 assert(h==8); 3875 assert(h==8);
3876 s->mb_intra=0; 3876 s->mb_intra=0;
3890 } 3890 }
3891 3891
3892 static int rd8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int stride, int h){ 3892 static int rd8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int stride, int h){
3893 MpegEncContext * const s= (MpegEncContext *)c; 3893 MpegEncContext * const s= (MpegEncContext *)c;
3894 const uint8_t *scantable= s->intra_scantable.permutated; 3894 const uint8_t *scantable= s->intra_scantable.permutated;
3895 DECLARE_ALIGNED_16(DCTELEM, temp)[64]; 3895 LOCAL_ALIGNED_16(DCTELEM, temp, [64]);
3896 DECLARE_ALIGNED_16(uint8_t, lsrc1)[64]; 3896 LOCAL_ALIGNED_16(uint8_t, lsrc1, [64]);
3897 DECLARE_ALIGNED_16(uint8_t, lsrc2)[64]; 3897 LOCAL_ALIGNED_16(uint8_t, lsrc2, [64]);
3898 int i, last, run, bits, level, distortion, start_i; 3898 int i, last, run, bits, level, distortion, start_i;
3899 const int esc_length= s->ac_esc_length; 3899 const int esc_length= s->ac_esc_length;
3900 uint8_t * length; 3900 uint8_t * length;
3901 uint8_t * last_length; 3901 uint8_t * last_length;
3902 3902
3966 } 3966 }
3967 3967
3968 static int bit8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int stride, int h){ 3968 static int bit8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int stride, int h){
3969 MpegEncContext * const s= (MpegEncContext *)c; 3969 MpegEncContext * const s= (MpegEncContext *)c;
3970 const uint8_t *scantable= s->intra_scantable.permutated; 3970 const uint8_t *scantable= s->intra_scantable.permutated;
3971 DECLARE_ALIGNED_16(DCTELEM, temp)[64]; 3971 LOCAL_ALIGNED_16(DCTELEM, temp, [64]);
3972 int i, last, run, bits, level, start_i; 3972 int i, last, run, bits, level, start_i;
3973 const int esc_length= s->ac_esc_length; 3973 const int esc_length= s->ac_esc_length;
3974 uint8_t * length; 3974 uint8_t * length;
3975 uint8_t * last_length; 3975 uint8_t * last_length;
3976 3976