diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2016-11-17 13:08:27 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2016-11-20 22:23:01 +0100 |
| commit | 322568c079d6253e46e6730244162fd6aad455c6 (patch) | |
| tree | a9f75ef826f5295463f7bd1ece6745d502a71b02 /libavcodec | |
| parent | 1c7da19a4b45f5623cb3955b29b9a581026e3c61 (diff) | |
| download | ffmpeg-322568c079d6253e46e6730244162fd6aad455c6.tar.gz | |
lavc/ffv1: Support YUV4xxP12 and GRAY12.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/ffv1dec.c | 7 | ||||
| -rw-r--r-- | libavcodec/ffv1enc.c | 11 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
3 files changed, 17 insertions, 3 deletions
diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index 358da1701f..31433e3782 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -636,6 +636,13 @@ static int read_header(FFV1Context *f) case 0x10: f->avctx->pix_fmt = AV_PIX_FMT_YUVA422P10; break; case 0x11: f->avctx->pix_fmt = AV_PIX_FMT_YUVA420P10; break; } + } else if (f->avctx->bits_per_raw_sample == 12 && !f->transparency) { + f->packed_at_lsb = 1; + switch(16 * f->chroma_h_shift + f->chroma_v_shift) { + case 0x00: f->avctx->pix_fmt = AV_PIX_FMT_YUV444P12; break; + case 0x10: f->avctx->pix_fmt = AV_PIX_FMT_YUV422P12; break; + case 0x11: f->avctx->pix_fmt = AV_PIX_FMT_YUV420P12; break; + } } else if (f->avctx->bits_per_raw_sample == 16 && !f->transparency){ f->packed_at_lsb = 1; switch(16 * f->chroma_h_shift + f->chroma_v_shift) { diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index c56623be53..d2f082751e 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -580,9 +580,15 @@ FF_ENABLE_DEPRECATION_WARNINGS case AV_PIX_FMT_YUVA444P10: case AV_PIX_FMT_YUVA422P10: case AV_PIX_FMT_YUVA420P10: - s->packed_at_lsb = 1; if (!avctx->bits_per_raw_sample && !s->bits_per_raw_sample) s->bits_per_raw_sample = 10; + case AV_PIX_FMT_GRAY12: + case AV_PIX_FMT_YUV444P12: + case AV_PIX_FMT_YUV420P12: + case AV_PIX_FMT_YUV422P12: + s->packed_at_lsb = 1; + if (!avctx->bits_per_raw_sample && !s->bits_per_raw_sample) + s->bits_per_raw_sample = 12; case AV_PIX_FMT_GRAY16: case AV_PIX_FMT_YUV444P16: case AV_PIX_FMT_YUV422P16: @@ -1293,13 +1299,14 @@ AVCodec ff_ffv1_encoder = { AV_PIX_FMT_YUV410P, AV_PIX_FMT_0RGB32, AV_PIX_FMT_RGB32, AV_PIX_FMT_YUV420P16, AV_PIX_FMT_YUV422P16, AV_PIX_FMT_YUV444P16, AV_PIX_FMT_YUV444P9, AV_PIX_FMT_YUV422P9, AV_PIX_FMT_YUV420P9, AV_PIX_FMT_YUV420P10, AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV444P10, + AV_PIX_FMT_YUV420P12, AV_PIX_FMT_YUV422P12, AV_PIX_FMT_YUV444P12, AV_PIX_FMT_YUVA444P16, AV_PIX_FMT_YUVA422P16, AV_PIX_FMT_YUVA420P16, AV_PIX_FMT_YUVA444P10, AV_PIX_FMT_YUVA422P10, AV_PIX_FMT_YUVA420P10, AV_PIX_FMT_YUVA444P9, AV_PIX_FMT_YUVA422P9, AV_PIX_FMT_YUVA420P9, AV_PIX_FMT_GRAY16, AV_PIX_FMT_GRAY8, AV_PIX_FMT_GBRP9, AV_PIX_FMT_GBRP10, AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRP14, AV_PIX_FMT_YA8, - AV_PIX_FMT_GRAY10, + AV_PIX_FMT_GRAY10, AV_PIX_FMT_GRAY12, AV_PIX_FMT_GBRP16, AV_PIX_FMT_RGB48, AV_PIX_FMT_NONE diff --git a/libavcodec/version.h b/libavcodec/version.h index d7819e403c..fd5f866069 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 57 #define LIBAVCODEC_VERSION_MINOR 66 -#define LIBAVCODEC_VERSION_MICRO 105 +#define LIBAVCODEC_VERSION_MICRO 106 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |