* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <string.h>
+
+#include "libavutil/imgutils.h"
+#include "libavutil/internal.h"
#include "libavutil/intreadwrite.h"
+#include "libavutil/opt.h"
+#include "libavutil/pixdesc.h"
#include "avcodec.h"
+#include "internal.h"
#include "rle.h"
#include "targa.h"
typedef struct TargaContext {
- AVFrame picture;
+ AVClass *class;
+
+ int rle;
} TargaContext;
/**
* @param h Image height
* @return Size of output in bytes, or -1 if larger than out_size
*/
-static int targa_encode_rle(uint8_t *outbuf, int out_size, AVFrame *pic,
+static int targa_encode_rle(uint8_t *outbuf, int out_size, const AVFrame *pic,
int bpp, int w, int h)
{
int y,ret;
return out - outbuf;
}
-static int targa_encode_normal(uint8_t *outbuf, AVFrame *pic, int bpp, int w, int h)
+static int targa_encode_normal(uint8_t *outbuf, const AVFrame *pic, int bpp, int w, int h)
{
int i, n = bpp * w;
uint8_t *out = outbuf;
return out - outbuf;
}
-static int targa_encode_frame(AVCodecContext *avctx,
- unsigned char *outbuf,
- int buf_size, void *data){
- AVFrame *p = data;
- int bpp, picsize, datasize = -1;
+static int targa_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
+ const AVFrame *p, int *got_packet)
+{
+ TargaContext *s = avctx->priv_data;
+ int bpp, picsize, datasize = -1, ret;
uint8_t *out;
- if(avctx->width > 0xffff || avctx->height > 0xffff) {
- av_log(avctx, AV_LOG_ERROR, "image dimensions too large\n");
- return AVERROR(EINVAL);
- }
- picsize = avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height);
- if(buf_size < picsize + 45) {
+ picsize = av_image_get_buffer_size(avctx->pix_fmt,
+ avctx->width, avctx->height, 1);
+ if ((ret = ff_alloc_packet(pkt, picsize + 45)) < 0) {
av_log(avctx, AV_LOG_ERROR, "encoded frame too large\n");
- return AVERROR(EINVAL);
+ return ret;
}
- p->pict_type= FF_I_TYPE;
- p->key_frame= 1;
-
/* zero out the header and only set applicable fields */
- memset(outbuf, 0, 12);
- AV_WL16(outbuf+12, avctx->width);
- AV_WL16(outbuf+14, avctx->height);
+ memset(pkt->data, 0, 12);
+ AV_WL16(pkt->data+12, avctx->width);
+ AV_WL16(pkt->data+14, avctx->height);
/* image descriptor byte: origin is always top-left, bits 0-3 specify alpha */
- outbuf[17] = 0x20 | (avctx->pix_fmt == PIX_FMT_BGRA ? 8 : 0);
+ pkt->data[17] = 0x20 | (avctx->pix_fmt == AV_PIX_FMT_BGRA ? 8 : 0);
switch(avctx->pix_fmt) {
- case PIX_FMT_GRAY8:
- outbuf[2] = TGA_BW; /* uncompressed grayscale image */
- outbuf[16] = 8; /* bpp */
+ case AV_PIX_FMT_GRAY8:
+ pkt->data[2] = TGA_BW; /* uncompressed grayscale image */
+ pkt->data[16] = 8; /* bpp */
break;
- case PIX_FMT_RGB555LE:
- outbuf[2] = TGA_RGB; /* uncompresses true-color image */
- outbuf[16] = 16; /* bpp */
+ case AV_PIX_FMT_RGB555LE:
+ pkt->data[2] = TGA_RGB; /* uncompresses true-color image */
+ pkt->data[16] = 16; /* bpp */
break;
- case PIX_FMT_BGR24:
- outbuf[2] = TGA_RGB; /* uncompressed true-color image */
- outbuf[16] = 24; /* bpp */
+ case AV_PIX_FMT_BGR24:
+ pkt->data[2] = TGA_RGB; /* uncompressed true-color image */
+ pkt->data[16] = 24; /* bpp */
break;
- case PIX_FMT_BGRA:
- outbuf[2] = TGA_RGB; /* uncompressed true-color image */
- outbuf[16] = 32; /* bpp */
+ case AV_PIX_FMT_BGRA:
+ pkt->data[2] = TGA_RGB; /* uncompressed true-color image */
+ pkt->data[16] = 32; /* bpp */
break;
default:
av_log(avctx, AV_LOG_ERROR, "Pixel format '%s' not supported.\n",
- avcodec_get_pix_fmt_name(avctx->pix_fmt));
+ av_get_pix_fmt_name(avctx->pix_fmt));
return AVERROR(EINVAL);
}
- bpp = outbuf[16] >> 3;
+ bpp = pkt->data[16] >> 3;
- out = outbuf + 18; /* skip past the header we just output */
+ out = pkt->data + 18; /* skip past the header we just output */
+
+#if FF_API_CODER_TYPE
+FF_DISABLE_DEPRECATION_WARNINGS
+ if (avctx->coder_type == FF_CODER_TYPE_RAW)
+ s->rle = 0;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
/* try RLE compression */
- if (avctx->coder_type != FF_CODER_TYPE_RAW)
+ if (s->rle)
datasize = targa_encode_rle(out, picsize, p, bpp, avctx->width, avctx->height);
/* if that worked well, mark the picture as RLE compressed */
if(datasize >= 0)
- outbuf[2] |= 8;
+ pkt->data[2] |= 8;
/* if RLE didn't make it smaller, go back to no compression */
else datasize = targa_encode_normal(out, p, bpp, avctx->width, avctx->height);
* aspect ratio and encoder ID fields available? */
memcpy(out, "\0\0\0\0\0\0\0\0TRUEVISION-XFILE.", 26);
- return out + 26 - outbuf;
+ pkt->size = out + 26 - pkt->data;
+ pkt->flags |= AV_PKT_FLAG_KEY;
+ *got_packet = 1;
+
+ return 0;
}
static av_cold int targa_encode_init(AVCodecContext *avctx)
{
- TargaContext *s = avctx->priv_data;
+ if (avctx->width > 0xffff || avctx->height > 0xffff) {
+ av_log(avctx, AV_LOG_ERROR, "image dimensions too large\n");
+ return AVERROR(EINVAL);
+ }
- avcodec_get_frame_defaults(&s->picture);
- s->picture.key_frame= 1;
- avctx->coded_frame= &s->picture;
+#if FF_API_CODED_FRAME
+FF_DISABLE_DEPRECATION_WARNINGS
+ avctx->coded_frame->key_frame = 1;
+ avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
return 0;
}
+#define OFFSET(x) offsetof(TargaContext, x)
+#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
+static const AVOption options[] = {
+ { "rle", "Use run-length compression", OFFSET(rle), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 1, VE },
+
+ { NULL },
+};
+
+static const AVClass targa_class = {
+ .class_name = "targa",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
AVCodec ff_targa_encoder = {
- .name = "targa",
- .type = AVMEDIA_TYPE_VIDEO,
- .id = CODEC_ID_TARGA,
+ .name = "targa",
+ .long_name = NULL_IF_CONFIG_SMALL("Truevision Targa image"),
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_TARGA,
.priv_data_size = sizeof(TargaContext),
- .init = targa_encode_init,
- .encode = targa_encode_frame,
- .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"),
+ .priv_class = &targa_class,
+ .init = targa_encode_init,
+ .encode2 = targa_encode_frame,
+ .pix_fmts = (const enum AVPixelFormat[]){
+ AV_PIX_FMT_BGR24, AV_PIX_FMT_BGRA, AV_PIX_FMT_RGB555LE, AV_PIX_FMT_GRAY8,
+ AV_PIX_FMT_NONE
+ },
};
projects / ffmpeg / blobdiff