falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

Merge commit '170fb593c617cd797d00cf05bfb8d8c21d612893' 

* commit '170fb593c617cd797d00cf05bfb8d8c21d612893':
  pcx: K&R formatting cosmetics

Conflicts:
	libavcodec/pcx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.1
Michael Niedermayer 12 years ago
parent
c6953589f9 170fb593c6
commit
54bbb90568
1 changed files with 53 additions and 54 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +53
    -54
      libavcodec/pcx.c

+ 53
- 54
libavcodec/pcx.c View File

@@ -35,14 +35,14 @@ static void pcx_rle_decode(GetByteContext *gb, uint8_t *dst,
unsigned char run, value;

if (compressed) {
while (i<bytes_per_scanline) {
run = 1;
while (i < bytes_per_scanline) {
run = 1;
value = bytestream2_get_byte(gb);
if (value >= 0xc0) {
run = value & 0x3f;
run = value & 0x3f;
value = bytestream2_get_byte(gb);
}
while (i<bytes_per_scanline && run--)
while (i < bytes_per_scanline && run--)
dst[i++] = value;
}
} else {
@@ -55,17 +55,19 @@ static void pcx_palette(GetByteContext *gb, uint32_t *dst, int pallen)
int i;

pallen = FFMIN(pallen, bytestream2_get_bytes_left(gb) / 3);
for (i=0; i<pallen; i++)
for (i = 0; i < pallen; i++)
*dst++ = 0xFF000000 | bytestream2_get_be24u(gb);
if (pallen < 256)
memset(dst, 0, (256 - pallen) * sizeof(*dst));
}

static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
AVPacket *avpkt) {
AVPacket *avpkt)
{
GetByteContext gb;
AVFrame * const p = data;
int compressed, xmin, ymin, xmax, ymax, ret;
AVFrame * const p = data;
int compressed, xmin, ymin, xmax, ymax;
int ret;
unsigned int w, h, bits_per_pixel, bytes_per_line, nplanes, stride, y, x,
bytes_per_scanline;
uint8_t *ptr, *scanline;
@@ -80,12 +82,12 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
return AVERROR_INVALIDDATA;
}

compressed = bytestream2_get_byteu(&gb);
bits_per_pixel = bytestream2_get_byteu(&gb);
xmin = bytestream2_get_le16u(&gb);
ymin = bytestream2_get_le16u(&gb);
xmax = bytestream2_get_le16u(&gb);
ymax = bytestream2_get_le16u(&gb);
compressed = bytestream2_get_byteu(&gb);
bits_per_pixel = bytestream2_get_byteu(&gb);
xmin = bytestream2_get_le16u(&gb);
ymin = bytestream2_get_le16u(&gb);
xmax = bytestream2_get_le16u(&gb);
ymax = bytestream2_get_le16u(&gb);
avctx->sample_aspect_ratio.num = bytestream2_get_le16u(&gb);
avctx->sample_aspect_ratio.den = bytestream2_get_le16u(&gb);

@@ -107,22 +109,22 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
return AVERROR_INVALIDDATA;
}

switch ((nplanes<<8) + bits_per_pixel) {
case 0x0308:
avctx->pix_fmt = AV_PIX_FMT_RGB24;
break;
case 0x0108:
case 0x0104:
case 0x0102:
case 0x0101:
case 0x0401:
case 0x0301:
case 0x0201:
avctx->pix_fmt = AV_PIX_FMT_PAL8;
break;
default:
av_log(avctx, AV_LOG_ERROR, "invalid PCX file\n");
return AVERROR_INVALIDDATA;
switch ((nplanes << 8) + bits_per_pixel) {
case 0x0308:
avctx->pix_fmt = AV_PIX_FMT_RGB24;
break;
case 0x0108:
case 0x0104:
case 0x0102:
case 0x0101:
case 0x0401:
case 0x0301:
case 0x0201:
avctx->pix_fmt = AV_PIX_FMT_PAL8;
break;
default:
av_log(avctx, AV_LOG_ERROR, "invalid PCX file\n");
return AVERROR_INVALIDDATA;
}

bytestream2_skipu(&gb, 60);
@@ -144,22 +146,21 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
return AVERROR(ENOMEM);

if (nplanes == 3 && bits_per_pixel == 8) {
for (y=0; y<h; y++) {
for (y = 0; y < h; y++) {
pcx_rle_decode(&gb, scanline, bytes_per_scanline, compressed);

for (x=0; x<w; x++) {
ptr[3*x ] = scanline[x ];
ptr[3*x+1] = scanline[x+ bytes_per_line ];
ptr[3*x+2] = scanline[x+(bytes_per_line<<1)];
for (x = 0; x < w; x++) {
ptr[3 * x] = scanline[x];
ptr[3 * x + 1] = scanline[x + bytes_per_line];
ptr[3 * x + 2] = scanline[x + (bytes_per_line << 1)];
}

ptr += stride;
}

} else if (nplanes == 1 && bits_per_pixel == 8) {
int palstart = avpkt->size - 769;

for (y=0; y<h; y++, ptr+=stride) {
for (y = 0; y < h; y++, ptr += stride) {
pcx_rle_decode(&gb, scanline, bytes_per_scanline, compressed);
memcpy(ptr, scanline, w);
}
@@ -173,31 +174,29 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
ret = AVERROR_INVALIDDATA;
goto end;
}

} else if (nplanes == 1) { /* all packed formats, max. 16 colors */
GetBitContext s;

for (y=0; y<h; y++) {
for (y = 0; y < h; y++) {
init_get_bits8(&s, scanline, bytes_per_scanline);

pcx_rle_decode(&gb, 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 += stride;
}

} else { /* planar, 4, 8 or 16 colors */
int i;

for (y=0; y<h; y++) {
for (y = 0; y < h; y++) {
pcx_rle_decode(&gb, scanline, bytes_per_scanline, compressed);

for (x=0; x<w; x++) {
int m = 0x80 >> (x&7), v = 0;
for (i=nplanes - 1; i>=0; i--) {
for (x = 0; x < w; x++) {
int m = 0x80 >> (x & 7), v = 0;
for (i = nplanes - 1; i >= 0; i--) {
v <<= 1;
v += !!(scanline[i*bytes_per_line + (x>>3)] & m);
v += !!(scanline[i * bytes_per_line + (x >> 3)] & m);
}
ptr[x] = v;
}
@@ -207,14 +206,14 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,

ret = bytestream2_tell(&gb);
if (nplanes == 1 && bits_per_pixel == 8) {
pcx_palette(&gb, (uint32_t *) p->data[1], 256);
pcx_palette(&gb, (uint32_t *)p->data[1], 256);
ret += 256 * 3;
} else if (bits_per_pixel * nplanes == 1) {
AV_WN32A(p->data[1] , 0xFF000000);
AV_WN32A(p->data[1]+4, 0xFFFFFFFF);
} else if (bits_per_pixel < 8) {
bytestream2_seek(&gb, 16, SEEK_SET);
pcx_palette(&gb, (uint32_t *) p->data[1], 16);
pcx_palette(&gb, (uint32_t *)p->data[1], 16);
}

*got_frame = 1;
@@ -225,10 +224,10 @@ end:
}

AVCodec ff_pcx_decoder = {
.name = "pcx",
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_PCX,
.decode = pcx_decode_frame,
.capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("PC Paintbrush PCX image"),
.name = "pcx",
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_PCX,
.decode = pcx_decode_frame,
.capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("PC Paintbrush PCX image"),
};

Write Preview
Loading…
Cancel
Save