* commit '82bb3048013201c0095d2853d4623633d912252f': dsputil: Use correct type in me_cmp_func function pointer
Showing the changes to libavcodec/ppc (1 of 9 files). Show all
Unified · Split
| @@ -30,9 +30,10 @@ · 29 unmodified lines | ||
| 30 | 30 | #include "libavutil/ppc/util_altivec.h" |
| 31 | 31 | #include "libavcodec/avcodec.h" |
| 32 | 32 | #include "libavcodec/dsputil.h" |
| 33 | +#include "libavcodec/mpegvideo.h" | |
| 33 | 34 | #include "dsputil_altivec.h" |
| 34 | 35 | |
| 35 | −static int sad16_x2_altivec(void *v, uint8_t *pix1, uint8_t *pix2, | |
| 36 | +static int sad16_x2_altivec(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2, | |
| 36 | 37 | int line_size, int h) |
| 37 | 38 | { |
| 38 | 39 | int i, s = 0; |
| @@ -74,7 +75,7 @@ static int sad16_x2_altivec(void *v, uint8_t *pix1, uint8_t *pix2, · 35 unmodified lines | ||
| 74 | 75 | return s; |
| 75 | 76 | } |
| 76 | 77 | |
| 77 | −static int sad16_y2_altivec(void *v, uint8_t *pix1, uint8_t *pix2, | |
| 78 | +static int sad16_y2_altivec(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2, | |
| 78 | 79 | int line_size, int h) |
| 79 | 80 | { |
| 80 | 81 | int i, s = 0; |
| @@ -128,7 +129,7 @@ static int sad16_y2_altivec(void *v, uint8_t *pix1, uint8_t *pix2, · 47 unmodified lines | ||
| 128 | 129 | return s; |
| 129 | 130 | } |
| 130 | 131 | |
| 131 | −static int sad16_xy2_altivec(void *v, uint8_t *pix1, uint8_t *pix2, | |
| 132 | +static int sad16_xy2_altivec(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2, | |
| 132 | 133 | int line_size, int h) |
| 133 | 134 | { |
| 134 | 135 | int i, s = 0; |
| @@ -223,7 +224,7 @@ static int sad16_xy2_altivec(void *v, uint8_t *pix1, uint8_t *pix2, · 88 unmodified lines | ||
| 223 | 224 | return s; |
| 224 | 225 | } |
| 225 | 226 | |
| 226 | −static int sad16_altivec(void *v, uint8_t *pix1, uint8_t *pix2, | |
| 227 | +static int sad16_altivec(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2, | |
| 227 | 228 | int line_size, int h) |
| 228 | 229 | { |
| 229 | 230 | int i, s; |
| @@ -260,7 +261,7 @@ static int sad16_altivec(void *v, uint8_t *pix1, uint8_t *pix2, · 30 unmodified lines | ||
| 260 | 261 | return s; |
| 261 | 262 | } |
| 262 | 263 | |
| 263 | −static int sad8_altivec(void *v, uint8_t *pix1, uint8_t *pix2, | |
| 264 | +static int sad8_altivec(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2, | |
| 264 | 265 | int line_size, int h) |
| 265 | 266 | { |
| 266 | 267 | int i, s; |
| @@ -337,7 +338,7 @@ static int pix_norm1_altivec(uint8_t *pix, int line_size) · 70 unmodified lines | ||
| 337 | 338 | |
| 338 | 339 | /* Sum of Squared Errors for an 8x8 block, AltiVec-enhanced. |
| 339 | 340 | * It's the sad8_altivec code above w/ squaring added. */ |
| 340 | −static int sse8_altivec(void *v, uint8_t *pix1, uint8_t *pix2, | |
| 341 | +static int sse8_altivec(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2, | |
| 341 | 342 | int line_size, int h) |
| 342 | 343 | { |
| 343 | 344 | int i, s; |
| @@ -389,7 +390,7 @@ static int sse8_altivec(void *v, uint8_t *pix1, uint8_t *pix2, · 45 unmodified lines | ||
| 389 | 390 | |
| 390 | 391 | /* Sum of Squared Errors for a 16x16 block, AltiVec-enhanced. |
| 391 | 392 | * It's the sad16_altivec code above w/ squaring added. */ |
| 392 | −static int sse16_altivec(void *v, uint8_t *pix1, uint8_t *pix2, | |
| 393 | +static int sse16_altivec(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2, | |
| 393 | 394 | int line_size, int h) |
| 394 | 395 | { |
| 395 | 396 | int i, s; |
| @@ -587,7 +588,7 @@ static void add_bytes_altivec(uint8_t *dst, uint8_t *src, int w) · 191 unmodified lines | ||
| 587 | 588 | dst[i] = src[i]; |
| 588 | 589 | } |
| 589 | 590 | |
| 590 | −static int hadamard8_diff8x8_altivec(/* MpegEncContext */ void *s, uint8_t *dst, | |
| 591 | +static int hadamard8_diff8x8_altivec(MpegEncContext *s, uint8_t *dst, | |
| 591 | 592 | uint8_t *src, int stride, int h) |
| 592 | 593 | { |
| 593 | 594 | int sum; |
| @@ -716,7 +717,7 @@ static int hadamard8_diff8x8_altivec(/* MpegEncContext */ void *s, uint8_t *dst, · 122 unmodified lines | ||
| 716 | 717 | * On the 970, the hand-made RA is still a win (around 690 vs. around 780), |
| 717 | 718 | * but xlc goes to around 660 on the regular C code... |
| 718 | 719 | */ |
| 719 | −static int hadamard8_diff16x8_altivec(/* MpegEncContext */ void *s, uint8_t *dst, | |
| 720 | +static int hadamard8_diff16x8_altivec(MpegEncContext *s, uint8_t *dst, | |
| 720 | 721 | uint8_t *src, int stride, int h) |
| 721 | 722 | { |
| 722 | 723 | int sum; |
| @@ -913,7 +914,7 @@ static int hadamard8_diff16x8_altivec(/* MpegEncContext */ void *s, uint8_t *dst · 190 unmodified lines | ||
| 913 | 914 | return sum; |
| 914 | 915 | } |
| 915 | 916 | |
| 916 | −static int hadamard8_diff16_altivec(/* MpegEncContext */ void *s, uint8_t *dst, | |
| 917 | +static int hadamard8_diff16_altivec(MpegEncContext *s, uint8_t *dst, | |
| 917 | 918 | uint8_t *src, int stride, int h) |
| 918 | 919 | { |
| 919 | 920 | int score = hadamard8_diff16x8_altivec(s, dst, src, stride, 8); |