X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Ftargaenc.c;h=7679029643d56ead1e12d0dc3bcaa89d472eca4c;hb=a0e1c3517a656dd32293f054a339e0ac73328138;hp=35e667996db73d498327266a391f965d70eb3e01;hpb=e2d09b65e8166d6f3880bdf7195069e09d470a99;p=ffmpeg diff --git a/libavcodec/targaenc.c b/libavcodec/targaenc.c index 35e667996db..7679029643d 100644 --- a/libavcodec/targaenc.c +++ b/libavcodec/targaenc.c @@ -2,28 +2,32 @@ * Targa (.tga) image encoder * Copyright (c) 2007 Bobby Bingham * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include + +#include "libavutil/internal.h" +#include "libavutil/intreadwrite.h" +#include "libavutil/pixdesc.h" #include "avcodec.h" +#include "internal.h" #include "rle.h" - -typedef struct TargaContext { - AVFrame picture; -} TargaContext; +#include "targa.h" /** * RLE compress the image, with maximum size of out_size @@ -35,7 +39,7 @@ typedef struct 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; @@ -55,7 +59,7 @@ static int targa_encode_rle(uint8_t *outbuf, int out_size, AVFrame *pic, 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; @@ -70,59 +74,62 @@ static int targa_encode_normal(uint8_t *outbuf, AVFrame *pic, int bpp, int w, in 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; +static int targa_encode_frame(AVCodecContext *avctx, AVPacket *pkt, + const AVFrame *p, int *got_packet) +{ + 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 -1; + return AVERROR(EINVAL); } picsize = avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height); - if(buf_size < picsize + 45) { + if ((ret = ff_alloc_packet(pkt, picsize + 45)) < 0) { av_log(avctx, AV_LOG_ERROR, "encoded frame too large\n"); - return -1; + 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); - outbuf[17] = 0x20; /* origin is top-left. no alpha */ + 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 */ + pkt->data[17] = 0x20 | (avctx->pix_fmt == AV_PIX_FMT_BGRA ? 8 : 0); - /* TODO: support alpha channel */ switch(avctx->pix_fmt) { - case PIX_FMT_GRAY8: - outbuf[2] = 3; /* 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 AV_PIX_FMT_RGB555LE: + pkt->data[2] = TGA_RGB; /* uncompresses true-color image */ + pkt->data[16] = 16; /* bpp */ break; - case PIX_FMT_RGB555: - outbuf[2] = 2; /* uncompresses true-color image */ - outbuf[16] = 16; /* bpp */ + case AV_PIX_FMT_BGR24: + pkt->data[2] = TGA_RGB; /* uncompressed true-color image */ + pkt->data[16] = 24; /* bpp */ break; - case PIX_FMT_BGR24: - outbuf[2] = 2; /* uncompressed true-color image */ - outbuf[16] = 24; /* bpp */ + case AV_PIX_FMT_BGRA: + pkt->data[2] = TGA_RGB; /* uncompressed true-color image */ + pkt->data[16] = 32; /* bpp */ break; default: - return -1; + av_log(avctx, AV_LOG_ERROR, "Pixel format '%s' not supported.\n", + 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 */ /* try RLE compression */ - datasize = targa_encode_rle(out, picsize, p, bpp, avctx->width, avctx->height); + if (avctx->coder_type != FF_CODER_TYPE_RAW) + 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); @@ -134,27 +141,41 @@ static int targa_encode_frame(AVCodecContext *avctx, * 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; + avctx->coded_frame = av_frame_alloc(); + if (!avctx->coded_frame) + return AVERROR(ENOMEM); + + avctx->coded_frame->key_frame = 1; + avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; - avcodec_get_frame_defaults(&s->picture); - s->picture.key_frame= 1; - avctx->coded_frame= &s->picture; + return 0; +} +static av_cold int targa_encode_close(AVCodecContext *avctx) +{ + av_frame_free(&avctx->coded_frame); return 0; } -AVCodec targa_encoder = { - .name = "targa", - .type = CODEC_TYPE_VIDEO, - .id = CODEC_ID_TARGA, - .priv_data_size = sizeof(TargaContext), - .init = targa_encode_init, - .encode = targa_encode_frame, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_BGR24, PIX_FMT_RGB555, PIX_FMT_GRAY8, PIX_FMT_NONE}, - .long_name= "Truevision Targa image", +AVCodec ff_targa_encoder = { + .name = "targa", + .long_name = NULL_IF_CONFIG_SMALL("Truevision Targa image"), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_TARGA, + .init = targa_encode_init, + .close = targa_encode_close, + .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 + }, };