From ae5873f13bc7d0b4e93193ff7e90c92f52742268 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 28 Nov 2011 15:07:48 +0100 Subject: huffyuvenc: switch from alphaless rgb32 to rgb24 Signed-off-by: Michael Niedermayer --- libavcodec/huffyuv.c | 79 +++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 63 insertions(+), 16 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c index 0bcc35ed1b..1ac1913745 100644 --- a/libavcodec/huffyuv.c +++ b/libavcodec/huffyuv.c @@ -180,6 +180,29 @@ static inline void sub_left_prediction_bgr32(HYuvContext *s, uint8_t *dst, uint8 *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; idsp.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 read_len_table(uint8_t *dst, GetBitContext *gb){ int i, val, repeat; @@ -600,7 +623,7 @@ static av_cold int encode_init(AVCodecContext *avctx) case PIX_FMT_RGB32: s->bitstream_bpp= 32; break; - case PIX_FMT_0RGB32: + case PIX_FMT_RGB24: s->bitstream_bpp= 24; break; default: @@ -887,29 +910,29 @@ static void decode_bgr_bitstream(HYuvContext *s, int count){ } } -static int encode_bgr_bitstream(HYuvContext *s, int count, int alpha){ +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) < 4*(3+alpha)*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;\ - int a= s->temp[0][4*i+A]; + 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 STAT3\ s->stats[0][b]++;\ s->stats[1][g]++;\ s->stats[2][r]++;\ - if(alpha) s->stats[2][a]++; + if(planes==4) s->stats[2][a]++; #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]);\ - if(alpha) put_bits(&s->pb, s->len[2][a], s->bits[2][a]); + 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; ipix_fmt == PIX_FMT_RGB32 || avctx->pix_fmt == PIX_FMT_0RGB32){ + }else if(avctx->pix_fmt == PIX_FMT_RGB32){ 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, lefta; - if(s->bitstream_bpp == 32) put_bits(&s->pb, 8, lefta= data[A]); + 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]); - if(s->bitstream_bpp == 24) put_bits(&s->pb, 8, 0); sub_left_prediction_bgr32(s, s->temp[0], data+4, width-1, &leftr, &leftg, &leftb, &lefta); - encode_bgr_bitstream(s, width-1, s->bitstream_bpp == 32); + encode_bgra_bitstream(s, width-1, 4); for(y=1; yheight; y++){ uint8_t *dst = data + y*stride; @@ -1396,7 +1418,32 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, }else{ sub_left_prediction_bgr32(s, s->temp[0], dst, width, &leftr, &leftg, &leftb, &lefta); } - encode_bgr_bitstream(s, width, s->bitstream_bpp == 32); + encode_bgra_bitstream(s, width, 4); + } + }else if(avctx->pix_fmt == 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; yheight; 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_rgb24(s, s->temp[0], dst, width, &leftr, &leftg, &leftb); + } + encode_bgra_bitstream(s, width, 3); } }else{ av_log(avctx, AV_LOG_ERROR, "Format not supported!\n"); @@ -1485,7 +1532,7 @@ AVCodec ff_huffyuv_encoder = { .init = encode_init, .encode = encode_frame, .close = encode_end, - .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV422P, PIX_FMT_0RGB32, PIX_FMT_RGB32, PIX_FMT_NONE}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV422P, PIX_FMT_RGB24, PIX_FMT_RGB32, PIX_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("Huffyuv / HuffYUV"), }; #endif @@ -1499,7 +1546,7 @@ AVCodec ff_ffvhuff_encoder = { .init = encode_init, .encode = encode_frame, .close = encode_end, - .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_0RGB32, PIX_FMT_RGB32, PIX_FMT_NONE}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_RGB24, PIX_FMT_RGB32, PIX_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("Huffyuv FFmpeg variant"), }; #endif -- cgit v1.2.3