* Targa (.tga) image decoder
* Copyright (c) 2006 Konstantin Shishkov
*
- * 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 "libavutil/intreadwrite.h"
-#include "libavcore/imgutils.h"
+#include "libavutil/imgutils.h"
#include "avcodec.h"
-
-enum TargaCompr{
- TGA_NODATA = 0, // no image data
- TGA_PAL = 1, // palettized
- TGA_RGB = 2, // true-color
- TGA_BW = 3, // black & white or grayscale
- TGA_RLE = 8, // flag pointing that data is RLE-coded
-};
+#include "targa.h"
typedef struct TargaContext {
AVFrame picture;
int compression_type;
} TargaContext;
-static void targa_decode_rle(AVCodecContext *avctx, TargaContext *s, const uint8_t *src, uint8_t *dst, int w, int h, int stride, int bpp)
+#define CHECK_BUFFER_SIZE(buf, buf_end, needed, where) \
+ if(needed > buf_end - buf){ \
+ av_log(avctx, AV_LOG_ERROR, "Problem: unexpected end of data while reading " where "\n"); \
+ return -1; \
+ } \
+
+static int targa_decode_rle(AVCodecContext *avctx, TargaContext *s, const uint8_t *src, int src_size, uint8_t *dst, int w, int h, int stride, int bpp)
{
int i, x, y;
int depth = (bpp + 1) >> 3;
int type, count;
int diff;
+ const uint8_t *src_end = src + src_size;
diff = stride - w * depth;
x = y = 0;
while(y < h){
+ CHECK_BUFFER_SIZE(src, src_end, 1, "image type");
type = *src++;
count = (type & 0x7F) + 1;
type &= 0x80;
if((x + count > w) && (x + count + 1 > (h - y) * w)){
av_log(avctx, AV_LOG_ERROR, "Packet went out of bounds: position (%i,%i) size %i\n", x, y, count);
- return;
+ return -1;
+ }
+ if(type){
+ CHECK_BUFFER_SIZE(src, src_end, depth, "image data");
+ }else{
+ CHECK_BUFFER_SIZE(src, src_end, count * depth, "image data");
}
for(i = 0; i < count; i++){
switch(depth){
if(type)
src += depth;
}
+ return src_size;
}
static int decode_frame(AVCodecContext *avctx,
AVPacket *avpkt)
{
const uint8_t *buf = avpkt->data;
- int buf_size = avpkt->size;
+ const uint8_t *buf_end = avpkt->data + avpkt->size;
TargaContext * const s = avctx->priv_data;
AVFrame *picture = data;
AVFrame * const p= (AVFrame*)&s->picture;
int first_clr, colors, csize;
/* parse image header */
+ CHECK_BUFFER_SIZE(buf, buf_end, 18, "header");
idlen = *buf++;
pal = *buf++;
compr = *buf++;
bpp = *buf++;
flags = *buf++;
//skip identifier if any
+ CHECK_BUFFER_SIZE(buf, buf_end, idlen, "identifiers");
buf += idlen;
s->bpp = bpp;
s->width = w;
}
}
if(colors){
+ size_t pal_size;
if((colors + first_clr) > 256){
av_log(avctx, AV_LOG_ERROR, "Incorrect palette: %i colors with offset %i\n", colors, first_clr);
return -1;
av_log(avctx, AV_LOG_ERROR, "Palette entry size %i bits is not supported\n", csize);
return -1;
}
+ pal_size = colors * ((csize + 1) >> 3);
+ CHECK_BUFFER_SIZE(buf, buf_end, pal_size, "color table");
if(avctx->pix_fmt != PIX_FMT_PAL8)//should not occur but skip palette anyway
- buf += colors * ((csize + 1) >> 3);
+ buf += pal_size;
else{
int r, g, b, t;
int32_t *pal = ((int32_t*)p->data[1]) + first_clr;
if((compr & (~TGA_RLE)) == TGA_NODATA)
memset(p->data[0], 0, p->linesize[0] * s->height);
else{
- if(compr & TGA_RLE)
- targa_decode_rle(avctx, s, buf, dst, avctx->width, avctx->height, stride, bpp);
- else{
+ if(compr & TGA_RLE){
+ int res = targa_decode_rle(avctx, s, buf, buf_end - buf, dst, avctx->width, avctx->height, stride, bpp);
+ if (res < 0)
+ return -1;
+ buf += res;
+ }else{
+ size_t img_size = s->width * ((s->bpp + 1) >> 3);
+ CHECK_BUFFER_SIZE(buf, buf_end, img_size, "image data");
for(y = 0; y < s->height; y++){
#if HAVE_BIGENDIAN
if((s->bpp + 1) >> 3 == 2){
dst32[x] = AV_RL32(buf + x * 4);
}else
#endif
- memcpy(dst, buf, s->width * ((s->bpp + 1) >> 3));
+ memcpy(dst, buf, img_size);
dst += stride;
- buf += s->width * ((s->bpp + 1) >> 3);
+ buf += img_size;
}
}
}
*picture= *(AVFrame*)&s->picture;
*data_size = sizeof(AVPicture);
- return buf_size;
+ return avpkt->size;
}
static av_cold int targa_init(AVCodecContext *avctx){
return 0;
}
-AVCodec targa_decoder = {
+AVCodec ff_targa_decoder = {
"targa",
AVMEDIA_TYPE_VIDEO,
CODEC_ID_TARGA,
projects / ffmpeg / blobdiff