History

Merge commit '82bb3048013201c0095d2853d4623633d912252f'

* commit '82bb3048013201c0095d2853d4623633d912252f': dsputil: Use correct type in me_cmp_func function pointer

Michael Niedermayer committed 12 years ago

Commit e98bac82 parents 011d83d 82bb3049 files · +95 −91Browse files

Unified · Split

9 files
  1. libavcodec/arm/dsputil_init_armv6.c +6 −5
  2. libavcodec/bfin/dsputil_init.c +12 −11
  3. libavcodec/dsputil.c +31 −36
  4. libavcodec/dsputil.h +2 −1
  5. libavcodec/motion_est.c +3 −1
  6. libavcodec/ppc/dsputil_altivec.c +11 −10
  7. libavcodec/x86/dsputilenc.asm +4 −3
  8. libavcodec/x86/dsputilenc_mmx.c +15 −15
  9. libavcodec/x86/motion_est.c +11 −9
libavcodec/arm/dsputil_init_armv6.c+6−5
@@ -23,6 +23,7 @@ · 22 unmodified lines
2323 #include "libavutil/attributes.h"
2424 #include "libavcodec/avcodec.h"
2525 #include "libavcodec/dsputil.h"
26+#include "libavcodec/mpegvideo.h"
2627 #include "dsputil_arm.h"
2728
2829 void ff_simple_idct_armv6(int16_t *data);
@@ -36,17 +37,17 @@ void ff_get_pixels_armv6(int16_t *block, const uint8_t *pixels, int stride); · 7 unmodified lines
3637 void ff_diff_pixels_armv6(int16_t *block, const uint8_t *s1,
3738 const uint8_t *s2, int stride);
3839
39−int ff_pix_abs16_armv6(void *s, uint8_t *blk1, uint8_t *blk2,
40+int ff_pix_abs16_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2,
4041 int line_size, int h);
41−int ff_pix_abs16_x2_armv6(void *s, uint8_t *blk1, uint8_t *blk2,
42+int ff_pix_abs16_x2_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2,
4243 int line_size, int h);
43−int ff_pix_abs16_y2_armv6(void *s, uint8_t *blk1, uint8_t *blk2,
44+int ff_pix_abs16_y2_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2,
4445 int line_size, int h);
4546
46−int ff_pix_abs8_armv6(void *s, uint8_t *blk1, uint8_t *blk2,
47+int ff_pix_abs8_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2,
4748 int line_size, int h);
4849
49−int ff_sse16_armv6(void *s, uint8_t *blk1, uint8_t *blk2,
50+int ff_sse16_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2,
5051 int line_size, int h);
5152
5253 int ff_pix_norm1_armv6(uint8_t *pix, int line_size);
libavcodec/bfin/dsputil_init.c+12−11
@@ -28,6 +28,7 @@ · 27 unmodified lines
2828 #include "libavutil/bfin/attributes.h"
2929 #include "libavcodec/avcodec.h"
3030 #include "libavcodec/dsputil.h"
31+#include "libavcodec/mpegvideo.h"
3132
3233 void ff_bfin_idct(int16_t *block) attribute_l1_text;
3334 void ff_bfin_fdct(int16_t *block) attribute_l1_text;
@@ -50,11 +51,11 @@ int ff_bfin_z_sad8x8(uint8_t *blk1, uint8_t *blk2, int dsz, · 16 unmodified lines
5051 int ff_bfin_z_sad16x16(uint8_t *blk1, uint8_t *blk2, int dsz,
5152 int line_size, int h) attribute_l1_text;
5253
53−int ff_bfin_sse4(void *v, uint8_t *pix1, uint8_t *pix2,
54+int ff_bfin_sse4(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,
5455 int line_size, int h) attribute_l1_text;
55−int ff_bfin_sse8(void *v, uint8_t *pix1, uint8_t *pix2,
56+int ff_bfin_sse8(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,
5657 int line_size, int h) attribute_l1_text;
57−int ff_bfin_sse16(void *v, uint8_t *pix1, uint8_t *pix2,
58+int ff_bfin_sse16(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,
5859 int line_size, int h) attribute_l1_text;
5960
6061 static void bfin_idct_add(uint8_t *dest, int line_size, int16_t *block)
@@ -81,7 +82,7 @@ static void bfin_clear_blocks(int16_t *blocks) · 20 unmodified lines
8182 ::"a" (blocks) : "P0", "I0", "R0");
8283 }
8384
84−static int bfin_pix_abs16(void *c, uint8_t *blk1, uint8_t *blk2,
85+static int bfin_pix_abs16(MpegEncContext *c, uint8_t *blk1, uint8_t *blk2,
8586 int line_size, int h)
8687 {
8788 return ff_bfin_z_sad16x16(blk1, blk2, line_size, line_size, h);
@@ -89,48 +90,48 @@ static int bfin_pix_abs16(void *c, uint8_t *blk1, uint8_t *blk2, · 1 unmodified line
8990
9091 static uint8_t vtmp_blk[256] attribute_l1_data_b;
9192
92−static int bfin_pix_abs16_x2(void *c, uint8_t *blk1, uint8_t *blk2,
93+static int bfin_pix_abs16_x2(MpegEncContext *c, uint8_t *blk1, uint8_t *blk2,
9394 int line_size, int h)
9495 {
9596 ff_bfin_put_pixels16uc(vtmp_blk, blk2, blk2 + 1, 16, line_size, h);
9697 return ff_bfin_z_sad16x16(blk1, vtmp_blk, line_size, 16, h);
9798 }
9899
99−static int bfin_pix_abs16_y2(void *c, uint8_t *blk1, uint8_t *blk2,
100+static int bfin_pix_abs16_y2(MpegEncContext *c, uint8_t *blk1, uint8_t *blk2,
100101 int line_size, int h)
101102 {
102103 ff_bfin_put_pixels16uc(vtmp_blk, blk2, blk2 + line_size, 16, line_size, h);
103104 return ff_bfin_z_sad16x16(blk1, vtmp_blk, line_size, 16, h);
104105 }
105106
106−static int bfin_pix_abs16_xy2(void *c, uint8_t *blk1, uint8_t *blk2,
107+static int bfin_pix_abs16_xy2(MpegEncContext *c, uint8_t *blk1, uint8_t *blk2,
107108 int line_size, int h)
108109 {
109110 ff_bfin_z_put_pixels16_xy2(vtmp_blk, blk2, 16, line_size, h);
110111 return ff_bfin_z_sad16x16(blk1, vtmp_blk, line_size, 16, h);
111112 }
112113
113−static int bfin_pix_abs8(void *c, uint8_t *blk1, uint8_t *blk2,
114+static int bfin_pix_abs8(MpegEncContext *c, uint8_t *blk1, uint8_t *blk2,
114115 int line_size, int h)
115116 {
116117 return ff_bfin_z_sad8x8(blk1, blk2, line_size, line_size, h);
117118 }
118119
119−static int bfin_pix_abs8_x2(void *c, uint8_t *blk1, uint8_t *blk2,
120+static int bfin_pix_abs8_x2(MpegEncContext *c, uint8_t *blk1, uint8_t *blk2,
120121 int line_size, int h)
121122 {
122123 ff_bfin_put_pixels8uc(vtmp_blk, blk2, blk2 + 1, 8, line_size, h);
123124 return ff_bfin_z_sad8x8(blk1, vtmp_blk, line_size, 8, h);
124125 }
125126
126−static int bfin_pix_abs8_y2(void *c, uint8_t *blk1, uint8_t *blk2,
127+static int bfin_pix_abs8_y2(MpegEncContext *c, uint8_t *blk1, uint8_t *blk2,
127128 int line_size, int h)
128129 {
129130 ff_bfin_put_pixels8uc(vtmp_blk, blk2, blk2 + line_size, 8, line_size, h);
130131 return ff_bfin_z_sad8x8(blk1, vtmp_blk, line_size, 8, h);
131132 }
132133
133−static int bfin_pix_abs8_xy2(void *c, uint8_t *blk1, uint8_t *blk2,
134+static int bfin_pix_abs8_xy2(MpegEncContext *c, uint8_t *blk1, uint8_t *blk2,
134135 int line_size, int h)
135136 {
136137 ff_bfin_z_put_pixels8_xy2(vtmp_blk, blk2, 8, line_size, h);
libavcodec/dsputil.c+31−36
@@ -254,7 +254,8 @@ static void bswap16_buf(uint16_t *dst, const uint16_t *src, int len) · 253 unmodified lines
254254 *dst++ = av_bswap16(*src++);
255255 }
256256
257−static int sse4_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h)
257+static int sse4_c(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,
258+ int line_size, int h)
258259 {
259260 int s = 0, i;
260261 uint32_t *sq = ff_square_tab + 256;
@@ -270,7 +271,8 @@ static int sse4_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) · 9 unmodified lines
270271 return s;
271272 }
272273
273−static int sse8_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h)
274+static int sse8_c(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,
275+ int line_size, int h)
274276 {
275277 int s = 0, i;
276278 uint32_t *sq = ff_square_tab + 256;
@@ -290,7 +292,8 @@ static int sse8_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) · 13 unmodified lines
290292 return s;
291293 }
292294
293−static int sse16_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h)
295+static int sse16_c(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,
296+ int line_size, int h)
294297 {
295298 int s = 0, i;
296299 uint32_t *sq = ff_square_tab + 256;
@@ -1742,7 +1745,7 @@ static void put_mspel8_mc22_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride) · 1445 unmodified lines
17421745 wmv2_mspel8_v_lowpass(dst, halfH + 8, stride, 8, 8);
17431746 }
17441747
1745−static inline int pix_abs16_c(void *v, uint8_t *pix1, uint8_t *pix2,
1748+static inline int pix_abs16_c(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,
17461749 int line_size, int h)
17471750 {
17481751 int s = 0, i;
@@ -1770,7 +1773,7 @@ static inline int pix_abs16_c(void *v, uint8_t *pix1, uint8_t *pix2, · 21 unmodified lines
17701773 return s;
17711774 }
17721775
1773−static int pix_abs16_x2_c(void *v, uint8_t *pix1, uint8_t *pix2,
1776+static int pix_abs16_x2_c(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,
17741777 int line_size, int h)
17751778 {
17761779 int s = 0, i;
@@ -1798,7 +1801,7 @@ static int pix_abs16_x2_c(void *v, uint8_t *pix1, uint8_t *pix2, · 21 unmodified lines
17981801 return s;
17991802 }
18001803
1801−static int pix_abs16_y2_c(void *v, uint8_t *pix1, uint8_t *pix2,
1804+static int pix_abs16_y2_c(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,
18021805 int line_size, int h)
18031806 {
18041807 int s = 0, i;
@@ -1828,7 +1831,7 @@ static int pix_abs16_y2_c(void *v, uint8_t *pix1, uint8_t *pix2, · 23 unmodified lines
18281831 return s;
18291832 }
18301833
1831−static int pix_abs16_xy2_c(void *v, uint8_t *pix1, uint8_t *pix2,
1834+static int pix_abs16_xy2_c(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,
18321835 int line_size, int h)
18331836 {
18341837 int s = 0, i;
@@ -1858,7 +1861,7 @@ static int pix_abs16_xy2_c(void *v, uint8_t *pix1, uint8_t *pix2, · 23 unmodified lines
18581861 return s;
18591862 }
18601863
1861−static inline int pix_abs8_c(void *v, uint8_t *pix1, uint8_t *pix2,
1864+static inline int pix_abs8_c(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,
18621865 int line_size, int h)
18631866 {
18641867 int s = 0, i;
@@ -1878,7 +1881,7 @@ static inline int pix_abs8_c(void *v, uint8_t *pix1, uint8_t *pix2, · 13 unmodified lines
18781881 return s;
18791882 }
18801883
1881−static int pix_abs8_x2_c(void *v, uint8_t *pix1, uint8_t *pix2,
1884+static int pix_abs8_x2_c(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,
18821885 int line_size, int h)
18831886 {
18841887 int s = 0, i;
@@ -1898,7 +1901,7 @@ static int pix_abs8_x2_c(void *v, uint8_t *pix1, uint8_t *pix2, · 13 unmodified lines
18981901 return s;
18991902 }
19001903
1901−static int pix_abs8_y2_c(void *v, uint8_t *pix1, uint8_t *pix2,
1904+static int pix_abs8_y2_c(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,
19021905 int line_size, int h)
19031906 {
19041907 int s = 0, i;
@@ -1920,7 +1923,7 @@ static int pix_abs8_y2_c(void *v, uint8_t *pix1, uint8_t *pix2, · 15 unmodified lines
19201923 return s;
19211924 }
19221925
1923−static int pix_abs8_xy2_c(void *v, uint8_t *pix1, uint8_t *pix2,
1926+static int pix_abs8_xy2_c(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,
19241927 int line_size, int h)
19251928 {
19261929 int s = 0, i;
@@ -1942,9 +1945,8 @@ static int pix_abs8_xy2_c(void *v, uint8_t *pix1, uint8_t *pix2, · 15 unmodified lines
19421945 return s;
19431946 }
19441947
1945−static int nsse16_c(void *v, uint8_t *s1, uint8_t *s2, int stride, int h)
1948+static int nsse16_c(MpegEncContext *c, uint8_t *s1, uint8_t *s2, int stride, int h)
19461949 {
1947− MpegEncContext *c = v;
19481950 int score1 = 0, score2 = 0, x, y;
19491951
19501952 for (y = 0; y < h; y++) {
@@ -1967,9 +1969,8 @@ static int nsse16_c(void *v, uint8_t *s1, uint8_t *s2, int stride, int h) · 16 unmodified lines
19671969 return score1 + FFABS(score2) * 8;
19681970 }
19691971
1970−static int nsse8_c(void *v, uint8_t *s1, uint8_t *s2, int stride, int h)
1972+static int nsse8_c(MpegEncContext *c, uint8_t *s1, uint8_t *s2, int stride, int h)
19711973 {
1972− MpegEncContext *c = v;
19731974 int score1 = 0, score2 = 0, x, y;
19741975
19751976 for (y = 0; y < h; y++) {
@@ -2021,7 +2022,8 @@ static void add_8x8basis_c(int16_t rem[64], int16_t basis[64], int scale) · 45 unmodified lines
20212022 (BASIS_SHIFT - RECON_SHIFT);
20222023 }
20232024
2024−static int zero_cmp(void *s, uint8_t *a, uint8_t *b, int stride, int h)
2025+static int zero_cmp(MpegEncContext *s, uint8_t *a, uint8_t *b,
2026+ int stride, int h)
20252027 {
20262028 return 0;
20272029 }
@@ -2245,7 +2247,7 @@ static void add_hfyu_left_prediction_bgr32_c(uint8_t *dst, const uint8_t *src, · 217 unmodified lines
22452247
22462248 #define BUTTERFLYA(x, y) (FFABS((x) + (y)) + FFABS((x) - (y)))
22472249
2248−static int hadamard8_diff8x8_c(/* MpegEncContext */ void *s, uint8_t *dst,
2250+static int hadamard8_diff8x8_c(MpegEncContext *s, uint8_t *dst,
22492251 uint8_t *src, int stride, int h)
22502252 {
22512253 int i, temp[64], sum = 0;
@@ -2297,7 +2299,7 @@ static int hadamard8_diff8x8_c(/* MpegEncContext */ void *s, uint8_t *dst, · 45 unmodified lines
22972299 return sum;
22982300 }
22992301
2300−static int hadamard8_intra8x8_c(/* MpegEncContext */ void *s, uint8_t *src,
2302+static int hadamard8_intra8x8_c(MpegEncContext *s, uint8_t *src,
23012303 uint8_t *dummy, int stride, int h)
23022304 {
23032305 int i, temp[64], sum = 0;
@@ -2349,10 +2351,9 @@ static int hadamard8_intra8x8_c(/* MpegEncContext */ void *s, uint8_t *src, · 45 unmodified lines
23492351 return sum;
23502352 }
23512353
2352−static int dct_sad8x8_c(/* MpegEncContext */ void *c, uint8_t *src1,
2354+static int dct_sad8x8_c(MpegEncContext *s, uint8_t *src1,
23532355 uint8_t *src2, int stride, int h)
23542356 {
2355− MpegEncContext *const s = (MpegEncContext *) c;
23562357 LOCAL_ALIGNED_16(int16_t, temp, [64]);
23572358
23582359 av_assert2(h == 8);
@@ -2391,10 +2392,9 @@ static int dct_sad8x8_c(/* MpegEncContext */ void *c, uint8_t *src1, · 32 unmodified lines
23912392 DST(7, (a4 >> 2) - a7); \
23922393 }
23932394
2394−static int dct264_sad8x8_c(/* MpegEncContext */ void *c, uint8_t *src1,
2395+static int dct264_sad8x8_c(MpegEncContext *s, uint8_t *src1,
23952396 uint8_t *src2, int stride, int h)
23962397 {
2397− MpegEncContext *const s = (MpegEncContext *) c;
23982398 int16_t dct[8][8];
23992399 int i, sum = 0;
24002400
@@ -2417,10 +2417,9 @@ static int dct264_sad8x8_c(/* MpegEncContext */ void *c, uint8_t *src1, · 16 unmodified lines
24172417 }
24182418 #endif
24192419
2420−static int dct_max8x8_c(/* MpegEncContext */ void *c, uint8_t *src1,
2420+static int dct_max8x8_c(MpegEncContext *s, uint8_t *src1,
24212421 uint8_t *src2, int stride, int h)
24222422 {
2423− MpegEncContext *const s = (MpegEncContext *) c;
24242423 LOCAL_ALIGNED_16(int16_t, temp, [64]);
24252424 int sum = 0, i;
24262425
@@ -2435,10 +2434,9 @@ static int dct_max8x8_c(/* MpegEncContext */ void *c, uint8_t *src1, · 8 unmodified lines
24352434 return sum;
24362435 }
24372436
2438−static int quant_psnr8x8_c(/* MpegEncContext */ void *c, uint8_t *src1,
2437+static int quant_psnr8x8_c(MpegEncContext *s, uint8_t *src1,
24392438 uint8_t *src2, int stride, int h)
24402439 {
2441− MpegEncContext *const s = c;
24422440 LOCAL_ALIGNED_16(int16_t, temp, [64 * 2]);
24432441 int16_t *const bak = temp + 64;
24442442 int sum = 0, i;
@@ -2461,10 +2459,9 @@ static int quant_psnr8x8_c(/* MpegEncContext */ void *c, uint8_t *src1, · 16 unmodified lines
24612459 return sum;
24622460 }
24632461
2464−static int rd8x8_c(/* MpegEncContext */ void *c, uint8_t *src1, uint8_t *src2,
2462+static int rd8x8_c(MpegEncContext *s, uint8_t *src1, uint8_t *src2,
24652463 int stride, int h)
24662464 {
2467− MpegEncContext *const s = (MpegEncContext *) c;
24682465 const uint8_t *scantable = s->intra_scantable.permutated;
24692466 LOCAL_ALIGNED_16(int16_t, temp, [64]);
24702467 LOCAL_ALIGNED_16(uint8_t, lsrc1, [64]);
@@ -2539,10 +2536,9 @@ static int rd8x8_c(/* MpegEncContext */ void *c, uint8_t *src1, uint8_t *src2, · 68 unmodified lines
25392536 return distortion + ((bits * s->qscale * s->qscale * 109 + 64) >> 7);
25402537 }
25412538
2542−static int bit8x8_c(/* MpegEncContext */ void *c, uint8_t *src1, uint8_t *src2,
2539+static int bit8x8_c(MpegEncContext *s, uint8_t *src1, uint8_t *src2,
25432540 int stride, int h)
25442541 {
2545− MpegEncContext *const s = (MpegEncContext *) c;
25462542 const uint8_t *scantable = s->intra_scantable.permutated;
25472543 LOCAL_ALIGNED_16(int16_t, temp, [64]);
25482544 int i, last, run, bits, level, start_i;
@@ -2602,7 +2598,7 @@ static int bit8x8_c(/* MpegEncContext */ void *c, uint8_t *src1, uint8_t *src2, · 53 unmodified lines
26022598 }
26032599
26042600 #define VSAD_INTRA(size) \
2605−static int vsad_intra ## size ## _c(/* MpegEncContext */ void *c, \
2601+static int vsad_intra ## size ## _c(MpegEncContext *c, \
26062602 uint8_t *s, uint8_t *dummy, \
26072603 int stride, int h) \
26082604 { \
@@ -2623,7 +2619,7 @@ static int vsad_intra ## size ## _c(/* MpegEncContext */ void *c, \ · 14 unmodified lines
26232619 VSAD_INTRA(8)
26242620 VSAD_INTRA(16)
26252621
2626−static int vsad16_c(/* MpegEncContext */ void *c, uint8_t *s1, uint8_t *s2,
2622+static int vsad16_c(MpegEncContext *c, uint8_t *s1, uint8_t *s2,
26272623 int stride, int h)
26282624 {
26292625 int score = 0, x, y;
@@ -2640,7 +2636,7 @@ static int vsad16_c(/* MpegEncContext */ void *c, uint8_t *s1, uint8_t *s2, · 10 unmodified lines
26402636
26412637 #define SQ(a) ((a) * (a))
26422638 #define VSSE_INTRA(size) \
2643−static int vsse_intra ## size ## _c(/* MpegEncContext */ void *c, \
2639+static int vsse_intra ## size ## _c(MpegEncContext *c, \
26442640 uint8_t *s, uint8_t *dummy, \
26452641 int stride, int h) \
26462642 { \
@@ -2661,7 +2657,7 @@ static int vsse_intra ## size ## _c(/* MpegEncContext */ void *c, \ · 14 unmodified lines
26612657 VSSE_INTRA(8)
26622658 VSSE_INTRA(16)
26632659
2664−static int vsse16_c(/* MpegEncContext */ void *c, uint8_t *s1, uint8_t *s2,
2660+static int vsse16_c(MpegEncContext *c, uint8_t *s1, uint8_t *s2,
26652661 int stride, int h)
26662662 {
26672663 int score = 0, x, y;
@@ -2687,8 +2683,7 @@ static int ssd_int8_vs_int16_c(const int8_t *pix1, const int16_t *pix2, · 19 unmodified lines
26872683 }
26882684
26892685 #define WRAPPER8_16_SQ(name8, name16) \
2690−static int name16(void /*MpegEncContext*/ *s, \
2691− uint8_t *dst, uint8_t *src, \
2686+static int name16(MpegEncContext *s, uint8_t *dst, uint8_t *src, \
26922687 int stride, int h) \
26932688 { \
26942689 int score = 0; \
libavcodec/dsputil.h+2−1
@@ -108,12 +108,13 @@ DEF_OLD_QPEL(qpel8_mc32_old_c) · 107 unmodified lines
108108 DEF_OLD_QPEL(qpel8_mc13_old_c)
109109 DEF_OLD_QPEL(qpel8_mc33_old_c)
110110
111+struct MpegEncContext;
111112 /* Motion estimation:
112113 * h is limited to { width / 2, width, 2 * width },
113114 * but never larger than 16 and never smaller than 2.
114115 * Although currently h < 4 is not used as functions with
115116 * width < 8 are neither used nor implemented. */
116−typedef int (*me_cmp_func)(void /* MpegEncContext */ *s,
117+typedef int (*me_cmp_func)(struct MpegEncContext *c,
117118 uint8_t *blk1 /* align width (8 or 16) */,
118119 uint8_t *blk2 /* align 1 */, int line_size, int h);
119120
libavcodec/motion_est.c+3−1
@@ -286,7 +286,9 @@ static int cmp_qpel(MpegEncContext *s, const int x, const int y, const int subx, · 285 unmodified lines
286286
287287 #include "motion_est_template.c"
288288
289−static int zero_cmp(void *s, uint8_t *a, uint8_t *b, int stride, int h){
289+static int zero_cmp(MpegEncContext *s, uint8_t *a, uint8_t *b,
290+ int stride, int h)
291+{
290292 return 0;
291293 }
292294
libavcodec/ppc/dsputil_altivec.c+11−10
@@ -30,9 +30,10 @@ · 29 unmodified lines
3030 #include "libavutil/ppc/util_altivec.h"
3131 #include "libavcodec/avcodec.h"
3232 #include "libavcodec/dsputil.h"
33+#include "libavcodec/mpegvideo.h"
3334 #include "dsputil_altivec.h"
3435
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,
3637 int line_size, int h)
3738 {
3839 int i, s = 0;
@@ -74,7 +75,7 @@ static int sad16_x2_altivec(void *v, uint8_t *pix1, uint8_t *pix2, · 35 unmodified lines
7475 return s;
7576 }
7677
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,
7879 int line_size, int h)
7980 {
8081 int i, s = 0;
@@ -128,7 +129,7 @@ static int sad16_y2_altivec(void *v, uint8_t *pix1, uint8_t *pix2, · 47 unmodified lines
128129 return s;
129130 }
130131
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,
132133 int line_size, int h)
133134 {
134135 int i, s = 0;
@@ -223,7 +224,7 @@ static int sad16_xy2_altivec(void *v, uint8_t *pix1, uint8_t *pix2, · 88 unmodified lines
223224 return s;
224225 }
225226
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,
227228 int line_size, int h)
228229 {
229230 int i, s;
@@ -260,7 +261,7 @@ static int sad16_altivec(void *v, uint8_t *pix1, uint8_t *pix2, · 30 unmodified lines
260261 return s;
261262 }
262263
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,
264265 int line_size, int h)
265266 {
266267 int i, s;
@@ -337,7 +338,7 @@ static int pix_norm1_altivec(uint8_t *pix, int line_size) · 70 unmodified lines
337338
338339 /* Sum of Squared Errors for an 8x8 block, AltiVec-enhanced.
339340 * 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,
341342 int line_size, int h)
342343 {
343344 int i, s;
@@ -389,7 +390,7 @@ static int sse8_altivec(void *v, uint8_t *pix1, uint8_t *pix2, · 45 unmodified lines
389390
390391 /* Sum of Squared Errors for a 16x16 block, AltiVec-enhanced.
391392 * 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,
393394 int line_size, int h)
394395 {
395396 int i, s;
@@ -587,7 +588,7 @@ static void add_bytes_altivec(uint8_t *dst, uint8_t *src, int w) · 191 unmodified lines
587588 dst[i] = src[i];
588589 }
589590
590−static int hadamard8_diff8x8_altivec(/* MpegEncContext */ void *s, uint8_t *dst,
591+static int hadamard8_diff8x8_altivec(MpegEncContext *s, uint8_t *dst,
591592 uint8_t *src, int stride, int h)
592593 {
593594 int sum;
@@ -716,7 +717,7 @@ static int hadamard8_diff8x8_altivec(/* MpegEncContext */ void *s, uint8_t *dst, · 122 unmodified lines
716717 * On the 970, the hand-made RA is still a win (around 690 vs. around 780),
717718 * but xlc goes to around 660 on the regular C code...
718719 */
719−static int hadamard8_diff16x8_altivec(/* MpegEncContext */ void *s, uint8_t *dst,
720+static int hadamard8_diff16x8_altivec(MpegEncContext *s, uint8_t *dst,
720721 uint8_t *src, int stride, int h)
721722 {
722723 int sum;
@@ -913,7 +914,7 @@ static int hadamard8_diff16x8_altivec(/* MpegEncContext */ void *s, uint8_t *dst · 190 unmodified lines
913914 return sum;
914915 }
915916
916−static int hadamard8_diff16_altivec(/* MpegEncContext */ void *s, uint8_t *dst,
917+static int hadamard8_diff16_altivec(MpegEncContext *s, uint8_t *dst,
917918 uint8_t *src, int stride, int h)
918919 {
919920 int score = hadamard8_diff16x8_altivec(s, dst, src, stride, 8);
libavcodec/x86/dsputilenc.asm+4−3
@@ -209,8 +209,8 @@ hadamard8x8_diff %+ SUFFIX: · 208 unmodified lines
209209 hadamard8_16_wrapper %1, 3
210210 %elif cpuflag(mmx)
211211 ALIGN 16
212−; int ff_hadamard8_diff_ ## cpu(void *s, uint8_t *src1, uint8_t *src2,
213−; int stride, int h)
212+; int ff_hadamard8_diff_ ## cpu(MpegEncContext *s, uint8_t *src1,
213+; uint8_t *src2, int stride, int h)
214214 ; r0 = void *s = unused, int h = unused (always 8)
215215 ; note how r1, r2 and r3 are not clobbered in this function, so 16x16
216216 ; can simply call this 2x2x (and that's why we access rsp+gprsize
@@ -275,7 +275,8 @@ INIT_XMM ssse3 · 58 unmodified lines
275275 HADAMARD8_DIFF 9
276276
277277 INIT_XMM sse2
278−; int ff_sse16_sse2(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h);
278+; int ff_sse16_sse2(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,
279+; int line_size, int h);
279280 cglobal sse16, 5, 5, 8
280281 shr r4d, 1
281282 pxor m0, m0 ; mm0 = 0
libavcodec/x86/dsputilenc_mmx.c+15−15
@@ -41,7 +41,8 @@ int ff_pix_norm1_mmx(uint8_t *pix, int line_size); · 40 unmodified lines
4141
4242 #if HAVE_INLINE_ASM
4343
44−static int sse8_mmx(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h)
44+static int sse8_mmx(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,
45+ int line_size, int h)
4546 {
4647 int tmp;
4748
@@ -105,7 +106,7 @@ static int sse8_mmx(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) · 57 unmodified lines
105106 return tmp;
106107 }
107108
108−static int sse16_mmx(void *v, uint8_t *pix1, uint8_t *pix2,
109+static int sse16_mmx(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,
109110 int line_size, int h)
110111 {
111112 int tmp;
@@ -414,10 +415,9 @@ static int hf_noise16_mmx(uint8_t *pix1, int line_size, int h) · 302 unmodified lines
414415 return tmp + hf_noise8_mmx(pix + 8, line_size, h);
415416 }
416417
417−static int nsse16_mmx(void *p, uint8_t *pix1, uint8_t *pix2,
418+static int nsse16_mmx(MpegEncContext *c, uint8_t *pix1, uint8_t *pix2,
418419 int line_size, int h)
419420 {
420− MpegEncContext *c = p;
421421 int score1, score2;
422422
423423 if (c)
@@ -433,10 +433,9 @@ static int nsse16_mmx(void *p, uint8_t *pix1, uint8_t *pix2, · 9 unmodified lines
433433 return score1 + FFABS(score2) * 8;
434434 }
435435
436−static int nsse8_mmx(void *p, uint8_t *pix1, uint8_t *pix2,
436+static int nsse8_mmx(MpegEncContext *c, uint8_t *pix1, uint8_t *pix2,
437437 int line_size, int h)
438438 {
439− MpegEncContext *c = p;
440439 int score1 = sse8_mmx(c, pix1, pix2, line_size, h);
441440 int score2 = hf_noise8_mmx(pix1, line_size, h) -
442441 hf_noise8_mmx(pix2, line_size, h);
@@ -447,7 +446,7 @@ static int nsse8_mmx(void *p, uint8_t *pix1, uint8_t *pix2, · 4 unmodified lines
447446 return score1 + FFABS(score2) * 8;
448447 }
449448
450−static int vsad_intra16_mmx(void *v, uint8_t *pix, uint8_t *dummy,
449+static int vsad_intra16_mmx(MpegEncContext *v, uint8_t *pix, uint8_t *dummy,
451450 int line_size, int h)
452451 {
453452 int tmp;
@@ -511,7 +510,7 @@ static int vsad_intra16_mmx(void *v, uint8_t *pix, uint8_t *dummy, · 57 unmodified lines
511510 }
512511 #undef SUM
513512
514−static int vsad_intra16_mmxext(void *v, uint8_t *pix, uint8_t *dummy,
513+static int vsad_intra16_mmxext(MpegEncContext *v, uint8_t *pix, uint8_t *dummy,
515514 int line_size, int h)
516515 {
517516 int tmp;
@@ -554,7 +553,7 @@ static int vsad_intra16_mmxext(void *v, uint8_t *pix, uint8_t *dummy, · 36 unmodified lines
554553 }
555554 #undef SUM
556555
557−static int vsad16_mmx(void *v, uint8_t *pix1, uint8_t *pix2,
556+static int vsad16_mmx(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,
558557 int line_size, int h)
559558 {
560559 int tmp;
@@ -635,7 +634,7 @@ static int vsad16_mmx(void *v, uint8_t *pix1, uint8_t *pix2, · 74 unmodified lines
635634 }
636635 #undef SUM
637636
638−static int vsad16_mmxext(void *v, uint8_t *pix1, uint8_t *pix2,
637+static int vsad16_mmxext(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,
639638 int line_size, int h)
640639 {
641640 int tmp;
@@ -974,13 +973,14 @@ static int ssd_int8_vs_int16_mmx(const int8_t *pix1, const int16_t *pix2, · 332 unmodified lines
974973
975974 #endif /* HAVE_INLINE_ASM */
976975
977−int ff_sse16_sse2(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h);
976+int ff_sse16_sse2(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,
977+ int line_size, int h);
978978
979979 #define hadamard_func(cpu) \
980−int ff_hadamard8_diff_ ## cpu(void *s, uint8_t *src1, uint8_t *src2, \
981− int stride, int h); \
982−int ff_hadamard8_diff16_ ## cpu(void *s, uint8_t *src1, uint8_t *src2, \
983− int stride, int h);
980+ int ff_hadamard8_diff_ ## cpu(MpegEncContext *s, uint8_t *src1, \
981+ uint8_t *src2, int stride, int h); \
982+ int ff_hadamard8_diff16_ ## cpu(MpegEncContext *s, uint8_t *src1, \
983+ uint8_t *src2, int stride, int h);
984984
985985 hadamard_func(mmx)
986986 hadamard_func(mmxext)
libavcodec/x86/motion_est.c+11−9
@@ -27,6 +27,7 @@ · 26 unmodified lines
2727 #include "libavutil/mem.h"
2828 #include "libavutil/x86/asm.h"
2929 #include "libavutil/x86/cpu.h"
30+#include "libavcodec/mpegvideo.h"
3031 #include "dsputil_x86.h"
3132
3233 #if HAVE_INLINE_ASM
@@ -94,7 +95,8 @@ static inline void sad8_1_mmxext(uint8_t *blk1, uint8_t *blk2, · 61 unmodified lines
9495 : "r" ((x86_reg) stride));
9596 }
9697
97−static int sad16_sse2(void *v, uint8_t *blk2, uint8_t *blk1, int stride, int h)
98+static int sad16_sse2(MpegEncContext *v, uint8_t *blk2, uint8_t *blk1,
99+ int stride, int h)
98100 {
99101 int ret;
100102 __asm__ volatile (
@@ -325,7 +327,7 @@ static inline void sad8_y2a_mmx(uint8_t *blk1, uint8_t *blk2, int stride, int h) · 224 unmodified lines
325327 }
326328
327329 #define PIX_SAD(suf) \
328−static int sad8_ ## suf(void *v, uint8_t *blk2, \
330+static int sad8_ ## suf(MpegEncContext *v, uint8_t *blk2, \
329331 uint8_t *blk1, int stride, int h) \
330332 { \
331333 av_assert2(h == 8); \
@@ -339,7 +341,7 @@ static int sad8_ ## suf(void *v, uint8_t *blk2, \ · 7 unmodified lines
339341 return sum_ ## suf(); \
340342 } \
341343 \
342−static int sad8_x2_ ## suf(void *v, uint8_t *blk2, \
344+static int sad8_x2_ ## suf(MpegEncContext *v, uint8_t *blk2, \
343345 uint8_t *blk1, int stride, int h) \
344346 { \
345347 av_assert2(h == 8); \
@@ -354,7 +356,7 @@ static int sad8_x2_ ## suf(void *v, uint8_t *blk2, \ · 8 unmodified lines
354356 return sum_ ## suf(); \
355357 } \
356358 \
357−static int sad8_y2_ ## suf(void *v, uint8_t *blk2, \
359+static int sad8_y2_ ## suf(MpegEncContext *v, uint8_t *blk2, \
358360 uint8_t *blk1, int stride, int h) \
359361 { \
360362 av_assert2(h == 8); \
@@ -369,7 +371,7 @@ static int sad8_y2_ ## suf(void *v, uint8_t *blk2, \ · 8 unmodified lines
369371 return sum_ ## suf(); \
370372 } \
371373 \
372−static int sad8_xy2_ ## suf(void *v, uint8_t *blk2, \
374+static int sad8_xy2_ ## suf(MpegEncContext *v, uint8_t *blk2, \
373375 uint8_t *blk1, int stride, int h) \
374376 { \
375377 av_assert2(h == 8); \
@@ -383,7 +385,7 @@ static int sad8_xy2_ ## suf(void *v, uint8_t *blk2, \ · 7 unmodified lines
383385 return sum_ ## suf(); \
384386 } \
385387 \
386−static int sad16_ ## suf(void *v, uint8_t *blk2, \
388+static int sad16_ ## suf(MpegEncContext *v, uint8_t *blk2, \
387389 uint8_t *blk1, int stride, int h) \
388390 { \
389391 __asm__ volatile ( \
@@ -397,7 +399,7 @@ static int sad16_ ## suf(void *v, uint8_t *blk2, \ · 7 unmodified lines
397399 return sum_ ## suf(); \
398400 } \
399401 \
400−static int sad16_x2_ ## suf(void *v, uint8_t *blk2, \
402+static int sad16_x2_ ## suf(MpegEncContext *v, uint8_t *blk2, \
401403 uint8_t *blk1, int stride, int h) \
402404 { \
403405 __asm__ volatile ( \
@@ -412,7 +414,7 @@ static int sad16_x2_ ## suf(void *v, uint8_t *blk2, \ · 8 unmodified lines
412414 return sum_ ## suf(); \
413415 } \
414416 \
415−static int sad16_y2_ ## suf(void *v, uint8_t *blk2, \
417+static int sad16_y2_ ## suf(MpegEncContext *v, uint8_t *blk2, \
416418 uint8_t *blk1, int stride, int h) \
417419 { \
418420 __asm__ volatile ( \
@@ -427,7 +429,7 @@ static int sad16_y2_ ## suf(void *v, uint8_t *blk2, \ · 8 unmodified lines
427429 return sum_ ## suf(); \
428430 } \
429431 \
430−static int sad16_xy2_ ## suf(void *v, uint8_t *blk2, \
432+static int sad16_xy2_ ## suf(MpegEncContext *v, uint8_t *blk2, \
431433 uint8_t *blk1, int stride, int h) \
432434 { \
433435 __asm__ volatile ( \

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