diff options
| -rw-r--r-- | libswscale/bfin/swscale_bfin.c | 16 | ||||
| -rw-r--r-- | libswscale/bfin/yuv2rgb_bfin.c | 30 |
2 files changed, 25 insertions, 21 deletions
diff --git a/libswscale/bfin/swscale_bfin.c b/libswscale/bfin/swscale_bfin.c index 7a85296c75..f2fe871fc8 100644 --- a/libswscale/bfin/swscale_bfin.c +++ b/libswscale/bfin/swscale_bfin.c @@ -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, int lumStride, int chromStride, int srcStride) L1CODE; -static int uyvytoyv12_unscaled(SwsContext *c, uint8_t *src[], int srcStride[], - int srcSliceY, int srcSliceH, uint8_t *dst[], - int dstStride[]) +static int uyvytoyv12_unscaled(SwsContext *c, const uint8_t *src[], + int srcStride[], int srcSliceY, int srcSliceH, + uint8_t *dst[], int dstStride[]) { uint8_t *dsty = dst[0] + dstStride[0] * srcSliceY; uint8_t *dstu = dst[1] + dstStride[1] * 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]; 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; } -static int yuyvtoyv12_unscaled(SwsContext *c, uint8_t *src[], int srcStride[], - int srcSliceY, int srcSliceH, uint8_t *dst[], - int dstStride[]) +static int yuyvtoyv12_unscaled(SwsContext *c, const uint8_t *src[], + int srcStride[], int srcSliceY, int srcSliceH, + uint8_t *dst[], int dstStride[]) { uint8_t *dsty = dst[0] + dstStride[0] * srcSliceY; uint8_t *dstu = dst[1] + dstStride[1] * 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]; ff_bfin_yuyvtoyv12(ip, dsty, dstu, dstv, w, srcSliceH, diff --git a/libswscale/bfin/yuv2rgb_bfin.c b/libswscale/bfin/yuv2rgb_bfin.c index 258bf8e9ac..4078a18660 100644 --- a/libswscale/bfin/yuv2rgb_bfin.c +++ b/libswscale/bfin/yuv2rgb_bfin.c @@ -32,17 +32,20 @@ #define L1CODE #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; -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; -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; -typedef void (*ltransform)(uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out, - int w, uint32_t *coeffs); +typedef void (*ltransform)(const uint8_t *Y, const uint8_t *U, const uint8_t *V, + uint8_t *out, int w, uint32_t *coeffs); 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 *outstrides, ltransform lcscf, int rgb, int masks) { - uint8_t *py, *pu, *pv, *op; + const uint8_t *py, *pu, *pv; + uint8_t *op; int w = instrides[0]; int h2 = srcSliceH >> 1; int i; @@ -115,7 +119,7 @@ static int core_yuv420_rgb(SwsContext *c, uint8_t **in, int *instrides, 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, 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); } -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, 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); } -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, 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); } -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, 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); } -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, 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); } -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, uint8_t **oplanes, int *outstrides) { |