Mercurial > libavcodec.hg
comparison dsputil.c @ 4197:bbe0bc387a19 libavcodec
revert bad checkin
author | mru |
---|---|
date | Tue, 14 Nov 2006 03:18:09 +0000 |
parents | fbac0859753d |
children | e880555ad2c6 |
comparison
equal
deleted
inserted
replaced
4196:fbac0859753d | 4197:bbe0bc387a19 |
---|---|
66 22, 30, 7, 15, 23, 31, 38, 46, | 66 22, 30, 7, 15, 23, 31, 38, 46, |
67 53, 61, 54, 62, 39, 47, 55, 63, | 67 53, 61, 54, 62, 39, 47, 55, 63, |
68 }; | 68 }; |
69 | 69 |
70 /* not permutated inverse zigzag_direct + 1 for MMX quantizer */ | 70 /* not permutated inverse zigzag_direct + 1 for MMX quantizer */ |
71 DECLARE_ALIGNED_8(uint16_t, ff_inv_zigzag_direct16[64]) = {0, }; | 71 DECLARE_ALIGNED_8(uint16_t, inv_zigzag_direct16[64]) = {0, }; |
72 | 72 |
73 const uint8_t ff_alternate_horizontal_scan[64] = { | 73 const uint8_t ff_alternate_horizontal_scan[64] = { |
74 0, 1, 2, 3, 8, 9, 16, 17, | 74 0, 1, 2, 3, 8, 9, 16, 17, |
75 10, 11, 4, 5, 6, 7, 15, 14, | 75 10, 11, 4, 5, 6, 7, 15, 14, |
76 13, 12, 19, 18, 24, 25, 32, 33, | 76 13, 12, 19, 18, 24, 25, 32, 33, |
381 | 381 |
382 static int w97_16_c(void *v, uint8_t * pix1, uint8_t * pix2, int line_size, int h){ | 382 static int w97_16_c(void *v, uint8_t * pix1, uint8_t * pix2, int line_size, int h){ |
383 return w_c(v, pix1, pix2, line_size, 16, h, 0); | 383 return w_c(v, pix1, pix2, line_size, 16, h, 0); |
384 } | 384 } |
385 | 385 |
386 int ff_w53_32_c(void *v, uint8_t * pix1, uint8_t * pix2, int line_size, int h){ | 386 int w53_32_c(void *v, uint8_t * pix1, uint8_t * pix2, int line_size, int h){ |
387 return w_c(v, pix1, pix2, line_size, 32, h, 1); | 387 return w_c(v, pix1, pix2, line_size, 32, h, 1); |
388 } | 388 } |
389 | 389 |
390 int ff_w97_32_c(void *v, uint8_t * pix1, uint8_t * pix2, int line_size, int h){ | 390 int w97_32_c(void *v, uint8_t * pix1, uint8_t * pix2, int line_size, int h){ |
391 return w_c(v, pix1, pix2, line_size, 32, h, 0); | 391 return w_c(v, pix1, pix2, line_size, 32, h, 0); |
392 } | 392 } |
393 #endif | 393 #endif |
394 | 394 |
395 static void get_pixels_c(DCTELEM *restrict block, const uint8_t *pixels, int line_size) | 395 static void get_pixels_c(DCTELEM *restrict block, const uint8_t *pixels, int line_size) |
3859 } | 3859 } |
3860 | 3860 |
3861 static void just_return() { return; } | 3861 static void just_return() { return; } |
3862 | 3862 |
3863 /* init static data */ | 3863 /* init static data */ |
3864 void ff_dsputil_static_init(void) | 3864 void dsputil_static_init(void) |
3865 { | 3865 { |
3866 int i; | 3866 int i; |
3867 | 3867 |
3868 for(i=0;i<256;i++) ff_cropTbl[i + MAX_NEG_CROP] = i; | 3868 for(i=0;i<256;i++) ff_cropTbl[i + MAX_NEG_CROP] = i; |
3869 for(i=0;i<MAX_NEG_CROP;i++) { | 3869 for(i=0;i<MAX_NEG_CROP;i++) { |
3873 | 3873 |
3874 for(i=0;i<512;i++) { | 3874 for(i=0;i<512;i++) { |
3875 ff_squareTbl[i] = (i - 256) * (i - 256); | 3875 ff_squareTbl[i] = (i - 256) * (i - 256); |
3876 } | 3876 } |
3877 | 3877 |
3878 for(i=0; i<64; i++) ff_inv_zigzag_direct16[ff_zigzag_direct[i]]= i+1; | 3878 for(i=0; i<64; i++) inv_zigzag_direct16[ff_zigzag_direct[i]]= i+1; |
3879 } | 3879 } |
3880 | 3880 |
3881 | 3881 |
3882 void dsputil_init(DSPContext* c, AVCodecContext *avctx) | 3882 void dsputil_init(DSPContext* c, AVCodecContext *avctx) |
3883 { | 3883 { |