History

Drop DCTELEM typedef

It does not help as an abstraction and adds dsputil dependencies.

Diego Biurrun committed 13 years ago

Commit 88bd7fd1 parent 2e4bb99163 files · +835 −812Browse files

Showing the changes to libavcodec/ppc (6 of 163 files). Show all

Unified · Split

6 files
  1. libavcodec/ppc/dsputil_altivec.c +3 −3
  2. libavcodec/ppc/dsputil_ppc.c +7 −7
  3. libavcodec/ppc/h264_altivec.c +9 −9
  4. libavcodec/ppc/mpegvideo_altivec.c +1 −1
  5. libavcodec/ppc/vc1dsp_altivec.c +2 −2
  6. libavcodec/ppc/vp3dsp_altivec.c +2 −2
libavcodec/ppc/dsputil_altivec.c+3−3
@@ -476,7 +476,7 @@ static int pix_sum_altivec(uint8_t * pix, int line_size) · 475 unmodified lines
476476 return s;
477477 }
478478
479−static void get_pixels_altivec(DCTELEM *restrict block, const uint8_t *pixels, int line_size)
479+static void get_pixels_altivec(int16_t *restrict block, const uint8_t *pixels, int line_size)
480480 {
481481 int i;
482482 vector unsigned char perm = vec_lvsl(0, pixels);
@@ -502,7 +502,7 @@ static void get_pixels_altivec(DCTELEM *restrict block, const uint8_t *pixels, i · 19 unmodified lines
502502 }
503503 }
504504
505−static void diff_pixels_altivec(DCTELEM *restrict block, const uint8_t *s1,
505+static void diff_pixels_altivec(int16_t *restrict block, const uint8_t *s1,
506506 const uint8_t *s2, int stride)
507507 {
508508 int i;
@@ -576,7 +576,7 @@ static void diff_pixels_altivec(DCTELEM *restrict block, const uint8_t *s1, · 67 unmodified lines
576576 }
577577
578578
579−static void clear_block_altivec(DCTELEM *block) {
579+static void clear_block_altivec(int16_t *block) {
580580 LOAD_ZERO;
581581 vec_st(zero_s16v, 0, block);
582582 vec_st(zero_s16v, 16, block);
libavcodec/ppc/dsputil_ppc.c+7−7
@@ -47,7 +47,7 @@ distinguish, and use dcbz (32 bytes) or dcbzl (one cache line) as required. · 46 unmodified lines
4747 see <http://developer.apple.com/technotes/tn/tn2087.html>
4848 and <http://developer.apple.com/technotes/tn/tn2086.html>
4949 */
50−static void clear_blocks_dcbz32_ppc(DCTELEM *blocks)
50+static void clear_blocks_dcbz32_ppc(int16_t *blocks)
5151 {
5252 register int misal = ((unsigned long)blocks & 0x00000010);
5353 register int i = 0;
@@ -58,7 +58,7 @@ static void clear_blocks_dcbz32_ppc(DCTELEM *blocks) · 4 unmodified lines
5858 ((unsigned long*)blocks)[3] = 0L;
5959 i += 16;
6060 }
61− for ( ; i < sizeof(DCTELEM)*6*64-31 ; i += 32) {
61+ for ( ; i < sizeof(int16_t)*6*64-31 ; i += 32) {
6262 __asm__ volatile("dcbz %0,%1" : : "b" (blocks), "r" (i) : "memory");
6363 }
6464 if (misal) {
@@ -73,7 +73,7 @@ static void clear_blocks_dcbz32_ppc(DCTELEM *blocks) · 8 unmodified lines
7373 /* same as above, when dcbzl clear a whole 128B cache line
7474 i.e. the PPC970 aka G5 */
7575 #if HAVE_DCBZL
76−static void clear_blocks_dcbz128_ppc(DCTELEM *blocks)
76+static void clear_blocks_dcbz128_ppc(int16_t *blocks)
7777 {
7878 register int misal = ((unsigned long)blocks & 0x0000007f);
7979 register int i = 0;
@@ -81,17 +81,17 @@ static void clear_blocks_dcbz128_ppc(DCTELEM *blocks) · 1 unmodified line
8181 // we could probably also optimize this case,
8282 // but there's not much point as the machines
8383 // aren't available yet (2003-06-26)
84− memset(blocks, 0, sizeof(DCTELEM)*6*64);
84+ memset(blocks, 0, sizeof(int16_t)*6*64);
8585 }
8686 else
87− for ( ; i < sizeof(DCTELEM)*6*64 ; i += 128) {
87+ for ( ; i < sizeof(int16_t)*6*64 ; i += 128) {
8888 __asm__ volatile("dcbzl %0,%1" : : "b" (blocks), "r" (i) : "memory");
8989 }
9090 }
9191 #else
92−static void clear_blocks_dcbz128_ppc(DCTELEM *blocks)
92+static void clear_blocks_dcbz128_ppc(int16_t *blocks)
9393 {
94− memset(blocks, 0, sizeof(DCTELEM)*6*64);
94+ memset(blocks, 0, sizeof(int16_t)*6*64);
9595 }
9696 #endif
9797
libavcodec/ppc/h264_altivec.c+9−9
@@ -315,7 +315,7 @@ H264_MC(avg_, 16, altivec) · 314 unmodified lines
315315 va_u32 = vec_splat((vec_u32)va_u8, 0); \
316316 vec_ste(va_u32, element, (uint32_t*)dst);
317317
318−static void ff_h264_idct_add_altivec(uint8_t *dst, DCTELEM *block, int stride)
318+static void ff_h264_idct_add_altivec(uint8_t *dst, int16_t *block, int stride)
319319 {
320320 vec_s16 va0, va1, va2, va3;
321321 vec_s16 vz0, vz1, vz2, vz3;
@@ -429,7 +429,7 @@ static void ff_h264_idct_add_altivec(uint8_t *dst, DCTELEM *block, int stride) · 107 unmodified lines
429429 vec_st( hv, 0, dest ); \
430430 }
431431
432−static void ff_h264_idct8_add_altivec( uint8_t *dst, DCTELEM *dct, int stride ) {
432+static void ff_h264_idct8_add_altivec( uint8_t *dst, int16_t *dct, int stride ) {
433433 vec_s16 s0, s1, s2, s3, s4, s5, s6, s7;
434434 vec_s16 d0, d1, d2, d3, d4, d5, d6, d7;
435435 vec_s16 idct0, idct1, idct2, idct3, idct4, idct5, idct6, idct7;
@@ -473,7 +473,7 @@ static void ff_h264_idct8_add_altivec( uint8_t *dst, DCTELEM *dct, int stride ) · 37 unmodified lines
473473 ALTIVEC_STORE_SUM_CLIP(&dst[7*stride], idct7, perm_ldv, perm_stv, sel);
474474 }
475475
476−static av_always_inline void h264_idct_dc_add_internal(uint8_t *dst, DCTELEM *block, int stride, int size)
476+static av_always_inline void h264_idct_dc_add_internal(uint8_t *dst, int16_t *block, int stride, int size)
477477 {
478478 vec_s16 dc16;
479479 vec_u8 dcplus, dcminus, v0, v1, v2, v3, aligner;
@@ -518,17 +518,17 @@ static av_always_inline void h264_idct_dc_add_internal(uint8_t *dst, DCTELEM *bl · 38 unmodified lines
518518 }
519519 }
520520
521−static void h264_idct_dc_add_altivec(uint8_t *dst, DCTELEM *block, int stride)
521+static void h264_idct_dc_add_altivec(uint8_t *dst, int16_t *block, int stride)
522522 {
523523 h264_idct_dc_add_internal(dst, block, stride, 4);
524524 }
525525
526−static void ff_h264_idct8_dc_add_altivec(uint8_t *dst, DCTELEM *block, int stride)
526+static void ff_h264_idct8_dc_add_altivec(uint8_t *dst, int16_t *block, int stride)
527527 {
528528 h264_idct_dc_add_internal(dst, block, stride, 8);
529529 }
530530
531−static void ff_h264_idct_add16_altivec(uint8_t *dst, const int *block_offset, DCTELEM *block, int stride, const uint8_t nnzc[15*8]){
531+static void ff_h264_idct_add16_altivec(uint8_t *dst, const int *block_offset, int16_t *block, int stride, const uint8_t nnzc[15*8]){
532532 int i;
533533 for(i=0; i<16; i++){
534534 int nnz = nnzc[ scan8[i] ];
@@ -539,7 +539,7 @@ static void ff_h264_idct_add16_altivec(uint8_t *dst, const int *block_offset, DC · 4 unmodified lines
539539 }
540540 }
541541
542−static void ff_h264_idct_add16intra_altivec(uint8_t *dst, const int *block_offset, DCTELEM *block, int stride, const uint8_t nnzc[15*8]){
542+static void ff_h264_idct_add16intra_altivec(uint8_t *dst, const int *block_offset, int16_t *block, int stride, const uint8_t nnzc[15*8]){
543543 int i;
544544 for(i=0; i<16; i++){
545545 if(nnzc[ scan8[i] ]) ff_h264_idct_add_altivec(dst + block_offset[i], block + i*16, stride);
@@ -547,7 +547,7 @@ static void ff_h264_idct_add16intra_altivec(uint8_t *dst, const int *block_offse · 1 unmodified line
547547 }
548548 }
549549
550−static void ff_h264_idct8_add4_altivec(uint8_t *dst, const int *block_offset, DCTELEM *block, int stride, const uint8_t nnzc[15*8]){
550+static void ff_h264_idct8_add4_altivec(uint8_t *dst, const int *block_offset, int16_t *block, int stride, const uint8_t nnzc[15*8]){
551551 int i;
552552 for(i=0; i<16; i+=4){
553553 int nnz = nnzc[ scan8[i] ];
@@ -558,7 +558,7 @@ static void ff_h264_idct8_add4_altivec(uint8_t *dst, const int *block_offset, DC · 4 unmodified lines
558558 }
559559 }
560560
561−static void ff_h264_idct_add8_altivec(uint8_t **dest, const int *block_offset, DCTELEM *block, int stride, const uint8_t nnzc[15*8]){
561+static void ff_h264_idct_add8_altivec(uint8_t **dest, const int *block_offset, int16_t *block, int stride, const uint8_t nnzc[15*8]){
562562 int i, j;
563563 for (j = 1; j < 3; j++) {
564564 for(i = j * 16; i < j * 16 + 4; i++){
libavcodec/ppc/mpegvideo_altivec.c+1−1
@@ -35,7 +35,7 @@ · 34 unmodified lines
3535 /* AltiVec version of dct_unquantize_h263
3636 this code assumes `block' is 16 bytes-aligned */
3737 static void dct_unquantize_h263_altivec(MpegEncContext *s,
38− DCTELEM *block, int n, int qscale)
38+ int16_t *block, int n, int qscale)
3939 {
4040 int i, level, qmul, qadd;
4141 int nCoeffs;
libavcodec/ppc/vc1dsp_altivec.c+2−2
@@ -129,7 +129,7 @@ do { \ · 128 unmodified lines
129129
130130 /** Do inverse transform on 8x8 block
131131 */
132−static void vc1_inv_trans_8x8_altivec(DCTELEM block[64])
132+static void vc1_inv_trans_8x8_altivec(int16_t block[64])
133133 {
134134 vector signed short src0, src1, src2, src3, src4, src5, src6, src7;
135135 vector signed int s0, s1, s2, s3, s4, s5, s6, s7;
@@ -224,7 +224,7 @@ static void vc1_inv_trans_8x8_altivec(DCTELEM block[64]) · 88 unmodified lines
224224
225225 /** Do inverse transform on 8x4 part of block
226226 */
227−static void vc1_inv_trans_8x4_altivec(uint8_t *dest, int stride, DCTELEM *block)
227+static void vc1_inv_trans_8x4_altivec(uint8_t *dest, int stride, int16_t *block)
228228 {
229229 vector signed short src0, src1, src2, src3, src4, src5, src6, src7;
230230 vector signed int s0, s1, s2, s3, s4, s5, s6, s7;
libavcodec/ppc/vp3dsp_altivec.c+2−2
@@ -116,7 +116,7 @@ static inline vec_s16 M16(vec_s16 a, vec_s16 C) · 115 unmodified lines
116116 #define ADD8(a) vec_add(a, eight)
117117 #define SHIFT4(a) vec_sra(a, four)
118118
119−static void vp3_idct_put_altivec(uint8_t *dst, int stride, DCTELEM block[64])
119+static void vp3_idct_put_altivec(uint8_t *dst, int stride, int16_t block[64])
120120 {
121121 vec_u8 t;
122122 IDCT_START
@@ -145,7 +145,7 @@ static void vp3_idct_put_altivec(uint8_t *dst, int stride, DCTELEM block[64]) · 22 unmodified lines
145145 memset(block, 0, sizeof(*block) * 64);
146146 }
147147
148−static void vp3_idct_add_altivec(uint8_t *dst, int stride, DCTELEM block[64])
148+static void vp3_idct_add_altivec(uint8_t *dst, int stride, int16_t block[64])
149149 {
150150 LOAD_ZERO;
151151 vec_u8 t, vdst;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t