History

swscale/internal: constify SwsFunc

I want to move away from having random leaf processing functions mutate plane pointers, and while we're at it, we might as well make the strides and tables const as well.

Niklas Haas committed 2 years ago

Commit c1a0e651 parent 286bdc914 files · +220 −208Browse files

Unified · Split

14 files
  1. libswscale/aarch64/swscale_unscaled.c +19 −15
  2. libswscale/alphablend.c +3 −3
  3. libswscale/arm/swscale_unscaled.c +14 −12
  4. libswscale/bayer_template.c +2 −2
  5. libswscale/loongarch/yuv2rgb_lasx.c +6 −6
  6. libswscale/loongarch/yuv2rgb_lsx.c +6 −6
  7. libswscale/ppc/yuv2rgb_altivec.c +6 −6
  8. libswscale/rgb2rgb.c +1 −1
  9. libswscale/rgb2rgb.h +2 −2
  10. libswscale/rgb2rgb_template.c +1 −1
  11. libswscale/swscale_internal.h +6 −6
  12. libswscale/swscale_unscaled.c +124 −118
  13. libswscale/x86/yuv2rgb.c +27 −27
  14. libswscale/yuv2rgb.c +3 −3
libswscale/aarch64/swscale_unscaled.c+19−15
@@ -37,9 +37,10 @@ int ff_##ifmt##_to_##ofmt##_neon(int w, int h, · 36 unmodified lines
37 int y_offset, \37 int y_offset, \
38 int y_coeff); \38 int y_coeff); \
39 \39 \
40static int ifmt##_to_##ofmt##_neon_wrapper(SwsContext *c, const uint8_t *src[], \40static int ifmt##_to_##ofmt##_neon_wrapper(SwsContext *c, const uint8_t *const src[], \
41 int srcStride[], int srcSliceY, int srcSliceH, \41 const int srcStride[], int srcSliceY, \
42 uint8_t *dst[], int dstStride[]) { \42 int srcSliceH, uint8_t *const dst[], \
43 const int dstStride[]) { \
43 const int16_t yuv2rgb_table[] = { YUV_TO_RGB_TABLE }; \44 const int16_t yuv2rgb_table[] = { YUV_TO_RGB_TABLE }; \
44 \45 \
45 return ff_##ifmt##_to_##ofmt##_neon(c->srcW, srcSliceH, \46 return ff_##ifmt##_to_##ofmt##_neon(c->srcW, srcSliceH, \
@@ -64,9 +65,10 @@ int ff_##ifmt##_to_##ofmt##_neon(int w, int h, · 18 unmodified lines
64 uint8_t *dst1, int linesize1, \65 uint8_t *dst1, int linesize1, \
65 uint8_t *dst2, int linesize2); \66 uint8_t *dst2, int linesize2); \
66 \67 \
67static int ifmt##_to_##ofmt##_neon_wrapper(SwsContext *c, const uint8_t *src[], \68static int ifmt##_to_##ofmt##_neon_wrapper(SwsContext *c, const uint8_t *const src[], \
68 int srcStride[], int srcSliceY, int srcSliceH, \69 const int srcStride[], int srcSliceY, \
69 uint8_t *dst[], int dstStride[]) { \70 int srcSliceH, uint8_t *const dst[], \
71 const int dstStride[]) { \
70 const int16_t yuv2rgb_table[] = { YUV_TO_RGB_TABLE }; \72 const int16_t yuv2rgb_table[] = { YUV_TO_RGB_TABLE }; \
71 \73 \
72 return ff_##ifmt##_to_##ofmt##_neon(c->srcW, srcSliceH, \74 return ff_##ifmt##_to_##ofmt##_neon(c->srcW, srcSliceH, \
@@ -100,9 +102,10 @@ int ff_##ifmt##_to_##ofmt##_neon(int w, int h, · 27 unmodified lines
100 int y_offset, \102 int y_offset, \
101 int y_coeff); \103 int y_coeff); \
102 \104 \
103static int ifmt##_to_##ofmt##_neon_wrapper(SwsContext *c, const uint8_t *src[], \105static int ifmt##_to_##ofmt##_neon_wrapper(SwsContext *c, const uint8_t *const src[], \
104 int srcStride[], int srcSliceY, int srcSliceH, \106 const int srcStride[], int srcSliceY, \
105 uint8_t *dst[], int dstStride[]) { \107 int srcSliceH, uint8_t *const dst[], \
108 const int dstStride[]) { \
106 const int16_t yuv2rgb_table[] = { YUV_TO_RGB_TABLE }; \109 const int16_t yuv2rgb_table[] = { YUV_TO_RGB_TABLE }; \
107 \110 \
108 return ff_##ifmt##_to_##ofmt##_neon(c->srcW, srcSliceH, \111 return ff_##ifmt##_to_##ofmt##_neon(c->srcW, srcSliceH, \
@@ -124,9 +127,10 @@ int ff_##ifmt##_to_##ofmt##_neon(int w, int h, · 15 unmodified lines
124 uint8_t *dst1, int linesize1, \127 uint8_t *dst1, int linesize1, \
125 uint8_t *dst2, int linesize2); \128 uint8_t *dst2, int linesize2); \
126 \129 \
127static int ifmt##_to_##ofmt##_neon_wrapper(SwsContext *c, const uint8_t *src[], \130static int ifmt##_to_##ofmt##_neon_wrapper(SwsContext *c, const uint8_t *const src[], \
128 int srcStride[], int srcSliceY, int srcSliceH, \131 const int srcStride[], int srcSliceY, \
129 uint8_t *dst[], int dstStride[]) { \132 int srcSliceH, uint8_t *const dst[], \
133 const int dstStride[]) { \
130 const int16_t yuv2rgb_table[] = { YUV_TO_RGB_TABLE }; \134 const int16_t yuv2rgb_table[] = { YUV_TO_RGB_TABLE }; \
131 \135 \
132 return ff_##ifmt##_to_##ofmt##_neon(c->srcW, srcSliceH, \136 return ff_##ifmt##_to_##ofmt##_neon(c->srcW, srcSliceH, \
@@ -144,9 +148,9 @@ void ff_nv24_to_yuv420p_chroma_neon(uint8_t *dst1, int dstStride1, · 11 unmodified lines
144 const uint8_t *src, int srcStride,148 const uint8_t *src, int srcStride,
145 int w, int h);149 int w, int h);
146 150
147static int nv24_to_yuv420p_neon_wrapper(SwsContext *c, const uint8_t *src[],151static int nv24_to_yuv420p_neon_wrapper(SwsContext *c, const uint8_t *const src[],
148 int srcStride[], int srcSliceY, int srcSliceH,152 const int srcStride[], int srcSliceY, int srcSliceH,
149 uint8_t *dst[], int dstStride[])153 const uint8_t *dst[], const int dstStride[])
150{154{
151 uint8_t *dst1 = dst[1] + dstStride[1] * srcSliceY / 2;155 uint8_t *dst1 = dst[1] + dstStride[1] * srcSliceY / 2;
152 uint8_t *dst2 = dst[2] + dstStride[2] * srcSliceY / 2;156 uint8_t *dst2 = dst[2] + dstStride[2] * srcSliceY / 2;
libswscale/alphablend.c+3−3
@@ -20,9 +20,9 @@ · 19 unmodified lines
20 20
21#include "swscale_internal.h"21#include "swscale_internal.h"
22 22
23int ff_sws_alphablendaway(SwsContext *c, const uint8_t *src[],23int ff_sws_alphablendaway(SwsContext *c, const uint8_t *const src[],
24 int srcStride[], int srcSliceY, int srcSliceH,24 const int srcStride[], int srcSliceY, int srcSliceH,
25 uint8_t *dst[], int dstStride[])25 uint8_t *const dst[], const int dstStride[])
26{26{
27 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(c->srcFormat);27 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(c->srcFormat);
28 int nb_components = desc->nb_components;28 int nb_components = desc->nb_components;
libswscale/arm/swscale_unscaled.c+14−12
@@ -34,9 +34,9 @@ extern void rgbx_to_nv12_neon_16(const uint8_t *src, uint8_t *y, uint8_t *chroma · 33 unmodified lines
34 int y_stride, int c_stride, int src_stride,34 int y_stride, int c_stride, int src_stride,
35 int32_t coeff_tbl[9]);35 int32_t coeff_tbl[9]);
36 36
37static int rgbx_to_nv12_neon_32_wrapper(SwsContext *context, const uint8_t *src[],37static int rgbx_to_nv12_neon_32_wrapper(SwsContext *context, const uint8_t *const src[],
38 int srcStride[], int srcSliceY, int srcSliceH,38 const int srcStride[], int srcSliceY, int srcSliceH,
39 uint8_t *dst[], int dstStride[]) {39 uint8_t *const dst[], const int dstStride[]) {
40 40
41 rgbx_to_nv12_neon_32(src[0] + srcSliceY * srcStride[0],41 rgbx_to_nv12_neon_32(src[0] + srcSliceY * srcStride[0],
42 dst[0] + srcSliceY * dstStride[0],42 dst[0] + srcSliceY * dstStride[0],
@@ -48,9 +48,9 @@ static int rgbx_to_nv12_neon_32_wrapper(SwsContext *context, const uint8_t *src[ · 5 unmodified lines
48 return 0;48 return 0;
49}49}
50 50
51static int rgbx_to_nv12_neon_16_wrapper(SwsContext *context, const uint8_t *src[],51static int rgbx_to_nv12_neon_16_wrapper(SwsContext *context, const uint8_t *const src[],
52 int srcStride[], int srcSliceY, int srcSliceH,52 const int srcStride[], int srcSliceY, int srcSliceH,
53 uint8_t *dst[], int dstStride[]) {53 uint8_t *const dst[], int dstStride[]) {
54 54
55 rgbx_to_nv12_neon_16(src[0] + srcSliceY * srcStride[0],55 rgbx_to_nv12_neon_16(src[0] + srcSliceY * srcStride[0],
56 dst[0] + srcSliceY * dstStride[0],56 dst[0] + srcSliceY * dstStride[0],
@@ -78,9 +78,10 @@ int ff_##ifmt##_to_##ofmt##_neon(int w, int h, · 21 unmodified lines
78 int y_offset, \78 int y_offset, \
79 int y_coeff); \79 int y_coeff); \
80 \80 \
81static int ifmt##_to_##ofmt##_neon_wrapper(SwsContext *c, const uint8_t *src[], \81static int ifmt##_to_##ofmt##_neon_wrapper(SwsContext *c, const uint8_t *const src[], \
82 int srcStride[], int srcSliceY, int srcSliceH, \82 const int srcStride[], int srcSliceY, \
83 uint8_t *dst[], int dstStride[]) { \83 int srcSliceH, uint8_t *const dst[], \
84 const int dstStride[]) { \
84 const int16_t yuv2rgb_table[] = { YUV_TO_RGB_TABLE }; \85 const int16_t yuv2rgb_table[] = { YUV_TO_RGB_TABLE }; \
85 \86 \
86 ff_##ifmt##_to_##ofmt##_neon(c->srcW, srcSliceH, \87 ff_##ifmt##_to_##ofmt##_neon(c->srcW, srcSliceH, \
@@ -113,9 +114,10 @@ int ff_##ifmt##_to_##ofmt##_neon(int w, int h, · 26 unmodified lines
113 int y_offset, \114 int y_offset, \
114 int y_coeff); \115 int y_coeff); \
115 \116 \
116static int ifmt##_to_##ofmt##_neon_wrapper(SwsContext *c, const uint8_t *src[], \117static int ifmt##_to_##ofmt##_neon_wrapper(SwsContext *c, const uint8_t *const src[], \
117 int srcStride[], int srcSliceY, int srcSliceH, \118 const int srcStride[], int srcSliceY, \
118 uint8_t *dst[], int dstStride[]) { \119 int srcSliceH, uint8_t *const dst[], \
120 const int dstStride[]) { \
119 const int16_t yuv2rgb_table[] = { YUV_TO_RGB_TABLE }; \121 const int16_t yuv2rgb_table[] = { YUV_TO_RGB_TABLE }; \
120 \122 \
121 ff_##ifmt##_to_##ofmt##_neon(c->srcW, srcSliceH, \123 ff_##ifmt##_to_##ofmt##_neon(c->srcW, srcSliceH, \
libswscale/bayer_template.c+2−2
@@ -253,7 +253,7 @@ static void BAYER_RENAME(rgb48_interpolate)(const uint8_t *src, int src_stride, · 252 unmodified lines
253 }253 }
254}254}
255 255
256static void BAYER_RENAME(yv12_copy)(const uint8_t *src, int src_stride, uint8_t *dstY, uint8_t *dstU, uint8_t *dstV, int luma_stride, int width, int32_t *rgb2yuv)256static void BAYER_RENAME(yv12_copy)(const uint8_t *src, int src_stride, uint8_t *dstY, uint8_t *dstU, uint8_t *dstV, int luma_stride, int width, const int32_t *rgb2yuv)
257{257{
258 uint8_t dst[12];258 uint8_t dst[12];
259 const int dst_stride = 6;259 const int dst_stride = 6;
@@ -268,7 +268,7 @@ static void BAYER_RENAME(yv12_copy)(const uint8_t *src, int src_stride, uint8_t · 8 unmodified lines
268 }268 }
269}269}
270 270
271static void BAYER_RENAME(yv12_interpolate)(const uint8_t *src, int src_stride, uint8_t *dstY, uint8_t *dstU, uint8_t *dstV, int luma_stride, int width, int32_t *rgb2yuv)271static void BAYER_RENAME(yv12_interpolate)(const uint8_t *src, int src_stride, uint8_t *dstY, uint8_t *dstU, uint8_t *dstV, int luma_stride, int width, const int32_t *rgb2yuv)
272{272{
273 uint8_t dst[12];273 uint8_t dst[12];
274 const int dst_stride = 6;274 const int dst_stride = 6;
libswscale/loongarch/yuv2rgb_lasx.c+6−6
@@ -160,9 +160,9 @@ · 159 unmodified lines
160}160}
161 161
162#define YUV2RGBFUNC(func_name, dst_type, alpha) \162#define YUV2RGBFUNC(func_name, dst_type, alpha) \
163 int func_name(SwsContext *c, const uint8_t *src[], \163 int func_name(SwsContext *c, const uint8_t *const src[], \
164 int srcStride[], int srcSliceY, int srcSliceH, \164 const int srcStride[], int srcSliceY, int srcSliceH, \
165 uint8_t *dst[], int dstStride[]) \165 uint8_t *const dst[], const int dstStride[]) \
166{ \166{ \
167 int x, y, h_size, vshift, res; \167 int x, y, h_size, vshift, res; \
168 __m256i m_y1, m_y2, m_u, m_v; \168 __m256i m_y1, m_y2, m_u, m_v; \
@@ -188,9 +188,9 @@ · 19 unmodified lines
188 for(x = 0; x < h_size; x++) { \188 for(x = 0; x < h_size; x++) { \
189 189
190#define YUV2RGBFUNC32(func_name, dst_type, alpha) \190#define YUV2RGBFUNC32(func_name, dst_type, alpha) \
191 int func_name(SwsContext *c, const uint8_t *src[], \191 int func_name(SwsContext *c, const uint8_t *const src[], \
192 int srcStride[], int srcSliceY, int srcSliceH, \192 const int srcStride[], int srcSliceY, int srcSliceH, \
193 uint8_t *dst[], int dstStride[]) \193 uint8_t *const dst[], const int dstStride[]) \
194{ \194{ \
195 int x, y, h_size, vshift, res; \195 int x, y, h_size, vshift, res; \
196 __m256i m_y1, m_y2, m_u, m_v; \196 __m256i m_y1, m_y2, m_u, m_v; \
libswscale/loongarch/yuv2rgb_lsx.c+6−6
@@ -113,9 +113,9 @@ · 112 unmodified lines
113}113}
114 114
115#define YUV2RGBFUNC(func_name, dst_type, alpha) \115#define YUV2RGBFUNC(func_name, dst_type, alpha) \
116 int func_name(SwsContext *c, const uint8_t *src[], \116 int func_name(SwsContext *c, const uint8_t *const src[], \
117 int srcStride[], int srcSliceY, int srcSliceH, \117 const int srcStride[], int srcSliceY, int srcSliceH, \
118 uint8_t *dst[], int dstStride[]) \118 uint8_t *const dst[], const int dstStride[]) \
119{ \119{ \
120 int x, y, h_size, vshift, res; \120 int x, y, h_size, vshift, res; \
121 __m128i m_y1, m_y2, m_u, m_v; \121 __m128i m_y1, m_y2, m_u, m_v; \
@@ -142,9 +142,9 @@ · 20 unmodified lines
142 for(x = 0; x < h_size; x++) { \142 for(x = 0; x < h_size; x++) { \
143 143
144#define YUV2RGBFUNC32(func_name, dst_type, alpha) \144#define YUV2RGBFUNC32(func_name, dst_type, alpha) \
145 int func_name(SwsContext *c, const uint8_t *src[], \145 int func_name(SwsContext *c, const uint8_t *const src[], \
146 int srcStride[], int srcSliceY, int srcSliceH, \146 const int srcStride[], int srcSliceY, int srcSliceH, \
147 uint8_t *dst[], int dstStride[]) \147 uint8_t *const dst[], const int dstStride[]) \
148{ \148{ \
149 int x, y, h_size, vshift, res; \149 int x, y, h_size, vshift, res; \
150 __m128i m_y1, m_y2, m_u, m_v; \150 __m128i m_y1, m_y2, m_u, m_v; \
libswscale/ppc/yuv2rgb_altivec.c+6−6
@@ -295,9 +295,9 @@ static inline vector unsigned char vec_xl(signed long long offset, const ubyte * · 294 unmodified lines
295#endif /* !HAVE_VSX */295#endif /* !HAVE_VSX */
296 296
297#define DEFCSP420_CVT(name, out_pixels) \297#define DEFCSP420_CVT(name, out_pixels) \
298static int altivec_ ## name(SwsContext *c, const unsigned char **in, \298static int altivec_ ## name(SwsContext *c, const unsigned char *const *in, \
299 int *instrides, int srcSliceY, int srcSliceH, \299 const int *instrides, int srcSliceY, int srcSliceH, \
300 unsigned char **oplanes, int *outstrides) \300 unsigned char *const *oplanes, const int *outstrides) \
301{ \301{ \
302 int w = c->srcW; \302 int w = c->srcW; \
303 int h = srcSliceH; \303 int h = srcSliceH; \
@@ -471,9 +471,9 @@ static const vector unsigned char · 167 unmodified lines
471/*471/*
472 * this is so I can play live CCIR raw video472 * this is so I can play live CCIR raw video
473 */473 */
474static int altivec_uyvy_rgb32(SwsContext *c, const unsigned char **in,474static int altivec_uyvy_rgb32(SwsContext *c, const unsigned char *const *in,
475 int *instrides, int srcSliceY, int srcSliceH,475 const int *instrides, int srcSliceY, int srcSliceH,
476 unsigned char **oplanes, int *outstrides)476 unsigned char *const *oplanes, const int *outstrides)
477{477{
478 int w = c->srcW;478 int w = c->srcW;
479 int h = srcSliceH;479 int h = srcSliceH;
libswscale/rgb2rgb.c+1−1
@@ -82,7 +82,7 @@ void (*ff_rgb24toyv12)(const uint8_t *src, uint8_t *ydst, · 81 unmodified lines
82 uint8_t *udst, uint8_t *vdst,82 uint8_t *udst, uint8_t *vdst,
83 int width, int height,83 int width, int height,
84 int lumStride, int chromStride, int srcStride,84 int lumStride, int chromStride, int srcStride,
85 int32_t *rgb2yuv);85 const int32_t *rgb2yuv);
86void (*planar2x)(const uint8_t *src, uint8_t *dst, int width, int height,86void (*planar2x)(const uint8_t *src, uint8_t *dst, int width, int height,
87 int srcStride, int dstStride);87 int srcStride, int dstStride);
88void (*interleaveBytes)(const uint8_t *src1, const uint8_t *src2, uint8_t *dst,88void (*interleaveBytes)(const uint8_t *src1, const uint8_t *src2, uint8_t *dst,
libswscale/rgb2rgb.h+2−2
@@ -78,7 +78,7 @@ void rgb12to15(const uint8_t *src, uint8_t *dst, int src_size); · 77 unmodified lines
78 78
79void ff_rgb24toyv12_c(const uint8_t *src, uint8_t *ydst, uint8_t *udst,79void ff_rgb24toyv12_c(const uint8_t *src, uint8_t *ydst, uint8_t *udst,
80 uint8_t *vdst, int width, int height, int lumStride,80 uint8_t *vdst, int width, int height, int lumStride,
81 int chromStride, int srcStride, int32_t *rgb2yuv);81 int chromStride, int srcStride, const int32_t *rgb2yuv);
82 82
83/**83/**
84 * Height should be a multiple of 2 and width should be a multiple of 16.84 * Height should be a multiple of 2 and width should be a multiple of 16.
@@ -125,7 +125,7 @@ extern void (*yuv422ptouyvy)(const uint8_t *ysrc, const uint8_t *usrc, const uin · 40 unmodified lines
125extern void (*ff_rgb24toyv12)(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst,125extern void (*ff_rgb24toyv12)(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
126 int width, int height,126 int width, int height,
127 int lumStride, int chromStride, int srcStride,127 int lumStride, int chromStride, int srcStride,
128 int32_t *rgb2yuv);128 const int32_t *rgb2yuv);
129extern void (*planar2x)(const uint8_t *src, uint8_t *dst, int width, int height,129extern void (*planar2x)(const uint8_t *src, uint8_t *dst, int width, int height,
130 int srcStride, int dstStride);130 int srcStride, int dstStride);
131 131
libswscale/rgb2rgb_template.c+1−1
@@ -645,7 +645,7 @@ static inline void uyvytoyv12_c(const uint8_t *src, uint8_t *ydst, · 644 unmodified lines
645 */645 */
646void ff_rgb24toyv12_c(const uint8_t *src, uint8_t *ydst, uint8_t *udst,646void ff_rgb24toyv12_c(const uint8_t *src, uint8_t *ydst, uint8_t *udst,
647 uint8_t *vdst, int width, int height, int lumStride,647 uint8_t *vdst, int width, int height, int lumStride,
648 int chromStride, int srcStride, int32_t *rgb2yuv)648 int chromStride, int srcStride, const int32_t *rgb2yuv)
649{649{
650 int32_t ry = rgb2yuv[RY_IDX], gy = rgb2yuv[GY_IDX], by = rgb2yuv[BY_IDX];650 int32_t ry = rgb2yuv[RY_IDX], gy = rgb2yuv[GY_IDX], by = rgb2yuv[BY_IDX];
651 int32_t ru = rgb2yuv[RU_IDX], gu = rgb2yuv[GU_IDX], bu = rgb2yuv[BU_IDX];651 int32_t ru = rgb2yuv[RU_IDX], gu = rgb2yuv[GU_IDX], bu = rgb2yuv[BU_IDX];
libswscale/swscale_internal.h+6−6
@@ -96,9 +96,9 @@ typedef struct RangeList { · 95 unmodified lines
96 96
97int ff_range_add(RangeList *r, unsigned int start, unsigned int len);97int ff_range_add(RangeList *r, unsigned int start, unsigned int len);
98 98
99typedef int (*SwsFunc)(struct SwsContext *context, const uint8_t *src[],99typedef int (*SwsFunc)(struct SwsContext *c, const uint8_t *const src[],
100 int srcStride[], int srcSliceY, int srcSliceH,100 const int srcStride[], int srcSliceY, int srcSliceH,
101 uint8_t *dst[], int dstStride[]);101 uint8_t *const dst[], const int dstStride[]);
102 102
103/**103/**
104 * Write one line of horizontally scaled data to planar output104 * Write one line of horizontally scaled data to planar output
@@ -1005,9 +1005,9 @@ void ff_hcscale_fast_mmxext(SwsContext *c, int16_t *dst1, int16_t *dst2, · 900 unmodified lines
1005 int dstWidth, const uint8_t *src1,1005 int dstWidth, const uint8_t *src1,
1006 const uint8_t *src2, int srcW, int xInc);1006 const uint8_t *src2, int srcW, int xInc);
1007 1007
1008int ff_sws_alphablendaway(SwsContext *c, const uint8_t *src[],1008int ff_sws_alphablendaway(SwsContext *c, const uint8_t *const src[],
1009 int srcStride[], int srcSliceY, int srcSliceH,1009 const int srcStride[], int srcSliceY, int srcSliceH,
1010 uint8_t *dst[], int dstStride[]);1010 uint8_t *const dst[], const int dstStride[]);
1011 1011
1012void ff_copyPlane(const uint8_t *src, int srcStride,1012void ff_copyPlane(const uint8_t *src, int srcStride,
1013 int srcSliceY, int srcSliceH, int width,1013 int srcSliceY, int srcSliceH, int width,
libswscale/swscale_unscaled.c+124−118
@@ -139,10 +139,10 @@ void ff_copyPlane(const uint8_t *src, int srcStride, · 138 unmodified lines
139 }139 }
140}140}
141 141
142static int planarToNv12Wrapper(SwsContext *c, const uint8_t *src[],142static int planarToNv12Wrapper(SwsContext *c, const uint8_t *const src[],
143 int srcStride[], int srcSliceY,143 const int srcStride[], int srcSliceY,
144 int srcSliceH, uint8_t *dstParam[],144 int srcSliceH, uint8_t *const dstParam[],
145 int dstStride[])145 const int dstStride[])
146{146{
147 uint8_t *dst = dstParam[1] + dstStride[1] * srcSliceY / 2;147 uint8_t *dst = dstParam[1] + dstStride[1] * srcSliceY / 2;
148 148
@@ -159,10 +159,10 @@ static int planarToNv12Wrapper(SwsContext *c, const uint8_t *src[], · 10 unmodified lines
159 return srcSliceH;159 return srcSliceH;
160}160}
161 161
162static int nv12ToPlanarWrapper(SwsContext *c, const uint8_t *src[],162static int nv12ToPlanarWrapper(SwsContext *c, const uint8_t *const src[],
163 int srcStride[], int srcSliceY,163 const int srcStride[], int srcSliceY,
164 int srcSliceH, uint8_t *dstParam[],164 int srcSliceH, uint8_t *const dstParam[],
165 int dstStride[])165 const int dstStride[])
166{166{
167 uint8_t *dst1 = dstParam[1] + dstStride[1] * srcSliceY / 2;167 uint8_t *dst1 = dstParam[1] + dstStride[1] * srcSliceY / 2;
168 uint8_t *dst2 = dstParam[2] + dstStride[2] * srcSliceY / 2;168 uint8_t *dst2 = dstParam[2] + dstStride[2] * srcSliceY / 2;
@@ -180,10 +180,10 @@ static int nv12ToPlanarWrapper(SwsContext *c, const uint8_t *src[], · 11 unmodified lines
180 return srcSliceH;180 return srcSliceH;
181}181}
182 182
183static int planarToNv24Wrapper(SwsContext *c, const uint8_t *src[],183static int planarToNv24Wrapper(SwsContext *c, const uint8_t *const src[],
184 int srcStride[], int srcSliceY,184 const int srcStride[], int srcSliceY,
185 int srcSliceH, uint8_t *dstParam[],185 int srcSliceH, uint8_t *const dstParam[],
186 int dstStride[])186 const int dstStride[])
187{187{
188 uint8_t *dst = dstParam[1] + dstStride[1] * srcSliceY;188 uint8_t *dst = dstParam[1] + dstStride[1] * srcSliceY;
189 189
@@ -200,10 +200,10 @@ static int planarToNv24Wrapper(SwsContext *c, const uint8_t *src[], · 10 unmodified lines
200 return srcSliceH;200 return srcSliceH;
201}201}
202 202
203static int nv24ToPlanarWrapper(SwsContext *c, const uint8_t *src[],203static int nv24ToPlanarWrapper(SwsContext *c, const uint8_t *const src[],
204 int srcStride[], int srcSliceY,204 const int srcStride[], int srcSliceY,
205 int srcSliceH, uint8_t *dstParam[],205 int srcSliceH, uint8_t *const dstParam[],
206 int dstStride[])206 const int dstStride[])
207{207{
208 uint8_t *dst1 = dstParam[1] + dstStride[1] * srcSliceY;208 uint8_t *dst1 = dstParam[1] + dstStride[1] * srcSliceY;
209 uint8_t *dst2 = dstParam[2] + dstStride[2] * srcSliceY;209 uint8_t *dst2 = dstParam[2] + dstStride[2] * srcSliceY;
@@ -243,9 +243,9 @@ static void nv24_to_yuv420p_chroma(uint8_t *dst1, int dstStride1, · 33 unmodified lines
243 }243 }
244}244}
245 245
246static int nv24ToYuv420Wrapper(SwsContext *c, const uint8_t *src[],246static int nv24ToYuv420Wrapper(SwsContext *c, const uint8_t *const src[],
247 int srcStride[], int srcSliceY, int srcSliceH,247 const int srcStride[], int srcSliceY, int srcSliceH,
248 uint8_t *dstParam[], int dstStride[])248 uint8_t *const dstParam[], const int dstStride[])
249{249{
250 uint8_t *dst1 = dstParam[1] + dstStride[1] * srcSliceY / 2;250 uint8_t *dst1 = dstParam[1] + dstStride[1] * srcSliceY / 2;
251 uint8_t *dst2 = dstParam[2] + dstStride[2] * srcSliceY / 2;251 uint8_t *dst2 = dstParam[2] + dstStride[2] * srcSliceY / 2;
@@ -263,10 +263,10 @@ static int nv24ToYuv420Wrapper(SwsContext *c, const uint8_t *src[], · 11 unmodified lines
263 return srcSliceH;263 return srcSliceH;
264}264}
265 265
266static int planarToP01xWrapper(SwsContext *c, const uint8_t *src8[],266static int planarToP01xWrapper(SwsContext *c, const uint8_t *const src8[],
267 int srcStride[], int srcSliceY,267 const int srcStride[], int srcSliceY,
268 int srcSliceH, uint8_t *dstParam8[],268 int srcSliceH, uint8_t *const dstParam8[],
269 int dstStride[])269 const int dstStride[])
270{270{
271 const AVPixFmtDescriptor *src_format = av_pix_fmt_desc_get(c->srcFormat);271 const AVPixFmtDescriptor *src_format = av_pix_fmt_desc_get(c->srcFormat);
272 const AVPixFmtDescriptor *dst_format = av_pix_fmt_desc_get(c->dstFormat);272 const AVPixFmtDescriptor *dst_format = av_pix_fmt_desc_get(c->dstFormat);
@@ -323,11 +323,12 @@ static int planarToP01xWrapper(SwsContext *c, const uint8_t *src8[], · 50 unmodified lines
323#define output_pixel(p, v) (*p) = (v)323#define output_pixel(p, v) (*p) = (v)
324#endif324#endif
325 325
326static int planar8ToP01xleWrapper(SwsContext *c, const uint8_t *src[],326static int planar8ToP01xleWrapper(SwsContext *c, const uint8_t *const src[],
327 int srcStride[], int srcSliceY,327 const int srcStride[], int srcSliceY,
328 int srcSliceH, uint8_t *dstParam8[],328 int srcSliceH, uint8_t *const dstParam8[],
329 int dstStride[])329 const int dstStride[])
330{330{
331 const uint8_t *src0 = src[0], *src1 = src[1], *src2 = src[2];
331 uint16_t *dstY = (uint16_t*)(dstParam8[0] + dstStride[0] * srcSliceY);332 uint16_t *dstY = (uint16_t*)(dstParam8[0] + dstStride[0] * srcSliceY);
332 uint16_t *dstUV = (uint16_t*)(dstParam8[1] + dstStride[1] * srcSliceY / 2);333 uint16_t *dstUV = (uint16_t*)(dstParam8[1] + dstStride[1] * srcSliceY / 2);
333 int x, y, t;334 int x, y, t;
@@ -336,26 +337,26 @@ static int planar8ToP01xleWrapper(SwsContext *c, const uint8_t *src[], · 2 unmodified lines
336 337
337 for (y = 0; y < srcSliceH; y++) {338 for (y = 0; y < srcSliceH; y++) {
338 uint16_t *tdstY = dstY;339 uint16_t *tdstY = dstY;
339 const uint8_t *tsrc0 = src[0];340 const uint8_t *tsrc0 = src0;
340 for (x = c->srcW; x > 0; x--) {341 for (x = c->srcW; x > 0; x--) {
341 t = *tsrc0++;342 t = *tsrc0++;
342 output_pixel(tdstY++, t | (t << 8));343 output_pixel(tdstY++, t | (t << 8));
343 }344 }
344 src[0] += srcStride[0];345 src0 += srcStride[0];
345 dstY += dstStride[0] / 2;346 dstY += dstStride[0] / 2;
346 347
347 if (!(y & 1)) {348 if (!(y & 1)) {
348 uint16_t *tdstUV = dstUV;349 uint16_t *tdstUV = dstUV;
349 const uint8_t *tsrc1 = src[1];350 const uint8_t *tsrc1 = src1;
350 const uint8_t *tsrc2 = src[2];351 const uint8_t *tsrc2 = src2;
351 for (x = c->srcW / 2; x > 0; x--) {352 for (x = c->srcW / 2; x > 0; x--) {
352 t = *tsrc1++;353 t = *tsrc1++;
353 output_pixel(tdstUV++, t | (t << 8));354 output_pixel(tdstUV++, t | (t << 8));
354 t = *tsrc2++;355 t = *tsrc2++;
355 output_pixel(tdstUV++, t | (t << 8));356 output_pixel(tdstUV++, t | (t << 8));
356 }357 }
357 src[1] += srcStride[1];358 src1 += srcStride[1];
358 src[2] += srcStride[2];359 src2 += srcStride[2];
359 dstUV += dstStride[1] / 2;360 dstUV += dstStride[1] / 2;
360 }361 }
361 }362 }
@@ -365,9 +366,9 @@ static int planar8ToP01xleWrapper(SwsContext *c, const uint8_t *src[], · 3 unmodified lines
365 366
366#undef output_pixel367#undef output_pixel
367 368
368static int planarToYuy2Wrapper(SwsContext *c, const uint8_t *src[],369static int planarToYuy2Wrapper(SwsContext *c, const uint8_t *const src[],
369 int srcStride[], int srcSliceY, int srcSliceH,370 const int srcStride[], int srcSliceY, int srcSliceH,
370 uint8_t *dstParam[], int dstStride[])371 uint8_t *const dstParam[], const int dstStride[])
371{372{
372 uint8_t *dst = dstParam[0] + dstStride[0] * srcSliceY;373 uint8_t *dst = dstParam[0] + dstStride[0] * srcSliceY;
373 374
@@ -377,9 +378,9 @@ static int planarToYuy2Wrapper(SwsContext *c, const uint8_t *src[], · 3 unmodified lines
377 return srcSliceH;378 return srcSliceH;
378}379}
379 380
380static int planarToUyvyWrapper(SwsContext *c, const uint8_t *src[],381static int planarToUyvyWrapper(SwsContext *c, const uint8_t *const src[],
381 int srcStride[], int srcSliceY, int srcSliceH,382 const int srcStride[], int srcSliceY, int srcSliceH,
382 uint8_t *dstParam[], int dstStride[])383 uint8_t *const dstParam[], const int dstStride[])
383{384{
384 uint8_t *dst = dstParam[0] + dstStride[0] * srcSliceY;385 uint8_t *dst = dstParam[0] + dstStride[0] * srcSliceY;
385 386
@@ -389,9 +390,9 @@ static int planarToUyvyWrapper(SwsContext *c, const uint8_t *src[], · 3 unmodified lines
389 return srcSliceH;390 return srcSliceH;
390}391}
391 392
392static int yuv422pToYuy2Wrapper(SwsContext *c, const uint8_t *src[],393static int yuv422pToYuy2Wrapper(SwsContext *c, const uint8_t *const src[],
393 int srcStride[], int srcSliceY, int srcSliceH,394 const int srcStride[], int srcSliceY, int srcSliceH,
394 uint8_t *dstParam[], int dstStride[])395 uint8_t *const dstParam[], const int dstStride[])
395{396{
396 uint8_t *dst = dstParam[0] + dstStride[0] * srcSliceY;397 uint8_t *dst = dstParam[0] + dstStride[0] * srcSliceY;
397 398
@@ -401,9 +402,9 @@ static int yuv422pToYuy2Wrapper(SwsContext *c, const uint8_t *src[], · 3 unmodified lines
401 return srcSliceH;402 return srcSliceH;
402}403}
403 404
404static int yuv422pToUyvyWrapper(SwsContext *c, const uint8_t *src[],405static int yuv422pToUyvyWrapper(SwsContext *c, const uint8_t *const src[],
405 int srcStride[], int srcSliceY, int srcSliceH,406 const int srcStride[], int srcSliceY, int srcSliceH,
406 uint8_t *dstParam[], int dstStride[])407 uint8_t *const dstParam[], const int dstStride[])
407{408{
408 uint8_t *dst = dstParam[0] + dstStride[0] * srcSliceY;409 uint8_t *dst = dstParam[0] + dstStride[0] * srcSliceY;
409 410
@@ -413,9 +414,9 @@ static int yuv422pToUyvyWrapper(SwsContext *c, const uint8_t *src[], · 3 unmodified lines
413 return srcSliceH;414 return srcSliceH;
414}415}
415 416
416static int yuyvToYuv420Wrapper(SwsContext *c, const uint8_t *src[],417static int yuyvToYuv420Wrapper(SwsContext *c, const uint8_t *const src[],
417 int srcStride[], int srcSliceY, int srcSliceH,418 const int srcStride[], int srcSliceY, int srcSliceH,
418 uint8_t *dstParam[], int dstStride[])419 uint8_t *const dstParam[], const int dstStride[])
419{420{
420 uint8_t *ydst = dstParam[0] + dstStride[0] * srcSliceY;421 uint8_t *ydst = dstParam[0] + dstStride[0] * srcSliceY;
421 uint8_t *udst = dstParam[1] + dstStride[1] * srcSliceY / 2;422 uint8_t *udst = dstParam[1] + dstStride[1] * srcSliceY / 2;
@@ -430,9 +431,9 @@ static int yuyvToYuv420Wrapper(SwsContext *c, const uint8_t *src[], · 8 unmodified lines
430 return srcSliceH;431 return srcSliceH;
431}432}
432 433
433static int yuyvToYuv422Wrapper(SwsContext *c, const uint8_t *src[],434static int yuyvToYuv422Wrapper(SwsContext *c, const uint8_t *const src[],
434 int srcStride[], int srcSliceY, int srcSliceH,435 const int srcStride[], int srcSliceY, int srcSliceH,
435 uint8_t *dstParam[], int dstStride[])436 uint8_t *const dstParam[], const int dstStride[])
436{437{
437 uint8_t *ydst = dstParam[0] + dstStride[0] * srcSliceY;438 uint8_t *ydst = dstParam[0] + dstStride[0] * srcSliceY;
438 uint8_t *udst = dstParam[1] + dstStride[1] * srcSliceY;439 uint8_t *udst = dstParam[1] + dstStride[1] * srcSliceY;
@@ -444,9 +445,9 @@ static int yuyvToYuv422Wrapper(SwsContext *c, const uint8_t *src[], · 5 unmodified lines
444 return srcSliceH;445 return srcSliceH;
445}446}
446 447
447static int uyvyToYuv420Wrapper(SwsContext *c, const uint8_t *src[],448static int uyvyToYuv420Wrapper(SwsContext *c, const uint8_t *const src[],
448 int srcStride[], int srcSliceY, int srcSliceH,449 const int srcStride[], int srcSliceY, int srcSliceH,
449 uint8_t *dstParam[], int dstStride[])450 uint8_t *const dstParam[], const int dstStride[])
450{451{
451 uint8_t *ydst = dstParam[0] + dstStride[0] * srcSliceY;452 uint8_t *ydst = dstParam[0] + dstStride[0] * srcSliceY;
452 uint8_t *udst = dstParam[1] + dstStride[1] * srcSliceY / 2;453 uint8_t *udst = dstParam[1] + dstStride[1] * srcSliceY / 2;
@@ -461,9 +462,9 @@ static int uyvyToYuv420Wrapper(SwsContext *c, const uint8_t *src[], · 8 unmodified lines
461 return srcSliceH;462 return srcSliceH;
462}463}
463 464
464static int uyvyToYuv422Wrapper(SwsContext *c, const uint8_t *src[],465static int uyvyToYuv422Wrapper(SwsContext *c, const uint8_t *const src[],
465 int srcStride[], int srcSliceY, int srcSliceH,466 const int srcStride[], int srcSliceY, int srcSliceH,
466 uint8_t *dstParam[], int dstStride[])467 uint8_t *const dstParam[], const int dstStride[])
467{468{
468 uint8_t *ydst = dstParam[0] + dstStride[0] * srcSliceY;469 uint8_t *ydst = dstParam[0] + dstStride[0] * srcSliceY;
469 uint8_t *udst = dstParam[1] + dstStride[1] * srcSliceY;470 uint8_t *udst = dstParam[1] + dstStride[1] * srcSliceY;
@@ -506,9 +507,9 @@ static void gray8aToPacked24(const uint8_t *src, uint8_t *dst, int num_pixels, · 36 unmodified lines
506 }507 }
507}508}
508 509
509static int bswap_16bpc(SwsContext *c, const uint8_t *src[],510static int bswap_16bpc(SwsContext *c, const uint8_t *const src[],
510 int srcStride[], int srcSliceY, int srcSliceH,511 const int srcStride[], int srcSliceY, int srcSliceH,
511 uint8_t *dst[], int dstStride[])512 uint8_t *const dst[], const int dstStride[])
512{513{
513 int i, j, p;514 int i, j, p;
514 515
@@ -533,9 +534,9 @@ static int bswap_16bpc(SwsContext *c, const uint8_t *src[], · 18 unmodified lines
533 return srcSliceH;534 return srcSliceH;
534}535}
535 536
536static int bswap_32bpc(SwsContext *c, const uint8_t *src[],537static int bswap_32bpc(SwsContext *c, const uint8_t *const src[],
537 int srcStride[], int srcSliceY, int srcSliceH,538 const int srcStride[], int srcSliceY, int srcSliceH,
538 uint8_t *dst[], int dstStride[])539 uint8_t *const dst[], const int dstStride[])
539{540{
540 int i, j, p;541 int i, j, p;
541 542
@@ -561,9 +562,9 @@ static int bswap_32bpc(SwsContext *c, const uint8_t *src[], · 19 unmodified lines
561}562}
562 563
563 564
564static int palToRgbWrapper(SwsContext *c, const uint8_t *src[], int srcStride[],565static int palToRgbWrapper(SwsContext *c, const uint8_t *const src[], const int srcStride[],
565 int srcSliceY, int srcSliceH, uint8_t *dst[],566 int srcSliceY, int srcSliceH, uint8_t *const dst[],
566 int dstStride[])567 const int dstStride[])
567{568{
568 const enum AVPixelFormat srcFormat = c->srcFormat;569 const enum AVPixelFormat srcFormat = c->srcFormat;
569 const enum AVPixelFormat dstFormat = c->dstFormat;570 const enum AVPixelFormat dstFormat = c->dstFormat;
@@ -608,7 +609,7 @@ static int palToRgbWrapper(SwsContext *c, const uint8_t *src[], int srcStride[], · 38 unmodified lines
608}609}
609 610
610static void packed16togbra16(const uint8_t *src, int srcStride,611static void packed16togbra16(const uint8_t *src, int srcStride,
611 uint16_t *dst[], int dstStride[], int srcSliceH,612 uint16_t *dst[], const int dstStride[], int srcSliceH,
612 int src_alpha, int swap, int shift, int width)613 int src_alpha, int swap, int shift, int width)
613{614{
614 int x, h, i;615 int x, h, i;
@@ -741,9 +742,9 @@ static void packed16togbra16(const uint8_t *src, int srcStride, · 126 unmodified lines
741 }742 }
742}743}
743 744
744static int Rgb16ToPlanarRgb16Wrapper(SwsContext *c, const uint8_t *src[],745static int Rgb16ToPlanarRgb16Wrapper(SwsContext *c, const uint8_t *const src[],
745 int srcStride[], int srcSliceY, int srcSliceH,746 const int srcStride[], int srcSliceY, int srcSliceH,
746 uint8_t *dst[], int dstStride[])747 uint8_t *const dst[], const int dstStride[])
747{748{
748 uint16_t *dst2013[] = { (uint16_t *)dst[2], (uint16_t *)dst[0], (uint16_t *)dst[1], (uint16_t *)dst[3] };749 uint16_t *dst2013[] = { (uint16_t *)dst[2], (uint16_t *)dst[0], (uint16_t *)dst[1], (uint16_t *)dst[3] };
749 uint16_t *dst1023[] = { (uint16_t *)dst[1], (uint16_t *)dst[0], (uint16_t *)dst[2], (uint16_t *)dst[3] };750 uint16_t *dst1023[] = { (uint16_t *)dst[1], (uint16_t *)dst[0], (uint16_t *)dst[2], (uint16_t *)dst[3] };
@@ -801,7 +802,7 @@ static int Rgb16ToPlanarRgb16Wrapper(SwsContext *c, const uint8_t *src[], · 51 unmodified lines
801 return srcSliceH;802 return srcSliceH;
802}803}
803 804
804static void gbr16ptopacked16(const uint16_t *src[], int srcStride[],805static void gbr16ptopacked16(const uint16_t *src[], const int srcStride[],
805 uint8_t *dst, int dstStride, int srcSliceH,806 uint8_t *dst, int dstStride, int srcSliceH,
806 int alpha, int swap, int bpp, int width)807 int alpha, int swap, int bpp, int width)
807{808{
@@ -920,9 +921,9 @@ static void gbr16ptopacked16(const uint16_t *src[], int srcStride[], · 112 unmodified lines
920 }921 }
921}922}
922 923
923static int planarRgb16ToRgb16Wrapper(SwsContext *c, const uint8_t *src[],924static int planarRgb16ToRgb16Wrapper(SwsContext *c, const uint8_t *const src[],
924 int srcStride[], int srcSliceY, int srcSliceH,925 const int srcStride[], int srcSliceY, int srcSliceH,
925 uint8_t *dst[], int dstStride[])926 uint8_t *const dst[], const int dstStride[])
926{927{
927 const uint16_t *src102[] = { (uint16_t *)src[1], (uint16_t *)src[0], (uint16_t *)src[2], (uint16_t *)src[3] };928 const uint16_t *src102[] = { (uint16_t *)src[1], (uint16_t *)src[0], (uint16_t *)src[2], (uint16_t *)src[3] };
928 const uint16_t *src201[] = { (uint16_t *)src[2], (uint16_t *)src[0], (uint16_t *)src[1], (uint16_t *)src[3] };929 const uint16_t *src201[] = { (uint16_t *)src[2], (uint16_t *)src[0], (uint16_t *)src[1], (uint16_t *)src[3] };
@@ -980,7 +981,7 @@ static int planarRgb16ToRgb16Wrapper(SwsContext *c, const uint8_t *src[], · 51 unmodified lines
980 return srcSliceH;981 return srcSliceH;
981}982}
982 983
983static void gbr24ptopacked24(const uint8_t *src[], int srcStride[],984static void gbr24ptopacked24(const uint8_t *src[], const int srcStride[],
984 uint8_t *dst, int dstStride, int srcSliceH,985 uint8_t *dst, int dstStride, int srcSliceH,
985 int width)986 int width)
986{987{
@@ -998,7 +999,7 @@ static void gbr24ptopacked24(const uint8_t *src[], int srcStride[], · 11 unmodified lines
998 }999 }
999}1000}
1000 1001
1001static void gbr24ptopacked32(const uint8_t *src[], int srcStride[],1002static void gbr24ptopacked32(const uint8_t *src[], const int srcStride[],
1002 uint8_t *dst, int dstStride, int srcSliceH,1003 uint8_t *dst, int dstStride, int srcSliceH,
1003 int alpha_first, int width)1004 int alpha_first, int width)
1004{1005{
@@ -1027,7 +1028,7 @@ static void gbr24ptopacked32(const uint8_t *src[], int srcStride[], · 22 unmodified lines
1027 }1028 }
1028}1029}
1029 1030
1030static void gbraptopacked32(const uint8_t *src[], int srcStride[],1031static void gbraptopacked32(const uint8_t *src[], const int srcStride[],
1031 uint8_t *dst, int dstStride, int srcSliceH,1032 uint8_t *dst, int dstStride, int srcSliceH,
1032 int alpha_first, int width)1033 int alpha_first, int width)
1033{1034{
@@ -1056,9 +1057,9 @@ static void gbraptopacked32(const uint8_t *src[], int srcStride[], · 22 unmodified lines
1056 }1057 }
1057}1058}
1058 1059
1059static int planarRgbaToRgbWrapper(SwsContext *c, const uint8_t *src[],1060static int planarRgbaToRgbWrapper(SwsContext *c, const uint8_t *const src[],
1060 int srcStride[], int srcSliceY, int srcSliceH,1061 const int srcStride[], int srcSliceY, int srcSliceH,
1061 uint8_t *dst[], int dstStride[])1062 uint8_t *const dst[], const int dstStride[])
1062{1063{
1063 int alpha_first = 0;1064 int alpha_first = 0;
1064 const uint8_t *src102[] = { src[1], src[0], src[2], src[3] };1065 const uint8_t *src102[] = { src[1], src[0], src[2], src[3] };
@@ -1112,9 +1113,9 @@ static int planarRgbaToRgbWrapper(SwsContext *c, const uint8_t *src[], · 47 unmodified lines
1112 return srcSliceH;1113 return srcSliceH;
1113}1114}
1114 1115
1115static int planarRgbToRgbWrapper(SwsContext *c, const uint8_t *src[],1116static int planarRgbToRgbWrapper(SwsContext *c, const uint8_t *const src[],
1116 int srcStride[], int srcSliceY, int srcSliceH,1117 const int srcStride[], int srcSliceY, int srcSliceH,
1117 uint8_t *dst[], int dstStride[])1118 uint8_t *const dst[], const int dstStride[])
1118{1119{
1119 int alpha_first = 0;1120 int alpha_first = 0;
1120 const uint8_t *src102[] = { src[1], src[0], src[2] };1121 const uint8_t *src102[] = { src[1], src[0], src[2] };
@@ -1169,9 +1170,9 @@ static int planarRgbToRgbWrapper(SwsContext *c, const uint8_t *src[], · 48 unmodified lines
1169}1170}
1170 1171
1171static int planarRgbToplanarRgbWrapper(SwsContext *c,1172static int planarRgbToplanarRgbWrapper(SwsContext *c,
1172 const uint8_t *src[], int srcStride[],1173 const uint8_t *const src[], const int srcStride[],
1173 int srcSliceY, int srcSliceH,1174 int srcSliceY, int srcSliceH,
1174 uint8_t *dst[], int dstStride[])1175 uint8_t *const dst[], const int dstStride[])
1175{1176{
1176 ff_copyPlane(src[0], srcStride[0], srcSliceY, srcSliceH, c->srcW,1177 ff_copyPlane(src[0], srcStride[0], srcSliceY, srcSliceH, c->srcW,
1177 dst[0], dstStride[0]);1178 dst[0], dstStride[0]);
@@ -1186,7 +1187,7 @@ static int planarRgbToplanarRgbWrapper(SwsContext *c, · 8 unmodified lines
1186}1187}
1187 1188
1188static void packedtogbr24p(const uint8_t *src, int srcStride,1189static void packedtogbr24p(const uint8_t *src, int srcStride,
1189 uint8_t *dst[], int dstStride[], int srcSliceH,1190 uint8_t *const dst[], const int dstStride[], int srcSliceH,
1190 int alpha_first, int inc_size, int width)1191 int alpha_first, int inc_size, int width)
1191{1192{
1192 uint8_t *dest[3];1193 uint8_t *dest[3];
@@ -1214,9 +1215,9 @@ static void packedtogbr24p(const uint8_t *src, int srcStride, · 21 unmodified lines
1214 }1215 }
1215}1216}
1216 1217
1217static int rgbToPlanarRgbWrapper(SwsContext *c, const uint8_t *src[],1218static int rgbToPlanarRgbWrapper(SwsContext *c, const uint8_t *const src[],
1218 int srcStride[], int srcSliceY, int srcSliceH,1219 const int srcStride[], int srcSliceY, int srcSliceH,
1219 uint8_t *dst[], int dstStride[])1220 uint8_t *const dst[], const int dstStride[])
1220{1221{
1221 int alpha_first = 0;1222 int alpha_first = 0;
1222 int stride102[] = { dstStride[1], dstStride[0], dstStride[2] };1223 int stride102[] = { dstStride[1], dstStride[0], dstStride[2] };
@@ -1319,8 +1320,9 @@ static int rgbToPlanarRgbWrapper(SwsContext *c, const uint8_t *src[], · 96 unmodified lines
1319#define BAYER_RENAME(x) bayer_rggb16be_to_##x1320#define BAYER_RENAME(x) bayer_rggb16be_to_##x
1320#include "bayer_template.c"1321#include "bayer_template.c"
1321 1322
1322static int bayer_to_rgb24_wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,1323static int bayer_to_rgb24_wrapper(SwsContext *c, const uint8_t *const src[],
1323 int srcSliceH, uint8_t* dst[], int dstStride[])1324 const int srcStride[], int srcSliceY, int srcSliceH,
1325 uint8_t *const dst[], const int dstStride[])
1324{1326{
1325 uint8_t *dstPtr= dst[0] + srcSliceY * dstStride[0];1327 uint8_t *dstPtr= dst[0] + srcSliceY * dstStride[0];
1326 const uint8_t *srcPtr= src[0];1328 const uint8_t *srcPtr= src[0];
@@ -1368,8 +1370,9 @@ static int bayer_to_rgb24_wrapper(SwsContext *c, const uint8_t* src[], int srcSt · 41 unmodified lines
1368 return srcSliceH;1370 return srcSliceH;
1369}1371}
1370 1372
1371static int bayer_to_rgb48_wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,1373static int bayer_to_rgb48_wrapper(SwsContext *c, const uint8_t *const src[],
1372 int srcSliceH, uint8_t* dst[], int dstStride[])1374 const int srcStride[], int srcSliceY, int srcSliceH,
1375 uint8_t *const dst[], const int dstStride[])
1373{1376{
1374 uint8_t *dstPtr= dst[0] + srcSliceY * dstStride[0];1377 uint8_t *dstPtr= dst[0] + srcSliceY * dstStride[0];
1375 const uint8_t *srcPtr= src[0];1378 const uint8_t *srcPtr= src[0];
@@ -1417,16 +1420,17 @@ static int bayer_to_rgb48_wrapper(SwsContext *c, const uint8_t* src[], int srcSt · 41 unmodified lines
1417 return srcSliceH;1420 return srcSliceH;
1418}1421}
1419 1422
1420static int bayer_to_yv12_wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,1423static int bayer_to_yv12_wrapper(SwsContext *c, const uint8_t *const src[],
1421 int srcSliceH, uint8_t* dst[], int dstStride[])1424 const int srcStride[], int srcSliceY, int srcSliceH,
1425 uint8_t *const dst[], const int dstStride[])
1422{1426{
1423 const uint8_t *srcPtr= src[0];1427 const uint8_t *srcPtr= src[0];
1424 uint8_t *dstY= dst[0] + srcSliceY * dstStride[0];1428 uint8_t *dstY= dst[0] + srcSliceY * dstStride[0];
1425 uint8_t *dstU= dst[1] + srcSliceY * dstStride[1] / 2;1429 uint8_t *dstU= dst[1] + srcSliceY * dstStride[1] / 2;
1426 uint8_t *dstV= dst[2] + srcSliceY * dstStride[2] / 2;1430 uint8_t *dstV= dst[2] + srcSliceY * dstStride[2] / 2;
1427 int i;1431 int i;
1428 void (*copy) (const uint8_t *src, int src_stride, uint8_t *dstY, uint8_t *dstU, uint8_t *dstV, int luma_stride, int width, int32_t *rgb2yuv);1432 void (*copy) (const uint8_t *src, int src_stride, uint8_t *dstY, uint8_t *dstU, uint8_t *dstV, int luma_stride, int width, const int32_t *rgb2yuv);
1429 void (*interpolate)(const uint8_t *src, int src_stride, uint8_t *dstY, uint8_t *dstU, uint8_t *dstV, int luma_stride, int width, int32_t *rgb2yuv);1433 void (*interpolate)(const uint8_t *src, int src_stride, uint8_t *dstY, uint8_t *dstU, uint8_t *dstV, int luma_stride, int width, const int32_t *rgb2yuv);
1430 1434
1431 switch(c->srcFormat) {1435 switch(c->srcFormat) {
1432#define CASE(pixfmt, prefix) \1436#define CASE(pixfmt, prefix) \
@@ -1618,9 +1622,9 @@ static rgbConvFn findRgbConvFn(SwsContext *c) · 185 unmodified lines
1618}1622}
1619 1623
1620/* {RGB,BGR}{15,16,24,32,32_1} -> {RGB,BGR}{15,16,24,32} */1624/* {RGB,BGR}{15,16,24,32,32_1} -> {RGB,BGR}{15,16,24,32} */
1621static int rgbToRgbWrapper(SwsContext *c, const uint8_t *src[], int srcStride[],1625static int rgbToRgbWrapper(SwsContext *c, const uint8_t *const src[], const int srcStride[],
1622 int srcSliceY, int srcSliceH, uint8_t *dst[],1626 int srcSliceY, int srcSliceH, uint8_t *const dst[],
1623 int dstStride[])1627 const int dstStride[])
1624 1628
1625{1629{
1626 const enum AVPixelFormat srcFormat = c->srcFormat;1630 const enum AVPixelFormat srcFormat = c->srcFormat;
@@ -1679,9 +1683,9 @@ static int rgbToRgbWrapper(SwsContext *c, const uint8_t *src[], int srcStride[], · 52 unmodified lines
1679 return srcSliceH;1683 return srcSliceH;
1680}1684}
1681 1685
1682static int bgr24ToYv12Wrapper(SwsContext *c, const uint8_t *src[],1686static int bgr24ToYv12Wrapper(SwsContext *c, const uint8_t *const src[],
1683 int srcStride[], int srcSliceY, int srcSliceH,1687 const int srcStride[], int srcSliceY, int srcSliceH,
1684 uint8_t *dst[], int dstStride[])1688 uint8_t *const dst[], const int dstStride[])
1685{1689{
1686 ff_rgb24toyv12(1690 ff_rgb24toyv12(
1687 src[0],1691 src[0],
@@ -1696,9 +1700,9 @@ static int bgr24ToYv12Wrapper(SwsContext *c, const uint8_t *src[], · 8 unmodified lines
1696 return srcSliceH;1700 return srcSliceH;
1697}1701}
1698 1702
1699static int yvu9ToYv12Wrapper(SwsContext *c, const uint8_t *src[],1703static int yvu9ToYv12Wrapper(SwsContext *c, const uint8_t *const src[],
1700 int srcStride[], int srcSliceY, int srcSliceH,1704 const int srcStride[], int srcSliceY, int srcSliceH,
1701 uint8_t *dst[], int dstStride[])1705 uint8_t *const dst[], const int dstStride[])
1702{1706{
1703 ff_copyPlane(src[0], srcStride[0], srcSliceY, srcSliceH, c->srcW,1707 ff_copyPlane(src[0], srcStride[0], srcSliceY, srcSliceH, c->srcW,
1704 dst[0], dstStride[0]);1708 dst[0], dstStride[0]);
@@ -1712,9 +1716,9 @@ static int yvu9ToYv12Wrapper(SwsContext *c, const uint8_t *src[], · 7 unmodified lines
1712 return srcSliceH;1716 return srcSliceH;
1713}1717}
1714 1718
1715static int uint_y_to_float_y_wrapper(SwsContext *c, const uint8_t *src[],1719static int uint_y_to_float_y_wrapper(SwsContext *c, const uint8_t *const src[],
1716 int srcStride[], int srcSliceY,1720 const int srcStride[], int srcSliceY,
1717 int srcSliceH, uint8_t *dst[], int dstStride[])1721 int srcSliceH, uint8_t *const dst[], const int dstStride[])
1718{1722{
1719 int y, x;1723 int y, x;
1720 ptrdiff_t dstStrideFloat = dstStride[0] >> 2;1724 ptrdiff_t dstStrideFloat = dstStride[0] >> 2;
@@ -1732,9 +1736,11 @@ static int uint_y_to_float_y_wrapper(SwsContext *c, const uint8_t *src[], · 11 unmodified lines
1732 return srcSliceH;1736 return srcSliceH;
1733}1737}
1734 1738
1735static int float_y_to_uint_y_wrapper(SwsContext *c, const uint8_t* src[],1739static int float_y_to_uint_y_wrapper(SwsContext *c,
1736 int srcStride[], int srcSliceY,1740 const uint8_t *const src[],
1737 int srcSliceH, uint8_t* dst[], int dstStride[])1741 const int srcStride[], int srcSliceY,
1742 int srcSliceH, uint8_t *const dst[],
1743 const int dstStride[])
1738{1744{
1739 int y, x;1745 int y, x;
1740 ptrdiff_t srcStrideFloat = srcStride[0] >> 2;1746 ptrdiff_t srcStrideFloat = srcStride[0] >> 2;
@@ -1753,9 +1759,9 @@ static int float_y_to_uint_y_wrapper(SwsContext *c, const uint8_t* src[], · 12 unmodified lines
1753}1759}
1754 1760
1755/* unscaled copy like stuff (assumes nearly identical formats) */1761/* unscaled copy like stuff (assumes nearly identical formats) */
1756static int packedCopyWrapper(SwsContext *c, const uint8_t *src[],1762static int packedCopyWrapper(SwsContext *c, const uint8_t *const src[],
1757 int srcStride[], int srcSliceY, int srcSliceH,1763 const int srcStride[], int srcSliceY, int srcSliceH,
1758 uint8_t *dst[], int dstStride[])1764 uint8_t *const dst[], const int dstStride[])
1759{1765{
1760 if (dstStride[0] == srcStride[0] && srcStride[0] > 0)1766 if (dstStride[0] == srcStride[0] && srcStride[0] > 0)
1761 memcpy(dst[0] + dstStride[0] * srcSliceY, src[0], srcSliceH * dstStride[0]);1767 memcpy(dst[0] + dstStride[0] * srcSliceY, src[0], srcSliceH * dstStride[0]);
@@ -1840,9 +1846,9 @@ static int packedCopyWrapper(SwsContext *c, const uint8_t *src[], · 78 unmodified lines
1840 }\1846 }\
1841 }1847 }
1842 1848
1843static int planarCopyWrapper(SwsContext *c, const uint8_t *src[],1849static int planarCopyWrapper(SwsContext *c, const uint8_t *const src[],
1844 int srcStride[], int srcSliceY, int srcSliceH,1850 const int srcStride[], int srcSliceY, int srcSliceH,
1845 uint8_t *dst[], int dstStride[])1851 uint8_t *const dst[], const int dstStride[])
1846{1852{
1847 const AVPixFmtDescriptor *desc_src = av_pix_fmt_desc_get(c->srcFormat);1853 const AVPixFmtDescriptor *desc_src = av_pix_fmt_desc_get(c->srcFormat);
1848 const AVPixFmtDescriptor *desc_dst = av_pix_fmt_desc_get(c->dstFormat);1854 const AVPixFmtDescriptor *desc_dst = av_pix_fmt_desc_get(c->dstFormat);
libswscale/x86/yuv2rgb.c+27−27
@@ -86,10 +86,10 @@ extern void ff_yuv_420_gbrp24_ssse3(x86_reg index, uint8_t *image, uint8_t *dst_ · 85 unmodified lines
86 const uint8_t *py_2index);86 const uint8_t *py_2index);
87#endif87#endif
88 88
89static inline int yuv420_rgb15_ssse3(SwsContext *c, const uint8_t *src[],89static inline int yuv420_rgb15_ssse3(SwsContext *c, const uint8_t *const src[],
90 int srcStride[],90 const int srcStride[],
91 int srcSliceY, int srcSliceH,91 int srcSliceY, int srcSliceH,
92 uint8_t *dst[], int dstStride[])92 uint8_t *const dst[], const int dstStride[])
93{93{
94 int y, h_size, vshift;94 int y, h_size, vshift;
95 95
@@ -104,10 +104,10 @@ static inline int yuv420_rgb15_ssse3(SwsContext *c, const uint8_t *src[], · 8 unmodified lines
104 return srcSliceH;104 return srcSliceH;
105}105}
106 106
107static inline int yuv420_rgb16_ssse3(SwsContext *c, const uint8_t *src[],107static inline int yuv420_rgb16_ssse3(SwsContext *c, const uint8_t *const src[],
108 int srcStride[],108 const int srcStride[],
109 int srcSliceY, int srcSliceH,109 int srcSliceY, int srcSliceH,
110 uint8_t *dst[], int dstStride[])110 uint8_t *const dst[], const int dstStride[])
111{111{
112 int y, h_size, vshift;112 int y, h_size, vshift;
113 113
@@ -122,10 +122,10 @@ static inline int yuv420_rgb16_ssse3(SwsContext *c, const uint8_t *src[], · 8 unmodified lines
122 return srcSliceH;122 return srcSliceH;
123}123}
124 124
125static inline int yuv420_rgb32_ssse3(SwsContext *c, const uint8_t *src[],125static inline int yuv420_rgb32_ssse3(SwsContext *c, const uint8_t *const src[],
126 int srcStride[],126 const int srcStride[],
127 int srcSliceY, int srcSliceH,127 int srcSliceY, int srcSliceH,
128 uint8_t *dst[], int dstStride[])128 uint8_t *const dst[], const int dstStride[])
129{129{
130 int y, h_size, vshift;130 int y, h_size, vshift;
131 131
@@ -136,10 +136,10 @@ static inline int yuv420_rgb32_ssse3(SwsContext *c, const uint8_t *src[], · 4 unmodified lines
136 return srcSliceH;136 return srcSliceH;
137}137}
138 138
139static inline int yuv420_bgr32_ssse3(SwsContext *c, const uint8_t *src[],139static inline int yuv420_bgr32_ssse3(SwsContext *c, const uint8_t *const src[],
140 int srcStride[],140 const int srcStride[],
141 int srcSliceY, int srcSliceH,141 int srcSliceY, int srcSliceH,
142 uint8_t *dst[], int dstStride[])142 uint8_t *const dst[], const int dstStride[])
143{143{
144 int y, h_size, vshift;144 int y, h_size, vshift;
145 145
@@ -150,10 +150,10 @@ static inline int yuv420_bgr32_ssse3(SwsContext *c, const uint8_t *src[], · 4 unmodified lines
150 return srcSliceH;150 return srcSliceH;
151}151}
152 152
153static inline int yuva420_rgb32_ssse3(SwsContext *c, const uint8_t *src[],153static inline int yuva420_rgb32_ssse3(SwsContext *c, const uint8_t *const src[],
154 int srcStride[],154 const int srcStride[],
155 int srcSliceY, int srcSliceH,155 int srcSliceY, int srcSliceH,
156 uint8_t *dst[], int dstStride[])156 uint8_t *const dst[], const int dstStride[])
157{157{
158 int y, h_size, vshift;158 int y, h_size, vshift;
159 YUV2RGB_LOOP(4)159 YUV2RGB_LOOP(4)
@@ -164,10 +164,10 @@ static inline int yuva420_rgb32_ssse3(SwsContext *c, const uint8_t *src[], · 4 unmodified lines
164 return srcSliceH;164 return srcSliceH;
165}165}
166 166
167static inline int yuva420_bgr32_ssse3(SwsContext *c, const uint8_t *src[],167static inline int yuva420_bgr32_ssse3(SwsContext *c, const uint8_t *const src[],
168 int srcStride[],168 const int srcStride[],
169 int srcSliceY, int srcSliceH,169 int srcSliceY, int srcSliceH,
170 uint8_t *dst[], int dstStride[])170 uint8_t *const dst[], const int dstStride[])
171{171{
172 int y, h_size, vshift;172 int y, h_size, vshift;
173 173
@@ -179,10 +179,10 @@ static inline int yuva420_bgr32_ssse3(SwsContext *c, const uint8_t *src[], · 5 unmodified lines
179 return srcSliceH;179 return srcSliceH;
180}180}
181 181
182static inline int yuv420_rgb24_ssse3(SwsContext *c, const uint8_t *src[],182static inline int yuv420_rgb24_ssse3(SwsContext *c, const uint8_t *const src[],
183 int srcStride[],183 const int srcStride[],
184 int srcSliceY, int srcSliceH,184 int srcSliceY, int srcSliceH,
185 uint8_t *dst[], int dstStride[])185 uint8_t *const dst[], const int dstStride[])
186{186{
187 int y, h_size, vshift;187 int y, h_size, vshift;
188 188
@@ -193,10 +193,10 @@ static inline int yuv420_rgb24_ssse3(SwsContext *c, const uint8_t *src[], · 4 unmodified lines
193 return srcSliceH;193 return srcSliceH;
194}194}
195 195
196static inline int yuv420_bgr24_ssse3(SwsContext *c, const uint8_t *src[],196static inline int yuv420_bgr24_ssse3(SwsContext *c, const uint8_t *const src[],
197 int srcStride[],197 const int srcStride[],
198 int srcSliceY, int srcSliceH,198 int srcSliceY, int srcSliceH,
199 uint8_t *dst[], int dstStride[])199 uint8_t *const dst[], const int dstStride[])
200{200{
201 int y, h_size, vshift;201 int y, h_size, vshift;
202 202
@@ -208,10 +208,10 @@ static inline int yuv420_bgr24_ssse3(SwsContext *c, const uint8_t *src[], · 5 unmodified lines
208}208}
209 209
210#if ARCH_X86_64210#if ARCH_X86_64
211static inline int yuv420_gbrp_ssse3(SwsContext *c, const uint8_t *src[],211static inline int yuv420_gbrp_ssse3(SwsContext *c, const uint8_t *const src[],
212 int srcStride[],212 const int srcStride[],
213 int srcSliceY, int srcSliceH,213 int srcSliceY, int srcSliceH,
214 uint8_t *dst[], int dstStride[])214 uint8_t *const dst[], const int dstStride[])
215{215{
216 int y, h_size, vshift;216 int y, h_size, vshift;
217 217
libswscale/yuv2rgb.c+3−3
@@ -135,9 +135,9 @@ const int *sws_getCoefficients(int colorspace) · 134 unmodified lines
135 dst2_##l[2 * i + 1] = r[Y];135 dst2_##l[2 * i + 1] = r[Y];
136 136
137#define YUV2RGBFUNC(func_name, dst_type, alpha, yuv422, nb_dst_planes) \137#define YUV2RGBFUNC(func_name, dst_type, alpha, yuv422, nb_dst_planes) \
138 static int func_name(SwsContext *c, const uint8_t *src[], \138 static int func_name(SwsContext *c, const uint8_t *const src[], \
139 int srcStride[], int srcSliceY, int srcSliceH, \139 const int srcStride[], int srcSliceY, int srcSliceH, \
140 uint8_t *dst[], int dstStride[]) \140 uint8_t *const dst[], const int dstStride[]) \
141 { \141 { \
142 int y; \142 int y; \
143 \143 \

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