diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-27 02:05:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-27 02:11:29 +0100 |
| commit | 6369766f015f930ea0fc86a2d425fe7fc4f95ed9 (patch) | |
| tree | 0f35c3fbd1a96126ada4bbb680e033d46e10beb8 | |
| parent | 7cf8918b0df7924ed3f901f03cc1c06eef43c329 (diff) | |
avcodec/huffyuv: support gbrp9/10/12/14
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/huffyuvdec.c | 15 | ||||
| -rw-r--r-- | libavcodec/huffyuvenc.c | 8 |
2 files changed, 22 insertions, 1 deletions
diff --git a/libavcodec/huffyuvdec.c b/libavcodec/huffyuvdec.c index 47c6a137a2..7a1579f681 100644 --- a/libavcodec/huffyuvdec.c +++ b/libavcodec/huffyuvdec.c @@ -389,6 +389,21 @@ static av_cold int decode_init(AVCodecContext *avctx) case 0x470: avctx->pix_fmt = AV_PIX_FMT_GBRP; break; + case 0x480: + avctx->pix_fmt = AV_PIX_FMT_GBRP9; + break; + case 0x490: + avctx->pix_fmt = AV_PIX_FMT_GBRP10; + break; + case 0x4B0: + avctx->pix_fmt = AV_PIX_FMT_GBRP12; + break; + case 0x4D0: + avctx->pix_fmt = AV_PIX_FMT_GBRP14; + break; + case 0x4F0: + avctx->pix_fmt = AV_PIX_FMT_GBRP16; + break; case 0x570: avctx->pix_fmt = AV_PIX_FMT_GBRAP; break; diff --git a/libavcodec/huffyuvenc.c b/libavcodec/huffyuvenc.c index 08edeaccf5..fd7aa384d6 100644 --- a/libavcodec/huffyuvenc.c +++ b/libavcodec/huffyuvenc.c @@ -254,6 +254,11 @@ static av_cold int encode_init(AVCodecContext *avctx) case AV_PIX_FMT_YUV411P: case AV_PIX_FMT_YUV440P: case AV_PIX_FMT_GBRP: + case AV_PIX_FMT_GBRP9: + case AV_PIX_FMT_GBRP10: + case AV_PIX_FMT_GBRP12: + case AV_PIX_FMT_GBRP14: + case AV_PIX_FMT_GBRP16: case AV_PIX_FMT_GRAY8: case AV_PIX_FMT_GRAY16: case AV_PIX_FMT_YUVA444P: @@ -301,7 +306,7 @@ static av_cold int encode_init(AVCodecContext *avctx) s->vlc_n = FFMIN(s->n, MAX_VLC_N); avctx->bits_per_coded_sample = s->bitstream_bpp; - s->decorrelate = s->bitstream_bpp >= 24 && !s->yuv && avctx->pix_fmt != AV_PIX_FMT_GBRP; + s->decorrelate = s->bitstream_bpp >= 24 && !s->yuv && !(desc->flags & AV_PIX_FMT_FLAG_PLANAR); s->predictor = avctx->prediction_method; s->interlaced = avctx->flags&CODEC_FLAG_INTERLACED_ME ? 1 : 0; if (avctx->context_model == 1) { @@ -1012,6 +1017,7 @@ AVCodec ff_ffvhuff_encoder = { AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV440P, AV_PIX_FMT_GBRP, + AV_PIX_FMT_GBRP9, AV_PIX_FMT_GBRP10, AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRP14, AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY16, AV_PIX_FMT_YUVA420P, AV_PIX_FMT_YUVA422P, AV_PIX_FMT_YUVA444P, AV_PIX_FMT_GBRAP, |