"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "libavcodec/pcx.c" between
libav-11.7.tar.gz and libav-11.8.tar.gz

About: libav provides cross-platform tools ("avconv") and libraries to convert, manipulate and stream a wide range of multimedia (audio and video) formats and protocols.

pcx.c  (libav-11.7):pcx.c  (libav-11.8)
skipping to change at line 31 skipping to change at line 31
* License along with Libav; 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 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "avcodec.h" #include "avcodec.h"
#include "bytestream.h" #include "bytestream.h"
#include "get_bits.h" #include "get_bits.h"
#include "internal.h" #include "internal.h"
#define PCX_HEADER_SIZE 128
/** /**
* @return advanced src pointer * @return advanced src pointer
*/ */
static const uint8_t *pcx_rle_decode(const uint8_t *src, static void pcx_rle_decode(GetByteContext *gb,
const uint8_t *end, uint8_t *dst,
uint8_t *dst, unsigned int bytes_per_scanline,
unsigned int bytes_per_scanline, int compressed)
int compressed)
{ {
unsigned int i = 0; unsigned int i = 0;
unsigned char run, value; unsigned char run, value;
if (compressed) { if (compressed) {
while (i < bytes_per_scanline && src < end) { while (i < bytes_per_scanline && bytestream2_get_bytes_left(gb)) {
run = 1; run = 1;
value = *src++; value = bytestream2_get_byte(gb);
if (value >= 0xc0 && src < end) { if (value >= 0xc0 && bytestream2_get_bytes_left(gb)) {
run = value & 0x3f; run = value & 0x3f;
value = *src++; value = bytestream2_get_byte(gb);
} }
while (i < bytes_per_scanline && run--) while (i < bytes_per_scanline && run--)
dst[i++] = value; dst[i++] = value;
} }
} else { } else {
memcpy(dst, src, bytes_per_scanline); bytestream2_get_buffer(gb, dst, bytes_per_scanline);
src += bytes_per_scanline;
} }
return src;
} }
static void pcx_palette(const uint8_t **src, uint32_t *dst, static void pcx_palette(GetByteContext *gb, uint32_t *dst,
unsigned int pallen) unsigned int pallen)
{ {
unsigned int i; unsigned int i;
for (i = 0; i < pallen; i++) for (i = 0; i < pallen; i++)
*dst++ = bytestream_get_be24(src); *dst++ = bytestream2_get_be24(gb);
if (pallen < 256) if (pallen < 256)
memset(dst, 0, (256 - pallen) * sizeof(*dst)); memset(dst, 0, (256 - pallen) * sizeof(*dst));
} }
static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
AVPacket *avpkt) AVPacket *avpkt)
{ {
const uint8_t *buf = avpkt->data; const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size; int buf_size = avpkt->size;
AVFrame *const p = data; AVFrame *const p = data;
GetByteContext gb;
int compressed, xmin, ymin, xmax, ymax; int compressed, xmin, ymin, xmax, ymax;
unsigned int w, h, bits_per_pixel, bytes_per_line, nplanes, stride, y, x, unsigned int w, h, bits_per_pixel, bytes_per_line, nplanes, stride, y, x,
bytes_per_scanline; bytes_per_scanline;
uint8_t *ptr; uint8_t *ptr;
const uint8_t *buf_end = buf + buf_size;
uint8_t const *bufstart = buf;
uint8_t *scanline; uint8_t *scanline;
int ret = -1; int ret = -1;
if (buf_size < PCX_HEADER_SIZE) {
av_log(avctx, AV_LOG_ERROR, "Packet too small\n");
return AVERROR_INVALIDDATA;
}
if (buf[0] != 0x0a || buf[1] > 5) { if (buf[0] != 0x0a || buf[1] > 5) {
av_log(avctx, AV_LOG_ERROR, "this is not PCX encoded data\n"); av_log(avctx, AV_LOG_ERROR, "this is not PCX encoded data\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
compressed = buf[2]; compressed = buf[2];
xmin = AV_RL16(buf + 4); xmin = AV_RL16(buf + 4);
ymin = AV_RL16(buf + 6); ymin = AV_RL16(buf + 6);
xmax = AV_RL16(buf + 8); xmax = AV_RL16(buf + 8);
ymax = AV_RL16(buf + 10); ymax = AV_RL16(buf + 10);
skipping to change at line 136 skipping to change at line 138
case 0x0401: case 0x0401:
case 0x0301: case 0x0301:
case 0x0201: case 0x0201:
avctx->pix_fmt = AV_PIX_FMT_PAL8; avctx->pix_fmt = AV_PIX_FMT_PAL8;
break; break;
default: default:
av_log(avctx, AV_LOG_ERROR, "invalid PCX file\n"); av_log(avctx, AV_LOG_ERROR, "invalid PCX file\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
buf += 128; bytestream2_init(&gb, buf + PCX_HEADER_SIZE, buf_size - PCX_HEADER_SIZE);
if ((ret = ff_set_dimensions(avctx, w, h)) < 0) if ((ret = ff_set_dimensions(avctx, w, h)) < 0)
return ret; return ret;
if ((ret = ff_get_buffer(avctx, p, 0)) < 0) { if ((ret = ff_get_buffer(avctx, p, 0)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return ret; return ret;
} }
p->pict_type = AV_PICTURE_TYPE_I; p->pict_type = AV_PICTURE_TYPE_I;
ptr = p->data[0]; ptr = p->data[0];
stride = p->linesize[0]; stride = p->linesize[0];
scanline = av_malloc(bytes_per_scanline); scanline = av_malloc(bytes_per_scanline + FF_INPUT_BUFFER_PADDING_SIZE);
if (!scanline) if (!scanline)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
if (nplanes == 3 && bits_per_pixel == 8) { if (nplanes == 3 && bits_per_pixel == 8) {
for (y = 0; y < h; y++) { for (y = 0; y < h; y++) {
buf = pcx_rle_decode(buf, buf_end, pcx_rle_decode(&gb, scanline, bytes_per_scanline, compressed);
scanline, bytes_per_scanline, compressed);
for (x = 0; x < w; x++) { for (x = 0; x < w; x++) {
ptr[3 * x] = scanline[x]; ptr[3 * x] = scanline[x];
ptr[3 * x + 1] = scanline[x + bytes_per_line]; ptr[3 * x + 1] = scanline[x + bytes_per_line];
ptr[3 * x + 2] = scanline[x + (bytes_per_line << 1)]; ptr[3 * x + 2] = scanline[x + (bytes_per_line << 1)];
} }
ptr += stride; ptr += stride;
} }
} else if (nplanes == 1 && bits_per_pixel == 8) { } else if (nplanes == 1 && bits_per_pixel == 8) {
const uint8_t *palstart = bufstart + buf_size - 769;
if (buf_size < 769) {
av_log(avctx, AV_LOG_ERROR, "File is too short\n");
ret = avctx->err_recognition & AV_EF_EXPLODE ?
AVERROR_INVALIDDATA : buf_size;
goto end;
}
for (y = 0; y < h; y++, ptr += stride) { for (y = 0; y < h; y++, ptr += stride) {
buf = pcx_rle_decode(buf, buf_end, pcx_rle_decode(&gb, scanline, bytes_per_scanline, compressed);
scanline, bytes_per_scanline, compressed);
memcpy(ptr, scanline, w); memcpy(ptr, scanline, w);
} }
if (buf != palstart) { if (bytestream2_get_byte(&gb) != 12) {
av_log(avctx, AV_LOG_WARNING, "image data possibly corrupted\n");
buf = palstart;
}
if (*buf++ != 12) {
av_log(avctx, AV_LOG_ERROR, "expected palette after image data\n"); av_log(avctx, AV_LOG_ERROR, "expected palette after image data\n");
ret = avctx->err_recognition & AV_EF_EXPLODE ? ret = avctx->err_recognition & AV_EF_EXPLODE ?
AVERROR_INVALIDDATA : buf_size; AVERROR_INVALIDDATA : buf_size;
goto end; goto end;
} }
} else if (nplanes == 1) { /* all packed formats, max. 16 colors */ } else if (nplanes == 1) { /* all packed formats, max. 16 colors */
GetBitContext s; GetBitContext s;
for (y = 0; y < h; y++) { for (y = 0; y < h; y++) {
init_get_bits(&s, scanline, bytes_per_scanline << 3); init_get_bits(&s, scanline, bytes_per_scanline << 3);
buf = pcx_rle_decode(buf, buf_end, pcx_rle_decode(&gb, scanline, bytes_per_scanline, compressed);
scanline, bytes_per_scanline, compressed);
for (x = 0; x < w; x++) for (x = 0; x < w; x++)
ptr[x] = get_bits(&s, bits_per_pixel); ptr[x] = get_bits(&s, bits_per_pixel);
ptr += stride; ptr += stride;
} }
} else { /* planar, 4, 8 or 16 colors */ } else { /* planar, 4, 8 or 16 colors */
int i; int i;
for (y = 0; y < h; y++) { for (y = 0; y < h; y++) {
buf = pcx_rle_decode(buf, buf_end, pcx_rle_decode(&gb, scanline, bytes_per_scanline, compressed);
scanline, bytes_per_scanline, compressed);
for (x = 0; x < w; x++) { for (x = 0; x < w; x++) {
int m = 0x80 >> (x & 7), v = 0; int m = 0x80 >> (x & 7), v = 0;
for (i = nplanes - 1; i >= 0; i--) { for (i = nplanes - 1; i >= 0; i--) {
v <<= 1; v <<= 1;
v += !!(scanline[i * bytes_per_line + (x >> 3)] & m); v += !!(scanline[i * bytes_per_line + (x >> 3)] & m);
} }
ptr[x] = v; ptr[x] = v;
} }
ptr += stride; ptr += stride;
} }
} }
if (nplanes == 1 && bits_per_pixel == 8) { if (nplanes == 1 && bits_per_pixel == 8) {
pcx_palette(&buf, (uint32_t *)p->data[1], 256); if (bytestream2_get_bytes_left(&gb) < 768) {
av_log(avctx, AV_LOG_ERROR, "Palette truncated\n");
ret = AVERROR_INVALIDDATA;
goto end;
}
pcx_palette(&gb, (uint32_t *)p->data[1], 256);
} else if (bits_per_pixel < 8) { } else if (bits_per_pixel < 8) {
const uint8_t *palette = bufstart + 16; GetByteContext gb1;
pcx_palette(&palette, (uint32_t *)p->data[1], 16); bytestream2_init(&gb1, avpkt->data + 16, 48);
pcx_palette(&gb1, (uint32_t *)p->data[1], 16);
} }
*got_frame = 1; *got_frame = 1;
ret = buf - bufstart; ret = bytestream2_tell(&gb);
end: end:
av_free(scanline); av_free(scanline);
return ret; return ret;
} }
AVCodec ff_pcx_decoder = { AVCodec ff_pcx_decoder = {
.name = "pcx", .name = "pcx",
.long_name = NULL_IF_CONFIG_SMALL("PC Paintbrush PCX image"), .long_name = NULL_IF_CONFIG_SMALL("PC Paintbrush PCX image"),
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_PCX, .id = AV_CODEC_ID_PCX,
 End of changes. 23 change blocks. 
45 lines changed or deleted 37 lines changed or added

Home  |  About  |  All  |  Newest  |  Fossies Dox  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTPS