highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

huffyuvenc: support alphaless rgb32

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-11-28 03:44:47 +01:00
parent 0af7d7082f
commit d3fc335bac
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/huffyuv.c
View File

@ -600,6 +600,9 @@ 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:
s->bitstream_bpp= 24;
break;
default: default:
av_log(avctx, AV_LOG_ERROR, "format not supported\n"); av_log(avctx, AV_LOG_ERROR, "format not supported\n");
return -1; return -1;
@ -1369,7 +1372,7 @@ 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){ }else if(avctx->pix_fmt == PIX_FMT_RGB32 || avctx->pix_fmt == PIX_FMT_0RGB32){
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;
@ -1482,7 +1485,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_RGB32, PIX_FMT_NONE}, .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV422P, PIX_FMT_0RGB32, PIX_FMT_RGB32, PIX_FMT_NONE},
.long_name = NULL_IF_CONFIG_SMALL("Huffyuv / HuffYUV"), .long_name = NULL_IF_CONFIG_SMALL("Huffyuv / HuffYUV"),
}; };
#endif #endif
@ -1496,7 +1499,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_RGB32, PIX_FMT_NONE}, .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_0RGB32, 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