|
|
@ -97,9 +97,9 @@ static int targa_encode_frame(AVCodecContext *avctx, |
|
|
|
memset(outbuf, 0, 12); |
|
|
|
memset(outbuf, 0, 12); |
|
|
|
AV_WL16(outbuf+12, avctx->width); |
|
|
|
AV_WL16(outbuf+12, avctx->width); |
|
|
|
AV_WL16(outbuf+14, avctx->height); |
|
|
|
AV_WL16(outbuf+14, avctx->height); |
|
|
|
outbuf[17] = 0x20; /* origin is top-left. no alpha */ |
|
|
|
/* image descriptor byte: origin is always top-left, bits 0-3 specify alpha */ |
|
|
|
|
|
|
|
outbuf[17] = 0x20 | (avctx->pix_fmt == PIX_FMT_BGRA ? 8 : 0); |
|
|
|
|
|
|
|
|
|
|
|
/* TODO: support alpha channel */ |
|
|
|
|
|
|
|
switch(avctx->pix_fmt) { |
|
|
|
switch(avctx->pix_fmt) { |
|
|
|
case PIX_FMT_GRAY8: |
|
|
|
case PIX_FMT_GRAY8: |
|
|
|
outbuf[2] = TGA_BW; /* uncompressed grayscale image */ |
|
|
|
outbuf[2] = TGA_BW; /* uncompressed grayscale image */ |
|
|
@ -113,6 +113,10 @@ static int targa_encode_frame(AVCodecContext *avctx, |
|
|
|
outbuf[2] = TGA_RGB; /* uncompressed true-color image */ |
|
|
|
outbuf[2] = TGA_RGB; /* uncompressed true-color image */ |
|
|
|
outbuf[16] = 24; /* bpp */ |
|
|
|
outbuf[16] = 24; /* bpp */ |
|
|
|
break; |
|
|
|
break; |
|
|
|
|
|
|
|
case PIX_FMT_BGRA: |
|
|
|
|
|
|
|
outbuf[2] = TGA_RGB; /* uncompressed true-color image */ |
|
|
|
|
|
|
|
outbuf[16] = 32; /* bpp */ |
|
|
|
|
|
|
|
break; |
|
|
|
default: |
|
|
|
default: |
|
|
|
av_log(avctx, AV_LOG_ERROR, "Pixel format '%s' not supported.\n", |
|
|
|
av_log(avctx, AV_LOG_ERROR, "Pixel format '%s' not supported.\n", |
|
|
|
avcodec_get_pix_fmt_name(avctx->pix_fmt)); |
|
|
|
avcodec_get_pix_fmt_name(avctx->pix_fmt)); |
|
|
@ -161,6 +165,6 @@ AVCodec targa_encoder = { |
|
|
|
.priv_data_size = sizeof(TargaContext), |
|
|
|
.priv_data_size = sizeof(TargaContext), |
|
|
|
.init = targa_encode_init, |
|
|
|
.init = targa_encode_init, |
|
|
|
.encode = targa_encode_frame, |
|
|
|
.encode = targa_encode_frame, |
|
|
|
.pix_fmts= (const enum PixelFormat[]){PIX_FMT_BGR24, PIX_FMT_RGB555LE, PIX_FMT_GRAY8, PIX_FMT_NONE}, |
|
|
|
.pix_fmts= (const enum PixelFormat[]){PIX_FMT_BGR24, PIX_FMT_BGRA, PIX_FMT_RGB555LE, PIX_FMT_GRAY8, PIX_FMT_NONE}, |
|
|
|
.long_name= NULL_IF_CONFIG_SMALL("Truevision Targa image"), |
|
|
|
.long_name= NULL_IF_CONFIG_SMALL("Truevision Targa image"), |
|
|
|
}; |
|
|
|
}; |
|
|
|