vf_colorspace: add const to yuv_stride[] argument in DSP functions.
authorRonald S. Bultje <rsbultje@gmail.com>
Fri, 6 May 2016 12:59:43 +0000 (08:59 -0400)
committerRonald S. Bultje <rsbultje@gmail.com>
Tue, 10 May 2016 12:37:55 +0000 (08:37 -0400)
libavfilter/colorspacedsp.h
libavfilter/colorspacedsp_template.c
libavfilter/colorspacedsp_yuv2yuv_template.c
libavfilter/x86/colorspacedsp_init.c

index 2ca7b19..7a64f9d 100644 (file)
 #include <stdint.h>
 
 typedef void (*yuv2rgb_fn)(int16_t *rgb[3], ptrdiff_t rgb_stride,
-                           uint8_t *yuv[3], ptrdiff_t yuv_stride[3],
+                           uint8_t *yuv[3], const ptrdiff_t yuv_stride[3],
                            int w, int h, const int16_t yuv2rgb_coeffs[3][3][8],
                            const int16_t yuv_offset[8]);
-typedef void (*rgb2yuv_fn)(uint8_t *yuv[3], ptrdiff_t yuv_stride[3],
+typedef void (*rgb2yuv_fn)(uint8_t *yuv[3], const ptrdiff_t yuv_stride[3],
                            int16_t *rgb[3], ptrdiff_t rgb_stride,
                            int w, int h, const int16_t rgb2yuv_coeffs[3][3][8],
                            const int16_t yuv_offset[8]);
-typedef void (*rgb2yuv_fsb_fn)(uint8_t *yuv[3], ptrdiff_t yuv_stride[3],
+typedef void (*rgb2yuv_fsb_fn)(uint8_t *yuv[3], const ptrdiff_t yuv_stride[3],
                                int16_t *rgb[3], ptrdiff_t rgb_stride,
                                int w, int h, const int16_t rgb2yuv_coeffs[3][3][8],
                                const int16_t yuv_offset[8],
                                int *rnd[3][2]);
-typedef void (*yuv2yuv_fn)(uint8_t *yuv_out[3], ptrdiff_t yuv_out_stride[3],
-                           uint8_t *yuv_in[3], ptrdiff_t yuv_in_stride[3],
+typedef void (*yuv2yuv_fn)(uint8_t *yuv_out[3], const ptrdiff_t yuv_out_stride[3],
+                           uint8_t *yuv_in[3], const ptrdiff_t yuv_in_stride[3],
                            int w, int h, const int16_t yuv2yuv_coeffs[3][3][8],
                            const int16_t yuv_offset[2][8]);
 
index db4a8d2..53ac0d7 100644 (file)
@@ -52,7 +52,7 @@
 #endif
 
 static void fn(yuv2rgb)(int16_t *rgb[3], ptrdiff_t rgb_stride,
-                        uint8_t *_yuv[3], ptrdiff_t yuv_stride[3],
+                        uint8_t *_yuv[3], const ptrdiff_t yuv_stride[3],
                         int w, int h, const int16_t yuv2rgb_coeffs[3][3][8],
                         const int16_t yuv_offset[8])
 {
@@ -127,7 +127,7 @@ static void fn(yuv2rgb)(int16_t *rgb[3], ptrdiff_t rgb_stride,
     }
 }
 
-static void fn(rgb2yuv)(uint8_t *_yuv[3], ptrdiff_t yuv_stride[3],
+static void fn(rgb2yuv)(uint8_t *_yuv[3], const ptrdiff_t yuv_stride[3],
                         int16_t *rgb[3], ptrdiff_t s,
                         int w, int h, const int16_t rgb2yuv_coeffs[3][3][8],
                         const int16_t yuv_offset[8])
@@ -205,7 +205,7 @@ static void fn(rgb2yuv)(uint8_t *_yuv[3], ptrdiff_t yuv_stride[3],
  * the rounding error is distributed over the neighbouring pixels:
  *    2: 7/16th, 3: 3/16th, 4: 5/16th and 5: 1/16th
  */
-static void fn(rgb2yuv_fsb)(uint8_t *_yuv[3], ptrdiff_t yuv_stride[3],
+static void fn(rgb2yuv_fsb)(uint8_t *_yuv[3], const ptrdiff_t yuv_stride[3],
                             int16_t *rgb[3], ptrdiff_t s,
                             int w, int h, const int16_t rgb2yuv_coeffs[3][3][8],
                             const int16_t yuv_offset[8],
index 8b0d33a..3fae38c 100644 (file)
@@ -37,8 +37,8 @@
 #define fn2(a,b,c,d) fn3(a,b,c,d)
 #define fn(a) fn2(a, IN_BIT_DEPTH, OUT_BIT_DEPTH, ss)
 
-static void fn(yuv2yuv)(uint8_t *_dst[3], ptrdiff_t dst_stride[3],
-                        uint8_t *_src[3], ptrdiff_t src_stride[3],
+static void fn(yuv2yuv)(uint8_t *_dst[3], const ptrdiff_t dst_stride[3],
+                        uint8_t *_src[3], const ptrdiff_t src_stride[3],
                         int w, int h, const int16_t c[3][3][8],
                         const int16_t yuv_offset[2][8])
 {
index 78d34bc..5515ab8 100644 (file)
@@ -23,8 +23,8 @@
 #include "libavfilter/colorspacedsp.h"
 
 #define decl_yuv2yuv_fn(t) \
-void ff_yuv2yuv_##t##_sse2(uint8_t *yuv_out[3], ptrdiff_t yuv_out_stride[3], \
-                           uint8_t *yuv_in[3], ptrdiff_t yuv_in_stride[3], \
+void ff_yuv2yuv_##t##_sse2(uint8_t *yuv_out[3], const ptrdiff_t yuv_out_stride[3], \
+                           uint8_t *yuv_in[3], const ptrdiff_t yuv_in_stride[3], \
                            int w, int h, const int16_t yuv2yuv_coeffs[3][3][8], \
                            const int16_t yuv_offset[2][8])
 
@@ -45,7 +45,7 @@ decl_yuv2yuv_fns(444);
 
 #define decl_yuv2rgb_fn(t) \
 void ff_yuv2rgb_##t##_sse2(int16_t *rgb_out[3], ptrdiff_t rgb_stride, \
-                           uint8_t *yuv_in[3], ptrdiff_t yuv_stride[3], \
+                           uint8_t *yuv_in[3], const ptrdiff_t yuv_stride[3], \
                            int w, int h, const int16_t coeff[3][3][8], \
                            const int16_t yuv_offset[8])
 
@@ -59,7 +59,7 @@ decl_yuv2rgb_fns(422);
 decl_yuv2rgb_fns(444);
 
 #define decl_rgb2yuv_fn(t) \
-void ff_rgb2yuv_##t##_sse2(uint8_t *yuv_out[3], ptrdiff_t yuv_stride[3], \
+void ff_rgb2yuv_##t##_sse2(uint8_t *yuv_out[3], const ptrdiff_t yuv_stride[3], \
                            int16_t *rgb_in[3], ptrdiff_t rgb_stride, \
                            int w, int h, const int16_t coeff[3][3][8], \
                            const int16_t yuv_offset[8])