From 55c4cba2a7037161ea56b2d55b347c8381df7f1e Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 10 Mar 2013 11:16:33 +0100 Subject: huffyuvenc: BGRA support Bug-Id: 452 Signed-off-by: Diego Biurrun --- libavcodec/huffyuvenc.c | 151 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 116 insertions(+), 35 deletions(-) (limited to 'libavcodec/huffyuvenc.c') diff --git a/libavcodec/huffyuvenc.c b/libavcodec/huffyuvenc.c index 13c0a79566..678304460c 100644 --- a/libavcodec/huffyuvenc.c +++ b/libavcodec/huffyuvenc.c @@ -55,24 +55,29 @@ static inline int sub_left_prediction(HYuvContext *s, uint8_t *dst, static inline void sub_left_prediction_bgr32(HYuvContext *s, uint8_t *dst, uint8_t *src, int w, - int *red, int *green, int *blue) + int *red, int *green, int *blue, + int *alpha) { int i; - int r,g,b; + int r, g, b, a; r = *red; g = *green; b = *blue; + a = *alpha; for (i = 0; i < FFMIN(w, 4); i++) { const int rt = src[i * 4 + R]; const int gt = src[i * 4 + G]; const int bt = src[i * 4 + B]; + const int at = src[i * 4 + A]; dst[i * 4 + R] = rt - r; dst[i * 4 + G] = gt - g; dst[i * 4 + B] = bt - b; + dst[i * 4 + A] = at - a; r = rt; g = gt; b = bt; + a = at; } s->dsp.diff_bytes(dst + 16, src + 16, src + 12, w * 4 - 16); @@ -80,6 +85,35 @@ static inline void sub_left_prediction_bgr32(HYuvContext *s, uint8_t *dst, *red = src[(w - 1) * 4 + R]; *green = src[(w - 1) * 4 + G]; *blue = src[(w - 1) * 4 + B]; + *alpha = src[(w - 1) * 4 + A]; +} + +static inline void sub_left_prediction_rgb24(HYuvContext *s, uint8_t *dst, + uint8_t *src, int w, + int *red, int *green, int *blue) +{ + int i; + int r, g, b; + r = *red; + g = *green; + b = *blue; + for (i = 0; i < FFMIN(w, 16); i++) { + const int rt = src[i * 3 + 0]; + const int gt = src[i * 3 + 1]; + const int bt = src[i * 3 + 2]; + dst[i * 3 + 0] = rt - r; + dst[i * 3 + 1] = gt - g; + dst[i * 3 + 2] = bt - b; + r = rt; + g = gt; + b = bt; + } + + s->dsp.diff_bytes(dst + 48, src + 48, src + 48 - 3, w * 3 - 48); + + *red = src[(w - 1) * 3 + 0]; + *green = src[(w - 1) * 3 + 1]; + *blue = src[(w - 1) * 3 + 2]; } static int store_table(HYuvContext *s, const uint8_t *len, uint8_t *buf) @@ -121,12 +155,17 @@ static av_cold int encode_init(AVCodecContext *avctx) switch (avctx->pix_fmt) { case AV_PIX_FMT_YUV420P: - s->bitstream_bpp = 12; - break; case AV_PIX_FMT_YUV422P: - s->bitstream_bpp = 16; + if (s->width & 1) { + av_log(avctx, AV_LOG_ERROR, "Width must be even for this colorspace.\n"); + return -1; + } + s->bitstream_bpp = avctx->pix_fmt == AV_PIX_FMT_YUV420P ? 12 : 16; break; case AV_PIX_FMT_RGB32: + s->bitstream_bpp = 32; + break; + case AV_PIX_FMT_RGB24: s->bitstream_bpp = 24; break; default: @@ -338,44 +377,52 @@ static int encode_gray_bitstream(HYuvContext *s, int count) return 0; } -static int encode_bgr_bitstream(HYuvContext *s, int count) +static inline int encode_bgra_bitstream(HYuvContext *s, int count, int planes) { int i; - if (s->pb.buf_end - s->pb.buf - (put_bits_count(&s->pb) >> 3) < 3 * 4 * count) { + if (s->pb.buf_end - s->pb.buf - (put_bits_count(&s->pb) >> 3) < + 4 * planes * count) { av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n"); return -1; } -#define LOAD3\ - int g = s->temp[0][4 * i + G];\ - int b = (s->temp[0][4 * i + B] - g) & 0xff;\ - int r = (s->temp[0][4 * i + R] - g) & 0xff; -#define STAT3\ - s->stats[0][b]++;\ - s->stats[1][g]++;\ - s->stats[2][r]++; -#define WRITE3\ - put_bits(&s->pb, s->len[1][g], s->bits[1][g]);\ - put_bits(&s->pb, s->len[0][b], s->bits[0][b]);\ - put_bits(&s->pb, s->len[2][r], s->bits[2][r]); +#define LOAD_GBRA \ + int g = s->temp[0][planes == 3 ? 3 * i + 1 : 4 * i + G]; \ + int b = s->temp[0][planes == 3 ? 3 * i + 2 : 4 * i + B] - g & 0xFF; \ + int r = s->temp[0][planes == 3 ? 3 * i + 0 : 4 * i + R] - g & 0xFF; \ + int a = s->temp[0][planes * i + A]; + +#define STAT_BGRA \ + s->stats[0][b]++; \ + s->stats[1][g]++; \ + s->stats[2][r]++; \ + if (planes == 4) \ + s->stats[2][a]++; + +#define WRITE_GBRA \ + put_bits(&s->pb, s->len[1][g], s->bits[1][g]); \ + put_bits(&s->pb, s->len[0][b], s->bits[0][b]); \ + put_bits(&s->pb, s->len[2][r], s->bits[2][r]); \ + if (planes == 4) \ + put_bits(&s->pb, s->len[2][a], s->bits[2][a]); if ((s->flags & CODEC_FLAG_PASS1) && (s->avctx->flags2 & CODEC_FLAG2_NO_OUTPUT)) { for (i = 0; i < count; i++) { - LOAD3; - STAT3; + LOAD_GBRA; + STAT_BGRA; } } else if (s->context || (s->flags & CODEC_FLAG_PASS1)) { for (i = 0; i < count; i++) { - LOAD3; - STAT3; - WRITE3; + LOAD_GBRA; + STAT_BGRA; + WRITE_GBRA; } } else { for (i = 0; i < count; i++) { - LOAD3; - WRITE3; + LOAD_GBRA; + WRITE_GBRA; } } return 0; @@ -529,25 +576,57 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, const int stride = -p->linesize[0]; const int fake_stride = -fake_ystride; int y; - int leftr, leftg, leftb; + int leftr, leftg, leftb, lefta; + put_bits(&s->pb, 8, lefta = data[A]); put_bits(&s->pb, 8, leftr = data[R]); put_bits(&s->pb, 8, leftg = data[G]); put_bits(&s->pb, 8, leftb = data[B]); - put_bits(&s->pb, 8, 0); - sub_left_prediction_bgr32(s, s->temp[0], data + 4, width - 1, &leftr, &leftg, &leftb); - encode_bgr_bitstream(s, width - 1); + sub_left_prediction_bgr32(s, s->temp[0], data + 4, width - 1, + &leftr, &leftg, &leftb, &lefta); + encode_bgra_bitstream(s, width - 1, 4); for (y = 1; y < s->height; y++) { uint8_t *dst = data + y*stride; if (s->predictor == PLANE && s->interlaced < y) { s->dsp.diff_bytes(s->temp[1], dst, dst - fake_stride, width * 4); - sub_left_prediction_bgr32(s, s->temp[0], s->temp[1], width, &leftr, &leftg, &leftb); + sub_left_prediction_bgr32(s, s->temp[0], s->temp[1], width, + &leftr, &leftg, &leftb, &lefta); + } else { + sub_left_prediction_bgr32(s, s->temp[0], dst, width, + &leftr, &leftg, &leftb, &lefta); + } + encode_bgra_bitstream(s, width, 4); + } + } else if (avctx->pix_fmt == AV_PIX_FMT_RGB24) { + uint8_t *data = p->data[0] + (height - 1) * p->linesize[0]; + const int stride = -p->linesize[0]; + const int fake_stride = -fake_ystride; + int y; + int leftr, leftg, leftb; + + put_bits(&s->pb, 8, leftr = data[0]); + put_bits(&s->pb, 8, leftg = data[1]); + put_bits(&s->pb, 8, leftb = data[2]); + put_bits(&s->pb, 8, 0); + + sub_left_prediction_rgb24(s, s->temp[0], data + 3, width - 1, + &leftr, &leftg, &leftb); + encode_bgra_bitstream(s, width-1, 3); + + for (y = 1; y < s->height; y++) { + uint8_t *dst = data + y * stride; + if (s->predictor == PLANE && s->interlaced < y) { + s->dsp.diff_bytes(s->temp[1], dst, dst - fake_stride, + width * 3); + sub_left_prediction_rgb24(s, s->temp[0], s->temp[1], width, + &leftr, &leftg, &leftb); } else { - sub_left_prediction_bgr32(s, s->temp[0], dst, width, &leftr, &leftg, &leftb); + sub_left_prediction_rgb24(s, s->temp[0], dst, width, + &leftr, &leftg, &leftb); } - encode_bgr_bitstream(s, width); + encode_bgra_bitstream(s, width, 3); } } else { av_log(avctx, AV_LOG_ERROR, "Format not supported!\n"); @@ -610,7 +689,8 @@ AVCodec ff_huffyuv_encoder = { .encode2 = encode_frame, .close = encode_end, .pix_fmts = (const enum AVPixelFormat[]){ - AV_PIX_FMT_YUV422P, AV_PIX_FMT_RGB32, AV_PIX_FMT_NONE + AV_PIX_FMT_YUV422P, AV_PIX_FMT_RGB24, + AV_PIX_FMT_RGB32, AV_PIX_FMT_NONE }, .long_name = NULL_IF_CONFIG_SMALL("Huffyuv / HuffYUV"), }; @@ -626,7 +706,8 @@ AVCodec ff_ffvhuff_encoder = { .encode2 = encode_frame, .close = encode_end, .pix_fmts = (const enum AVPixelFormat[]){ - AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_RGB32, AV_PIX_FMT_NONE + AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_RGB24, + AV_PIX_FMT_RGB32, AV_PIX_FMT_NONE }, .long_name = NULL_IF_CONFIG_SMALL("Huffyuv FFmpeg variant"), }; -- cgit v1.2.3