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 | |
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')
-rw-r--r-- | libswscale/input.c | 17 | ||||
-rw-r--r-- | libswscale/output.c | 13 | ||||
-rw-r--r-- | libswscale/swscale_internal.h | 1 | ||||
-rw-r--r-- | libswscale/utils.c | 1 |
4 files changed, 30 insertions, 2 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; diff --git a/libswscale/output.c b/libswscale/output.c index 4083c73116..eee6b4874b 100644 --- a/libswscale/output.c +++ b/libswscale/output.c @@ -526,7 +526,12 @@ YUV2PACKEDWRAPPER(yuv2mono,, black, AV_PIX_FMT_MONOBLACK) dest[pos + 1] = U; \ dest[pos + 2] = Y2; \ dest[pos + 3] = V; \ - } else { \ + } else if (target == AV_PIX_FMT_YVYU422) { \ + dest[pos + 0] = Y1; \ + dest[pos + 1] = V; \ + dest[pos + 2] = Y2; \ + dest[pos + 3] = U; \ + } else { /* AV_PIX_FMT_UYVY422 */ \ dest[pos + 0] = U; \ dest[pos + 1] = Y1; \ dest[pos + 2] = V; \ @@ -661,6 +666,7 @@ yuv2422_1_c_template(SwsContext *c, const int16_t *buf0, #undef output_pixels YUV2PACKEDWRAPPER(yuv2, 422, yuyv422, AV_PIX_FMT_YUYV422) +YUV2PACKEDWRAPPER(yuv2, 422, yvyu422, AV_PIX_FMT_YVYU422) YUV2PACKEDWRAPPER(yuv2, 422, uyvy422, AV_PIX_FMT_UYVY422) #define R_B ((target == AV_PIX_FMT_RGB48LE || target == AV_PIX_FMT_RGB48BE || target == AV_PIX_FMT_RGBA64LE || target == AV_PIX_FMT_RGBA64BE) ? R : B) @@ -2205,6 +2211,11 @@ av_cold void ff_sws_init_output_funcs(SwsContext *c, *yuv2packed2 = yuv2yuyv422_2_c; *yuv2packedX = yuv2yuyv422_X_c; break; + case AV_PIX_FMT_YVYU422: + *yuv2packed1 = yuv2yvyu422_1_c; + *yuv2packed2 = yuv2yvyu422_2_c; + *yuv2packedX = yuv2yvyu422_X_c; + break; case AV_PIX_FMT_UYVY422: *yuv2packed1 = yuv2uyvy422_1_c; *yuv2packed2 = yuv2uyvy422_2_c; diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 921b892a8a..0b3e687294 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -783,6 +783,7 @@ static av_always_inline int isALPHA(enum AVPixelFormat pix_fmt) #define isPacked(x) ( \ (x)==AV_PIX_FMT_PAL8 \ || (x)==AV_PIX_FMT_YUYV422 \ + || (x)==AV_PIX_FMT_YVYU422 \ || (x)==AV_PIX_FMT_UYVY422 \ || (x)==AV_PIX_FMT_Y400A \ || isRGBinInt(x) \ diff --git a/libswscale/utils.c b/libswscale/utils.c index 7680dbfa49..b3e117f70e 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -97,6 +97,7 @@ static const FormatEntry format_entries[AV_PIX_FMT_NB] = { [AV_PIX_FMT_YUVJ411P] = { 1, 1 }, [AV_PIX_FMT_YUVJ422P] = { 1, 1 }, [AV_PIX_FMT_YUVJ444P] = { 1, 1 }, + [AV_PIX_FMT_YVYU422] = { 1, 1 }, [AV_PIX_FMT_UYVY422] = { 1, 1 }, [AV_PIX_FMT_UYYVYY411] = { 0, 0 }, [AV_PIX_FMT_BGR8] = { 1, 1 }, |