From 9b26a8077f1c0139fdcc236d3de08cd2bdc4ec0f Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Fri, 6 May 2016 08:59:43 -0400 Subject: vf_colorspace: add const to yuv_stride[] argument in DSP functions. --- libavfilter/colorspacedsp.h | 10 +++++----- libavfilter/colorspacedsp_template.c | 6 +++--- libavfilter/colorspacedsp_yuv2yuv_template.c | 4 ++-- libavfilter/x86/colorspacedsp_init.c | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) (limited to 'libavfilter') diff --git a/libavfilter/colorspacedsp.h b/libavfilter/colorspacedsp.h index 2ca7b19898..7a64f9dfa5 100644 --- a/libavfilter/colorspacedsp.h +++ b/libavfilter/colorspacedsp.h @@ -25,20 +25,20 @@ #include 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]); diff --git a/libavfilter/colorspacedsp_template.c b/libavfilter/colorspacedsp_template.c index db4a8d2361..53ac0d7224 100644 --- a/libavfilter/colorspacedsp_template.c +++ b/libavfilter/colorspacedsp_template.c @@ -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], diff --git a/libavfilter/colorspacedsp_yuv2yuv_template.c b/libavfilter/colorspacedsp_yuv2yuv_template.c index 8b0d33a788..3fae38c12a 100644 --- a/libavfilter/colorspacedsp_yuv2yuv_template.c +++ b/libavfilter/colorspacedsp_yuv2yuv_template.c @@ -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]) { diff --git a/libavfilter/x86/colorspacedsp_init.c b/libavfilter/x86/colorspacedsp_init.c index 78d34bcc14..5515ab83fd 100644 --- a/libavfilter/x86/colorspacedsp_init.c +++ b/libavfilter/x86/colorspacedsp_init.c @@ -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]) -- cgit v1.2.3