[FFmpeg-devel] [PATCH] Support uncompressed PCX scanlines
Peter Ross
pross
Sun Sep 27 04:01:18 CEST 2009
Sample here: http://roundup.ffmpeg.org/roundup/ffmpeg/issue1411
---
libavcodec/pcx.c | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/libavcodec/pcx.c b/libavcodec/pcx.c
index 43d7a5a..16d178e 100644
--- a/libavcodec/pcx.c
+++ b/libavcodec/pcx.c
@@ -43,10 +43,14 @@ static av_cold int pcx_init(AVCodecContext *avctx) {
* @return advanced src pointer
*/
static const uint8_t *pcx_rle_decode(const uint8_t *src, uint8_t *dst,
- unsigned int bytes_per_scanline) {
+ unsigned int bytes_per_scanline, int encoding) {
unsigned int i = 0;
unsigned char run, value;
+ if (encoding == 0) {
+ memcpy(dst, src, bytes_per_scanline);
+ src += bytes_per_scanline;
+ } else {
while (i<bytes_per_scanline) {
run = 1;
value = *src++;
@@ -57,6 +61,7 @@ static const uint8_t *pcx_rle_decode(const uint8_t *src, uint8_t *dst,
while (i<bytes_per_scanline && run--)
dst[i++] = value;
}
+ }
return src;
}
@@ -76,17 +81,18 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
PCXContext * const s = avctx->priv_data;
AVFrame *picture = data;
AVFrame * const p = &s->picture;
- int xmin, ymin, xmax, ymax;
+ int encoding, xmin, ymin, xmax, ymax;
unsigned int w, h, bits_per_pixel, bytes_per_line, nplanes, stride, y, x,
bytes_per_scanline;
uint8_t *ptr;
uint8_t const *bufstart = buf;
- if (buf[0] != 0x0a || buf[1] > 5 || buf[1] == 1 || buf[2] != 1) {
+ if (buf[0] != 0x0a || buf[1] > 5) {
av_log(avctx, AV_LOG_ERROR, "this is not PCX encoded data\n");
return -1;
}
+ encoding = buf[2];
xmin = AV_RL16(buf+ 4);
ymin = AV_RL16(buf+ 6);
xmax = AV_RL16(buf+ 8);
@@ -151,7 +157,7 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
uint8_t scanline[bytes_per_scanline];
for (y=0; y<h; y++) {
- buf = pcx_rle_decode(buf, scanline, bytes_per_scanline);
+ buf = pcx_rle_decode(buf, scanline, bytes_per_scanline, encoding);
for (x=0; x<w; x++) {
ptr[3*x ] = scanline[x ];
@@ -167,7 +173,7 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
const uint8_t *palstart = bufstart + buf_size - 769;
for (y=0; y<h; y++, ptr+=stride) {
- buf = pcx_rle_decode(buf, scanline, bytes_per_scanline);
+ buf = pcx_rle_decode(buf, scanline, bytes_per_scanline, encoding);
memcpy(ptr, scanline, w);
}
@@ -187,7 +193,7 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
for (y=0; y<h; y++) {
init_get_bits(&s, scanline, bytes_per_scanline<<3);
- buf = pcx_rle_decode(buf, scanline, bytes_per_scanline);
+ buf = pcx_rle_decode(buf, scanline, bytes_per_scanline, encoding);
for (x=0; x<w; x++)
ptr[x] = get_bits(&s, bits_per_pixel);
@@ -199,7 +205,7 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
int i;
for (y=0; y<h; y++) {
- buf = pcx_rle_decode(buf, scanline, bytes_per_scanline);
+ buf = pcx_rle_decode(buf, scanline, bytes_per_scanline, encoding);
for (x=0; x<w; x++) {
int m = 0x80 >> (x&7), v = 0;
--
1.6.0.4
-- Peter
(A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: Digital signature
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20090927/34547480/attachment.pgp>
More information about the ffmpeg-devel
mailing list