highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vf_colorspace: add const to yuv_stride[] argument in DSP functions.

Browse Source
This commit is contained in:
Ronald S. Bultje 2016-05-06 08:59:43 -04:00
parent 431117dcb5
commit 9b26a8077f
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavfilter/colorspacedsp.h
View File

@ -25,20 +25,20 @@
#include <stdint.h> #include <stdint.h>
typedef void (*yuv2rgb_fn)(int16_t *rgb[3], ptrdiff_t rgb_stride, 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], int w, int h, const int16_t yuv2rgb_coeffs[3][3][8],
const int16_t yuv_offset[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, int16_t *rgb[3], ptrdiff_t rgb_stride,
int w, int h, const int16_t rgb2yuv_coeffs[3][3][8], int w, int h, const int16_t rgb2yuv_coeffs[3][3][8],
const int16_t yuv_offset[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, int16_t *rgb[3], ptrdiff_t rgb_stride,
int w, int h, const int16_t rgb2yuv_coeffs[3][3][8], int w, int h, const int16_t rgb2yuv_coeffs[3][3][8],
const int16_t yuv_offset[8], const int16_t yuv_offset[8],
int *rnd[3][2]); int *rnd[3][2]);
typedef void (*yuv2yuv_fn)(uint8_t *yuv_out[3], ptrdiff_t yuv_out_stride[3], typedef void (*yuv2yuv_fn)(uint8_t *yuv_out[3], const ptrdiff_t yuv_out_stride[3],
uint8_t *yuv_in[3], ptrdiff_t yuv_in_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], int w, int h, const int16_t yuv2yuv_coeffs[3][3][8],
const int16_t yuv_offset[2][8]); const int16_t yuv_offset[2][8]);

6
libavfilter/colorspacedsp_template.c
View File

@ -52,7 +52,7 @@
#endif #endif
static void fn(yuv2rgb)(int16_t *rgb[3], ptrdiff_t rgb_stride, 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], int w, int h, const int16_t yuv2rgb_coeffs[3][3][8],
const int16_t yuv_offset[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, int16_t *rgb[3], ptrdiff_t s,
int w, int h, const int16_t rgb2yuv_coeffs[3][3][8], int w, int h, const int16_t rgb2yuv_coeffs[3][3][8],
const int16_t yuv_offset[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: * the rounding error is distributed over the neighbouring pixels:
* 2: 7/16th, 3: 3/16th, 4: 5/16th and 5: 1/16th * 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, int16_t *rgb[3], ptrdiff_t s,
int w, int h, const int16_t rgb2yuv_coeffs[3][3][8], int w, int h, const int16_t rgb2yuv_coeffs[3][3][8],
const int16_t yuv_offset[8], const int16_t yuv_offset[8],

4
libavfilter/colorspacedsp_yuv2yuv_template.c
View File

@ -37,8 +37,8 @@
#define fn2(a,b,c,d) fn3(a,b,c,d) #define fn2(a,b,c,d) fn3(a,b,c,d)
#define fn(a) fn2(a, IN_BIT_DEPTH, OUT_BIT_DEPTH, ss) #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], static void fn(yuv2yuv)(uint8_t *_dst[3], const ptrdiff_t dst_stride[3],
uint8_t *_src[3], ptrdiff_t src_stride[3], uint8_t *_src[3], const ptrdiff_t src_stride[3],
int w, int h, const int16_t c[3][3][8], int w, int h, const int16_t c[3][3][8],
const int16_t yuv_offset[2][8]) const int16_t yuv_offset[2][8])
{ {

8
libavfilter/x86/colorspacedsp_init.c
View File

@ -23,8 +23,8 @@
#include "libavfilter/colorspacedsp.h" #include "libavfilter/colorspacedsp.h"
#define decl_yuv2yuv_fn(t) \ #define decl_yuv2yuv_fn(t) \
void ff_yuv2yuv_##t##_sse2(uint8_t *yuv_out[3], ptrdiff_t yuv_out_stride[3], \ void ff_yuv2yuv_##t##_sse2(uint8_t *yuv_out[3], const ptrdiff_t yuv_out_stride[3], \
uint8_t *yuv_in[3], ptrdiff_t yuv_in_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], \ int w, int h, const int16_t yuv2yuv_coeffs[3][3][8], \
const int16_t yuv_offset[2][8]) const int16_t yuv_offset[2][8])
@ -45,7 +45,7 @@ decl_yuv2yuv_fns(444);
#define decl_yuv2rgb_fn(t) \ #define decl_yuv2rgb_fn(t) \
void ff_yuv2rgb_##t##_sse2(int16_t *rgb_out[3], ptrdiff_t rgb_stride, \ 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], \ int w, int h, const int16_t coeff[3][3][8], \
const int16_t yuv_offset[8]) const int16_t yuv_offset[8])
@ -59,7 +59,7 @@ decl_yuv2rgb_fns(422);
decl_yuv2rgb_fns(444); decl_yuv2rgb_fns(444);
#define decl_rgb2yuv_fn(t) \ #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, \ int16_t *rgb_in[3], ptrdiff_t rgb_stride, \
int w, int h, const int16_t coeff[3][3][8], \ int w, int h, const int16_t coeff[3][3][8], \
const int16_t yuv_offset[8]) const int16_t yuv_offset[8])