generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

huffyuvenc: switch from alphaless rgb32 to rgb24

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-11-28 15:07:48 +01:00
parent fbe6e29646
commit ae5873f13b
1 changed files with 63 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
libavcodec/huffyuv.c
View File

@ -180,6 +180,29 @@ static inline void sub_left_prediction_bgr32(HYuvContext *s, uint8_t *dst, uint8
*alpha= src[(w-1)*4+A]; *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 read_len_table(uint8_t *dst, GetBitContext *gb){ static int read_len_table(uint8_t *dst, GetBitContext *gb){
int i, val, repeat; int i, val, repeat;
@ -600,7 +623,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
case PIX_FMT_RGB32: case PIX_FMT_RGB32:
s->bitstream_bpp= 32; s->bitstream_bpp= 32;
break; break;
case PIX_FMT_0RGB32: case PIX_FMT_RGB24:
s->bitstream_bpp= 24; s->bitstream_bpp= 24;
break; break;
default: 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; 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"); av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n");
return -1; return -1;
} }
#define LOAD3\ #define LOAD3\
int g= s->temp[0][4*i+G];\ int g= s->temp[0][planes==3 ? 3*i+1 : 4*i+G];\
int b= (s->temp[0][4*i+B] - g) & 0xff;\ int b= (s->temp[0][planes==3 ? 3*i+2 : 4*i+B] - g) & 0xff;\
int r= (s->temp[0][4*i+R] - g) & 0xff;\ int r= (s->temp[0][planes==3 ? 3*i+0 : 4*i+R] - g) & 0xff;\
int a= s->temp[0][4*i+A]; int a= s->temp[0][planes*i+A];
#define STAT3\ #define STAT3\
s->stats[0][b]++;\ s->stats[0][b]++;\
s->stats[1][g]++;\ s->stats[1][g]++;\
s->stats[2][r]++;\ s->stats[2][r]++;\
if(alpha) s->stats[2][a]++; if(planes==4) s->stats[2][a]++;
#define WRITE3\ #define WRITE3\
put_bits(&s->pb, s->len[1][g], s->bits[1][g]);\ 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[0][b], s->bits[0][b]);\
put_bits(&s->pb, s->len[2][r], s->bits[2][r]);\ 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)){ if((s->flags&CODEC_FLAG_PASS1) && (s->avctx->flags2&CODEC_FLAG2_NO_OUTPUT)){
for(i=0; i<count; i++){ for(i=0; i<count; i++){
@ -1372,21 +1395,20 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
encode_422_bitstream(s, 0, width); encode_422_bitstream(s, 0, width);
} }
} }
}else if(avctx->pix_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]; uint8_t *data = p->data[0] + (height-1)*p->linesize[0];
const int stride = -p->linesize[0]; const int stride = -p->linesize[0];
const int fake_stride = -fake_ystride; const int fake_stride = -fake_ystride;
int y; int y;
int leftr, leftg, leftb, lefta; 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, leftr= data[R]);
put_bits(&s->pb, 8, leftg= data[G]); put_bits(&s->pb, 8, leftg= data[G]);
put_bits(&s->pb, 8, leftb= data[B]); 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); 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; y<s->height; y++){ for(y=1; y<s->height; y++){
uint8_t *dst = data + y*stride; uint8_t *dst = data + y*stride;
@ -1396,7 +1418,32 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
}else{ }else{
sub_left_prediction_bgr32(s, s->temp[0], dst, width, &leftr, &leftg, &leftb, &lefta); 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; 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_rgb24(s, s->temp[0], dst, width, &leftr, &leftg, &leftb);
}
encode_bgra_bitstream(s, width, 3);
} }
}else{ }else{
av_log(avctx, AV_LOG_ERROR, "Format not supported!\n"); av_log(avctx, AV_LOG_ERROR, "Format not supported!\n");
@ -1485,7 +1532,7 @@ AVCodec ff_huffyuv_encoder = {
.init = encode_init, .init = encode_init,
.encode = encode_frame, .encode = encode_frame,
.close = encode_end, .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"), .long_name = NULL_IF_CONFIG_SMALL("Huffyuv / HuffYUV"),
}; };
#endif #endif
@ -1499,7 +1546,7 @@ AVCodec ff_ffvhuff_encoder = {
.init = encode_init, .init = encode_init,
.encode = encode_frame, .encode = encode_frame,
.close = encode_end, .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"), .long_name = NULL_IF_CONFIG_SMALL("Huffyuv FFmpeg variant"),
}; };
#endif #endif