diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-07 13:21:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-07 13:22:04 +0200 |
| commit | b28d5c49f7e5586a212bfffdd2baa752e64d839d (patch) | |
| tree | cbe24bca8797137a5e7fbfba33542d274fcc5690 /libswscale | |
| parent | 9253cc496a50e82e56dff5c7d0e15c95f7d50ce2 (diff) | |
| parent | 2293ec6ab300cd58fc057344610a3ad65d2268b8 (diff) | |
| download | ffmpeg-b28d5c49f7e5586a212bfffdd2baa752e64d839d.tar.gz | |
Merge remote-tracking branch 'rbultje/vp9-profile23-wip'
* rbultje/vp9-profile23-wip:
libvpxdec: add 440 pixfmts.
vp9: add profile 2/3 fate tests.
vp9: add inter-frame profile 2/3 suport.
vp9: add keyframe profile 2/3 support.
vp9: parse profile 2/3 bitdepth in frame header.
vp9: add profile 2/3 to exported profiles.
fate: add/update reference files for 440 addition.
swscale: add yuv440p10/12 pixfmts.
lavc: add yuv440p10/12 formats to aligned pixfmt list.
lavu: add yuv440p10/12 pixfmts.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/input.c | 8 | ||||
| -rw-r--r-- | libswscale/swscale_unscaled.c | 2 | ||||
| -rw-r--r-- | libswscale/utils.c | 4 |
3 files changed, 14 insertions, 0 deletions
diff --git a/libswscale/input.c b/libswscale/input.c index 7b3b7060e6..1f04fc2752 100644 --- a/libswscale/input.c +++ b/libswscale/input.c @@ -931,9 +931,11 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_YUV422P9LE: case AV_PIX_FMT_YUV420P9LE: case AV_PIX_FMT_YUV422P10LE: + case AV_PIX_FMT_YUV440P10LE: case AV_PIX_FMT_YUV444P10LE: case AV_PIX_FMT_YUV420P10LE: case AV_PIX_FMT_YUV422P12LE: + case AV_PIX_FMT_YUV440P12LE: case AV_PIX_FMT_YUV444P12LE: case AV_PIX_FMT_YUV420P12LE: case AV_PIX_FMT_YUV422P14LE: @@ -958,9 +960,11 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_YUV444P9BE: case AV_PIX_FMT_YUV422P9BE: case AV_PIX_FMT_YUV420P9BE: + case AV_PIX_FMT_YUV440P10BE: case AV_PIX_FMT_YUV444P10BE: case AV_PIX_FMT_YUV422P10BE: case AV_PIX_FMT_YUV420P10BE: + case AV_PIX_FMT_YUV440P12BE: case AV_PIX_FMT_YUV444P12BE: case AV_PIX_FMT_YUV422P12BE: case AV_PIX_FMT_YUV420P12BE: @@ -1197,9 +1201,11 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_YUV422P9LE: case AV_PIX_FMT_YUV420P9LE: case AV_PIX_FMT_YUV444P10LE: + case AV_PIX_FMT_YUV440P10LE: case AV_PIX_FMT_YUV422P10LE: case AV_PIX_FMT_YUV420P10LE: case AV_PIX_FMT_YUV444P12LE: + case AV_PIX_FMT_YUV440P12LE: case AV_PIX_FMT_YUV422P12LE: case AV_PIX_FMT_YUV420P12LE: case AV_PIX_FMT_YUV444P14LE: @@ -1229,9 +1235,11 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_YUV422P9BE: case AV_PIX_FMT_YUV420P9BE: case AV_PIX_FMT_YUV444P10BE: + case AV_PIX_FMT_YUV440P10BE: case AV_PIX_FMT_YUV422P10BE: case AV_PIX_FMT_YUV420P10BE: case AV_PIX_FMT_YUV444P12BE: + case AV_PIX_FMT_YUV440P12BE: case AV_PIX_FMT_YUV422P12BE: case AV_PIX_FMT_YUV420P12BE: case AV_PIX_FMT_YUV444P14BE: diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index 490290f795..b426fa188b 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -1694,6 +1694,8 @@ void ff_get_unscaled_swscale(SwsContext *c) IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_YUV422P12) || IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_YUV422P14) || IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_YUV422P16) || + IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_YUV440P10) || + IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_YUV440P12) || IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_YUV444P9) || IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_YUV444P10) || IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_YUV444P12) || diff --git a/libswscale/utils.c b/libswscale/utils.c index 45e4b7cc8e..f9f4ec6cb7 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -119,6 +119,10 @@ static const FormatEntry format_entries[AV_PIX_FMT_NB] = { [AV_PIX_FMT_GRAY16LE] = { 1, 1 }, [AV_PIX_FMT_YUV440P] = { 1, 1 }, [AV_PIX_FMT_YUVJ440P] = { 1, 1 }, + [AV_PIX_FMT_YUV440P10LE] = { 1, 1 }, + [AV_PIX_FMT_YUV440P10BE] = { 1, 1 }, + [AV_PIX_FMT_YUV440P12LE] = { 1, 1 }, + [AV_PIX_FMT_YUV440P12BE] = { 1, 1 }, [AV_PIX_FMT_YUVA420P] = { 1, 1 }, [AV_PIX_FMT_YUVA422P] = { 1, 1 }, [AV_PIX_FMT_YUVA444P] = { 1, 1 }, |