Showing the changes to libswscale (2 of 2 files). Show all
Unified · Split
| @@ -39,14 +39,14 @@ int ff_bfin_yuyvtoyv12(const uint8_t *src, uint8_t *ydst, uint8_t *udst, · 38 unmodified lines | |||
| 39 | uint8_t *vdst, int width, int height, | 39 | uint8_t *vdst, int width, int height, |
| 40 | int lumStride, int chromStride, int srcStride) L1CODE; | 40 | int lumStride, int chromStride, int srcStride) L1CODE; |
| 41 | 41 | ||
| 42 | static int uyvytoyv12_unscaled(SwsContext *c, uint8_t *src[], int srcStride[], | 42 | static int uyvytoyv12_unscaled(SwsContext *c, const uint8_t *src[], |
| 43 | int srcSliceY, int srcSliceH, uint8_t *dst[], | 43 | int srcStride[], int srcSliceY, int srcSliceH, |
| 44 | int dstStride[]) | 44 | uint8_t *dst[], int dstStride[]) |
| 45 | { | 45 | { |
| 46 | uint8_t *dsty = dst[0] + dstStride[0] * srcSliceY; | 46 | uint8_t *dsty = dst[0] + dstStride[0] * srcSliceY; |
| 47 | uint8_t *dstu = dst[1] + dstStride[1] * srcSliceY / 2; | 47 | uint8_t *dstu = dst[1] + dstStride[1] * srcSliceY / 2; |
| 48 | uint8_t *dstv = dst[2] + dstStride[2] * srcSliceY / 2; | 48 | uint8_t *dstv = dst[2] + dstStride[2] * srcSliceY / 2; |
| 49 | uint8_t *ip = src[0] + srcStride[0] * srcSliceY; | 49 | const uint8_t *ip = src[0] + srcStride[0] * srcSliceY; |
| 50 | int w = dstStride[0]; | 50 | int w = dstStride[0]; |
| 51 | 51 | ||
| 52 | ff_bfin_uyvytoyv12(ip, dsty, dstu, dstv, w, srcSliceH, | 52 | ff_bfin_uyvytoyv12(ip, dsty, dstu, dstv, w, srcSliceH, |
| @@ -55,14 +55,14 @@ static int uyvytoyv12_unscaled(SwsContext *c, uint8_t *src[], int srcStride[], · 2 unmodified lines | |||
| 55 | return srcSliceH; | 55 | return srcSliceH; |
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | static int yuyvtoyv12_unscaled(SwsContext *c, uint8_t *src[], int srcStride[], | 58 | static int yuyvtoyv12_unscaled(SwsContext *c, const uint8_t *src[], |
| 59 | int srcSliceY, int srcSliceH, uint8_t *dst[], | 59 | int srcStride[], int srcSliceY, int srcSliceH, |
| 60 | int dstStride[]) | 60 | uint8_t *dst[], int dstStride[]) |
| 61 | { | 61 | { |
| 62 | uint8_t *dsty = dst[0] + dstStride[0] * srcSliceY; | 62 | uint8_t *dsty = dst[0] + dstStride[0] * srcSliceY; |
| 63 | uint8_t *dstu = dst[1] + dstStride[1] * srcSliceY / 2; | 63 | uint8_t *dstu = dst[1] + dstStride[1] * srcSliceY / 2; |
| 64 | uint8_t *dstv = dst[2] + dstStride[2] * srcSliceY / 2; | 64 | uint8_t *dstv = dst[2] + dstStride[2] * srcSliceY / 2; |
| 65 | uint8_t *ip = src[0] + srcStride[0] * srcSliceY; | 65 | const uint8_t *ip = src[0] + srcStride[0] * srcSliceY; |
| 66 | int w = dstStride[0]; | 66 | int w = dstStride[0]; |
| 67 | 67 | ||
| 68 | ff_bfin_yuyvtoyv12(ip, dsty, dstu, dstv, w, srcSliceH, | 68 | ff_bfin_yuyvtoyv12(ip, dsty, dstu, dstv, w, srcSliceH, |
| @@ -32,17 +32,20 @@ · 31 unmodified lines | |||
| 32 | #define L1CODE | 32 | #define L1CODE |
| 33 | #endif | 33 | #endif |
| 34 | 34 | ||
| 35 | void ff_bfin_yuv2rgb555_line(uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out, | 35 | void ff_bfin_yuv2rgb555_line(const uint8_t *Y, const uint8_t *U, |
| 36 | const uint8_t *V, uint8_t *out, | ||
| 36 | int w, uint32_t *coeffs) L1CODE; | 37 | int w, uint32_t *coeffs) L1CODE; |
| 37 | 38 | ||
| 38 | void ff_bfin_yuv2rgb565_line(uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out, | 39 | void ff_bfin_yuv2rgb565_line(const uint8_t *Y, const uint8_t *U, |
| 40 | const uint8_t *V, uint8_t *out, | ||
| 39 | int w, uint32_t *coeffs) L1CODE; | 41 | int w, uint32_t *coeffs) L1CODE; |
| 40 | 42 | ||
| 41 | void ff_bfin_yuv2rgb24_line(uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out, | 43 | void ff_bfin_yuv2rgb24_line(const uint8_t *Y, const uint8_t *U, |
| 44 | const uint8_t *V, uint8_t *out, | ||
| 42 | int w, uint32_t *coeffs) L1CODE; | 45 | int w, uint32_t *coeffs) L1CODE; |
| 43 | 46 | ||
| 44 | typedef void (*ltransform)(uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out, | 47 | typedef void (*ltransform)(const uint8_t *Y, const uint8_t *U, const uint8_t *V, |
| 45 | int w, uint32_t *coeffs); | 48 | uint8_t *out, int w, uint32_t *coeffs); |
| 46 | 49 | ||
| 47 | static void bfin_prepare_coefficients(SwsContext *c, int rgb, int masks) | 50 | static void bfin_prepare_coefficients(SwsContext *c, int rgb, int masks) |
| 48 | { | 51 | { |
| @@ -80,12 +83,13 @@ static void bfin_prepare_coefficients(SwsContext *c, int rgb, int masks) · 31 unmodified lines | |||
| 80 | } | 83 | } |
| 81 | } | 84 | } |
| 82 | 85 | ||
| 83 | static int core_yuv420_rgb(SwsContext *c, uint8_t **in, int *instrides, | 86 | static int core_yuv420_rgb(SwsContext *c, const uint8_t **in, int *instrides, |
| 84 | int srcSliceY, int srcSliceH, uint8_t **oplanes, | 87 | int srcSliceY, int srcSliceH, uint8_t **oplanes, |
| 85 | int *outstrides, ltransform lcscf, | 88 | int *outstrides, ltransform lcscf, |
| 86 | int rgb, int masks) | 89 | int rgb, int masks) |
| 87 | { | 90 | { |
| 88 | uint8_t *py, *pu, *pv, *op; | 91 | const uint8_t *py, *pu, *pv; |
| 92 | uint8_t *op; | ||
| 89 | int w = instrides[0]; | 93 | int w = instrides[0]; |
| 90 | int h2 = srcSliceH >> 1; | 94 | int h2 = srcSliceH >> 1; |
| 91 | int i; | 95 | int i; |
| @@ -115,7 +119,7 @@ static int core_yuv420_rgb(SwsContext *c, uint8_t **in, int *instrides, · 23 unmodified lines | |||
| 115 | return srcSliceH; | 119 | return srcSliceH; |
| 116 | } | 120 | } |
| 117 | 121 | ||
| 118 | static int bfin_yuv420_rgb555(SwsContext *c, uint8_t **in, int *instrides, | 122 | static int bfin_yuv420_rgb555(SwsContext *c, const uint8_t **in, int *instrides, |
| 119 | int srcSliceY, int srcSliceH, | 123 | int srcSliceY, int srcSliceH, |
| 120 | uint8_t **oplanes, int *outstrides) | 124 | uint8_t **oplanes, int *outstrides) |
| 121 | { | 125 | { |
| @@ -123,7 +127,7 @@ static int bfin_yuv420_rgb555(SwsContext *c, uint8_t **in, int *instrides, · 1 unmodified line | |||
| 123 | outstrides, ff_bfin_yuv2rgb555_line, 1, 555); | 127 | outstrides, ff_bfin_yuv2rgb555_line, 1, 555); |
| 124 | } | 128 | } |
| 125 | 129 | ||
| 126 | static int bfin_yuv420_bgr555(SwsContext *c, uint8_t **in, int *instrides, | 130 | static int bfin_yuv420_bgr555(SwsContext *c, const uint8_t **in, int *instrides, |
| 127 | int srcSliceY, int srcSliceH, | 131 | int srcSliceY, int srcSliceH, |
| 128 | uint8_t **oplanes, int *outstrides) | 132 | uint8_t **oplanes, int *outstrides) |
| 129 | { | 133 | { |
| @@ -131,7 +135,7 @@ static int bfin_yuv420_bgr555(SwsContext *c, uint8_t **in, int *instrides, · 1 unmodified line | |||
| 131 | outstrides, ff_bfin_yuv2rgb555_line, 0, 555); | 135 | outstrides, ff_bfin_yuv2rgb555_line, 0, 555); |
| 132 | } | 136 | } |
| 133 | 137 | ||
| 134 | static int bfin_yuv420_rgb24(SwsContext *c, uint8_t **in, int *instrides, | 138 | static int bfin_yuv420_rgb24(SwsContext *c, const uint8_t **in, int *instrides, |
| 135 | int srcSliceY, int srcSliceH, | 139 | int srcSliceY, int srcSliceH, |
| 136 | uint8_t **oplanes, int *outstrides) | 140 | uint8_t **oplanes, int *outstrides) |
| 137 | { | 141 | { |
| @@ -139,7 +143,7 @@ static int bfin_yuv420_rgb24(SwsContext *c, uint8_t **in, int *instrides, · 1 unmodified line | |||
| 139 | outstrides, ff_bfin_yuv2rgb24_line, 1, 888); | 143 | outstrides, ff_bfin_yuv2rgb24_line, 1, 888); |
| 140 | } | 144 | } |
| 141 | 145 | ||
| 142 | static int bfin_yuv420_bgr24(SwsContext *c, uint8_t **in, int *instrides, | 146 | static int bfin_yuv420_bgr24(SwsContext *c, const uint8_t **in, int *instrides, |
| 143 | int srcSliceY, int srcSliceH, | 147 | int srcSliceY, int srcSliceH, |
| 144 | uint8_t **oplanes, int *outstrides) | 148 | uint8_t **oplanes, int *outstrides) |
| 145 | { | 149 | { |
| @@ -147,7 +151,7 @@ static int bfin_yuv420_bgr24(SwsContext *c, uint8_t **in, int *instrides, · 1 unmodified line | |||
| 147 | outstrides, ff_bfin_yuv2rgb24_line, 0, 888); | 151 | outstrides, ff_bfin_yuv2rgb24_line, 0, 888); |
| 148 | } | 152 | } |
| 149 | 153 | ||
| 150 | static int bfin_yuv420_rgb565(SwsContext *c, uint8_t **in, int *instrides, | 154 | static int bfin_yuv420_rgb565(SwsContext *c, const uint8_t **in, int *instrides, |
| 151 | int srcSliceY, int srcSliceH, | 155 | int srcSliceY, int srcSliceH, |
| 152 | uint8_t **oplanes, int *outstrides) | 156 | uint8_t **oplanes, int *outstrides) |
| 153 | { | 157 | { |
| @@ -155,7 +159,7 @@ static int bfin_yuv420_rgb565(SwsContext *c, uint8_t **in, int *instrides, · 1 unmodified line | |||
| 155 | outstrides, ff_bfin_yuv2rgb565_line, 1, 565); | 159 | outstrides, ff_bfin_yuv2rgb565_line, 1, 565); |
| 156 | } | 160 | } |
| 157 | 161 | ||
| 158 | static int bfin_yuv420_bgr565(SwsContext *c, uint8_t **in, int *instrides, | 162 | static int bfin_yuv420_bgr565(SwsContext *c, const uint8_t **in, int *instrides, |
| 159 | int srcSliceY, int srcSliceH, | 163 | int srcSliceY, int srcSliceH, |
| 160 | uint8_t **oplanes, int *outstrides) | 164 | uint8_t **oplanes, int *outstrides) |
| 161 | { | 165 | { |