Unified · Split
| @@ -221,6 +221,48 @@ static int nv24ToPlanarWrapper(SwsContext *c, const uint8_t *src[], · 220 unmodified lines | |||
| 221 | return srcSliceH; | 221 | return srcSliceH; |
| 222 | } | 222 | } |
| 223 | 223 | ||
| 224 | static void nv24_to_yuv420p_chroma(uint8_t *dst1, int dstStride1, | ||
| 225 | uint8_t *dst2, int dstStride2, | ||
| 226 | const uint8_t *src, int srcStride, | ||
| 227 | int w, int h) | ||
| 228 | { | ||
| 229 | const uint8_t *src1 = src; | ||
| 230 | const uint8_t *src2 = src + srcStride; | ||
| 231 | // average 4 pixels into 1 (interleaved U and V) | ||
| 232 | for (int y = 0; y < h; y += 2) { | ||
| 233 | for (int x = 0; x < w; x++) { | ||
| 234 | dst1[x] = (src1[4 * x + 0] + src1[4 * x + 2] + | ||
| 235 | src2[4 * x + 0] + src2[4 * x + 2]) >> 2; | ||
| 236 | dst2[x] = (src1[4 * x + 1] + src1[4 * x + 3] + | ||
| 237 | src2[4 * x + 1] + src2[4 * x + 3]) >> 2; | ||
| 238 | } | ||
| 239 | src1 += srcStride * 2; | ||
| 240 | src2 += srcStride * 2; | ||
| 241 | dst1 += dstStride1; | ||
| 242 | dst2 += dstStride2; | ||
| 243 | } | ||
| 244 | } | ||
| 245 | |||
| 246 | static int nv24ToYuv420Wrapper(SwsContext *c, const uint8_t *src[], | ||
| 247 | int srcStride[], int srcSliceY, int srcSliceH, | ||
| 248 | uint8_t *dstParam[], int dstStride[]) | ||
| 249 | { | ||
| 250 | uint8_t *dst1 = dstParam[1] + dstStride[1] * srcSliceY / 2; | ||
| 251 | uint8_t *dst2 = dstParam[2] + dstStride[2] * srcSliceY / 2; | ||
| 252 | |||
| 253 | copyPlane(src[0], srcStride[0], srcSliceY, srcSliceH, c->srcW, | ||
| 254 | dstParam[0], dstStride[0]); | ||
| 255 | |||
| 256 | if (c->srcFormat == AV_PIX_FMT_NV24) | ||
| 257 | nv24_to_yuv420p_chroma(dst1, dstStride[1], dst2, dstStride[2], | ||
| 258 | src[1], srcStride[1], c->srcW / 2, srcSliceH); | ||
| 259 | else | ||
| 260 | nv24_to_yuv420p_chroma(dst2, dstStride[2], dst1, dstStride[1], | ||
| 261 | src[1], srcStride[1], c->srcW / 2, srcSliceH); | ||
| 262 | |||
| 263 | return srcSliceH; | ||
| 264 | } | ||
| 265 | |||
| 224 | static int planarToP01xWrapper(SwsContext *c, const uint8_t *src8[], | 266 | static int planarToP01xWrapper(SwsContext *c, const uint8_t *src8[], |
| 225 | int srcStride[], int srcSliceY, | 267 | int srcStride[], int srcSliceY, |
| 226 | int srcSliceH, uint8_t *dstParam8[], | 268 | int srcSliceH, uint8_t *dstParam8[], |
| @@ -2206,6 +2248,9 @@ void ff_get_unscaled_swscale(SwsContext *c) · 1979 unmodified lines | |||
| 2206 | c->convert_unscaled = yuyvToYuv422Wrapper; | 2248 | c->convert_unscaled = yuyvToYuv422Wrapper; |
| 2207 | if (srcFormat == AV_PIX_FMT_UYVY422 && dstFormat == AV_PIX_FMT_YUV422P) | 2249 | if (srcFormat == AV_PIX_FMT_UYVY422 && dstFormat == AV_PIX_FMT_YUV422P) |
| 2208 | c->convert_unscaled = uyvyToYuv422Wrapper; | 2250 | c->convert_unscaled = uyvyToYuv422Wrapper; |
| 2251 | if (dstFormat == AV_PIX_FMT_YUV420P && | ||
| 2252 | (srcFormat == AV_PIX_FMT_NV24 || srcFormat == AV_PIX_FMT_NV42)) | ||
| 2253 | c->convert_unscaled = nv24ToYuv420Wrapper; | ||
| 2209 | 2254 | ||
| 2210 | #define isPlanarGray(x) (isGray(x) && (x) != AV_PIX_FMT_YA8 && (x) != AV_PIX_FMT_YA16LE && (x) != AV_PIX_FMT_YA16BE) | 2255 | #define isPlanarGray(x) (isGray(x) && (x) != AV_PIX_FMT_YA8 && (x) != AV_PIX_FMT_YA16LE && (x) != AV_PIX_FMT_YA16BE) |
| 2211 | /* simple copy */ | 2256 | /* simple copy */ |