diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-09 05:20:52 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-09 05:36:38 +0400 |
commit | ed962414bd66027ce67ded912c17e08970163f52 (patch) | |
tree | 27a07264d5e7d5194c9a2df07882b8cdb75790a3 /libswscale/input.c | |
parent | 0a1cc04e6c09295cf06a1ca96d9a5a6e8bd85acb (diff) | |
parent | 92b099daf4b8ef93513e38b43899cb8458a2fde3 (diff) |
Merge commit '92b099daf4b8ef93513e38b43899cb8458a2fde3'
* commit '92b099daf4b8ef93513e38b43899cb8458a2fde3':
swscale: support converting YVYU422 pixel format
Conflicts:
libswscale/input.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/input.c')
-rw-r--r-- | libswscale/input.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/libswscale/input.c b/libswscale/input.c index 1539bd9307..62a24959a1 100644 --- a/libswscale/input.c +++ b/libswscale/input.c @@ -531,7 +531,18 @@ static void yuy2ToUV_c(uint8_t *dstU, uint8_t *dstV, const uint8_t *unused0, con av_assert1(src1 == src2); } -static void bswap16Y_c(uint8_t *_dst, const uint8_t *_src, const uint8_t *unused1, const uint8_t *unused2, int width, +static void yvy2ToUV_c(uint8_t *dstU, uint8_t *dstV, const uint8_t *unused0, const uint8_t *src1, + const uint8_t *src2, int width, uint32_t *unused) +{ + int i; + for (i = 0; i < width; i++) { + dstV[i] = src1[4 * i + 1]; + dstU[i] = src1[4 * i + 3]; + } + assert(src1 == src2); +} + +static void bswap16Y_c(uint8_t *_dst, const uint8_t *_src, const uint8_t *unused1, const uint8_t *unused2, int width, uint32_t *unused) { int i; @@ -818,6 +829,9 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_YUYV422: c->chrToYV12 = yuy2ToUV_c; break; + case AV_PIX_FMT_YVYU422: + c->chrToYV12 = yvy2ToUV_c; + break; case AV_PIX_FMT_UYVY422: c->chrToYV12 = uyvyToUV_c; break; @@ -1202,6 +1216,7 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) break; #endif case AV_PIX_FMT_YUYV422: + case AV_PIX_FMT_YVYU422: case AV_PIX_FMT_Y400A: c->lumToYV12 = yuy2ToY_c; break; |