virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

bfin: libswscale: add const where appropriate to fix warnings

Browse Source 
Signed-off-by: Mans Rullgard <mans@mansr.com>
This commit is contained in:
Mans Rullgard
2012-06-19 15:14:33 +01:00
parent 6bac8971cc
commit 4996e8f510
2 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libswscale/bfin/swscale_bfin.c
View File

@@ -39,14 +39,14 @@ int ff_bfin_yuyvtoyv12(const uint8_t *src, uint8_t *ydst, uint8_t *udst,
uint8_t *vdst, int width, int height, uint8_t *vdst, int width, int height,
int lumStride, int chromStride, int srcStride) L1CODE; int lumStride, int chromStride, int srcStride) L1CODE;
static int uyvytoyv12_unscaled(SwsContext *c, uint8_t *src[], int srcStride[], static int uyvytoyv12_unscaled(SwsContext *c, const uint8_t *src[],
int srcSliceY, int srcSliceH, uint8_t *dst[], int srcStride[], int srcSliceY, int srcSliceH,
int dstStride[]) uint8_t *dst[], int dstStride[])
{ {
uint8_t *dsty = dst[0] + dstStride[0] * srcSliceY; uint8_t *dsty = dst[0] + dstStride[0] * srcSliceY;
uint8_t *dstu = dst[1] + dstStride[1] * srcSliceY / 2; uint8_t *dstu = dst[1] + dstStride[1] * srcSliceY / 2;
uint8_t *dstv = dst[2] + dstStride[2] * srcSliceY / 2; uint8_t *dstv = dst[2] + dstStride[2] * srcSliceY / 2;
uint8_t *ip = src[0] + srcStride[0] * srcSliceY; const uint8_t *ip = src[0] + srcStride[0] * srcSliceY;
int w = dstStride[0]; int w = dstStride[0];
ff_bfin_uyvytoyv12(ip, dsty, dstu, dstv, w, srcSliceH, ff_bfin_uyvytoyv12(ip, dsty, dstu, dstv, w, srcSliceH,
@@ -55,14 +55,14 @@ static int uyvytoyv12_unscaled(SwsContext *c, uint8_t *src[], int srcStride[],
return srcSliceH; return srcSliceH;
} }
static int yuyvtoyv12_unscaled(SwsContext *c, uint8_t *src[], int srcStride[], static int yuyvtoyv12_unscaled(SwsContext *c, const uint8_t *src[],
int srcSliceY, int srcSliceH, uint8_t *dst[], int srcStride[], int srcSliceY, int srcSliceH,
int dstStride[]) uint8_t *dst[], int dstStride[])
{ {
uint8_t *dsty = dst[0] + dstStride[0] * srcSliceY; uint8_t *dsty = dst[0] + dstStride[0] * srcSliceY;
uint8_t *dstu = dst[1] + dstStride[1] * srcSliceY / 2; uint8_t *dstu = dst[1] + dstStride[1] * srcSliceY / 2;
uint8_t *dstv = dst[2] + dstStride[2] * srcSliceY / 2; uint8_t *dstv = dst[2] + dstStride[2] * srcSliceY / 2;
uint8_t *ip = src[0] + srcStride[0] * srcSliceY; const uint8_t *ip = src[0] + srcStride[0] * srcSliceY;
int w = dstStride[0]; int w = dstStride[0];
ff_bfin_yuyvtoyv12(ip, dsty, dstu, dstv, w, srcSliceH, ff_bfin_yuyvtoyv12(ip, dsty, dstu, dstv, w, srcSliceH,

30
libswscale/bfin/yuv2rgb_bfin.c
View File

@@ -32,17 +32,20 @@
#define L1CODE #define L1CODE
#endif #endif
void ff_bfin_yuv2rgb555_line(uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out, void ff_bfin_yuv2rgb555_line(const uint8_t *Y, const uint8_t *U,
const uint8_t *V, uint8_t *out,
int w, uint32_t *coeffs) L1CODE; int w, uint32_t *coeffs) L1CODE;
void ff_bfin_yuv2rgb565_line(uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out, void ff_bfin_yuv2rgb565_line(const uint8_t *Y, const uint8_t *U,
const uint8_t *V, uint8_t *out,
int w, uint32_t *coeffs) L1CODE; int w, uint32_t *coeffs) L1CODE;
void ff_bfin_yuv2rgb24_line(uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out, void ff_bfin_yuv2rgb24_line(const uint8_t *Y, const uint8_t *U,
const uint8_t *V, uint8_t *out,
int w, uint32_t *coeffs) L1CODE; int w, uint32_t *coeffs) L1CODE;
typedef void (*ltransform)(uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out, typedef void (*ltransform)(const uint8_t *Y, const uint8_t *U, const uint8_t *V,
int w, uint32_t *coeffs); uint8_t *out, int w, uint32_t *coeffs);
static void bfin_prepare_coefficients(SwsContext *c, int rgb, int masks) static void bfin_prepare_coefficients(SwsContext *c, int rgb, int masks)
{ {
@@ -80,12 +83,13 @@ static void bfin_prepare_coefficients(SwsContext *c, int rgb, int masks)
} }
} }
static int core_yuv420_rgb(SwsContext *c, uint8_t **in, int *instrides, static int core_yuv420_rgb(SwsContext *c, const uint8_t **in, int *instrides,
int srcSliceY, int srcSliceH, uint8_t **oplanes, int srcSliceY, int srcSliceH, uint8_t **oplanes,
int *outstrides, ltransform lcscf, int *outstrides, ltransform lcscf,
int rgb, int masks) int rgb, int masks)
{ {
uint8_t *py, *pu, *pv, *op; const uint8_t *py, *pu, *pv;
uint8_t *op;
int w = instrides[0]; int w = instrides[0];
int h2 = srcSliceH >> 1; int h2 = srcSliceH >> 1;
int i; int i;
@@ -115,7 +119,7 @@ static int core_yuv420_rgb(SwsContext *c, uint8_t **in, int *instrides,
return srcSliceH; return srcSliceH;
} }
static int bfin_yuv420_rgb555(SwsContext *c, uint8_t **in, int *instrides, static int bfin_yuv420_rgb555(SwsContext *c, const uint8_t **in, int *instrides,
int srcSliceY, int srcSliceH, int srcSliceY, int srcSliceH,
uint8_t **oplanes, int *outstrides) uint8_t **oplanes, int *outstrides)
{ {
@@ -123,7 +127,7 @@ static int bfin_yuv420_rgb555(SwsContext *c, uint8_t **in, int *instrides,
outstrides, ff_bfin_yuv2rgb555_line, 1, 555); outstrides, ff_bfin_yuv2rgb555_line, 1, 555);
} }
static int bfin_yuv420_bgr555(SwsContext *c, uint8_t **in, int *instrides, static int bfin_yuv420_bgr555(SwsContext *c, const uint8_t **in, int *instrides,
int srcSliceY, int srcSliceH, int srcSliceY, int srcSliceH,
uint8_t **oplanes, int *outstrides) uint8_t **oplanes, int *outstrides)
{ {
@@ -131,7 +135,7 @@ static int bfin_yuv420_bgr555(SwsContext *c, uint8_t **in, int *instrides,
outstrides, ff_bfin_yuv2rgb555_line, 0, 555); outstrides, ff_bfin_yuv2rgb555_line, 0, 555);
} }
static int bfin_yuv420_rgb24(SwsContext *c, uint8_t **in, int *instrides, static int bfin_yuv420_rgb24(SwsContext *c, const uint8_t **in, int *instrides,
int srcSliceY, int srcSliceH, int srcSliceY, int srcSliceH,
uint8_t **oplanes, int *outstrides) uint8_t **oplanes, int *outstrides)
{ {
@@ -139,7 +143,7 @@ static int bfin_yuv420_rgb24(SwsContext *c, uint8_t **in, int *instrides,
outstrides, ff_bfin_yuv2rgb24_line, 1, 888); outstrides, ff_bfin_yuv2rgb24_line, 1, 888);
} }
static int bfin_yuv420_bgr24(SwsContext *c, uint8_t **in, int *instrides, static int bfin_yuv420_bgr24(SwsContext *c, const uint8_t **in, int *instrides,
int srcSliceY, int srcSliceH, int srcSliceY, int srcSliceH,
uint8_t **oplanes, int *outstrides) uint8_t **oplanes, int *outstrides)
{ {
@@ -147,7 +151,7 @@ static int bfin_yuv420_bgr24(SwsContext *c, uint8_t **in, int *instrides,
outstrides, ff_bfin_yuv2rgb24_line, 0, 888); outstrides, ff_bfin_yuv2rgb24_line, 0, 888);
} }
static int bfin_yuv420_rgb565(SwsContext *c, uint8_t **in, int *instrides, static int bfin_yuv420_rgb565(SwsContext *c, const uint8_t **in, int *instrides,
int srcSliceY, int srcSliceH, int srcSliceY, int srcSliceH,
uint8_t **oplanes, int *outstrides) uint8_t **oplanes, int *outstrides)
{ {
@@ -155,7 +159,7 @@ static int bfin_yuv420_rgb565(SwsContext *c, uint8_t **in, int *instrides,
outstrides, ff_bfin_yuv2rgb565_line, 1, 565); outstrides, ff_bfin_yuv2rgb565_line, 1, 565);
} }
static int bfin_yuv420_bgr565(SwsContext *c, uint8_t **in, int *instrides, static int bfin_yuv420_bgr565(SwsContext *c, const uint8_t **in, int *instrides,
int srcSliceY, int srcSliceH, int srcSliceY, int srcSliceH,
uint8_t **oplanes, int *outstrides) uint8_t **oplanes, int *outstrides)
{ {