virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Add support for SGI images without RLE compression.

Browse Source 
patch by Anne-Laure de Smit, annelaure.desmit gmail com

Originally committed as revision 20104 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Anne-Laure de Smit 2009-09-30 21:23:47 +00:00 committed by Diego Biurrun
parent 5200b90147
commit 2aa6e87a97
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/sgienc.c
View File

@ -83,7 +83,7 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf,
/* Encode header. */ /* Encode header. */
bytestream_put_be16(&buf, SGI_MAGIC); bytestream_put_be16(&buf, SGI_MAGIC);
bytestream_put_byte(&buf, 1); /* RLE */ bytestream_put_byte(&buf, avctx->coder_type != FF_CODER_TYPE_RAW); /* RLE 1 - VERBATIM 0*/
bytestream_put_byte(&buf, 1); /* bytes_per_channel */ bytestream_put_byte(&buf, 1); /* bytes_per_channel */
bytestream_put_be16(&buf, dimension); bytestream_put_be16(&buf, dimension);
bytestream_put_be16(&buf, width); bytestream_put_be16(&buf, width);
@ -106,6 +106,7 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf,
buf += 404; buf += 404;
offsettab = buf; offsettab = buf;
if (avctx->coder_type != FF_CODER_TYPE_RAW) {
/* Skip RLE offset table. */ /* Skip RLE offset table. */
buf += tablesize; buf += tablesize;
lengthtab = buf; lengthtab = buf;
@ -139,6 +140,19 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf,
} }
av_free(encode_buf); av_free(encode_buf);
} else {
for (z = 0; z < depth; z++) {
in_buf = p->data[0] + p->linesize[0] * (height - 1) + z;
for (y = 0; y < height; y++) {
for (x = 0; x < width * depth; x += depth)
bytestream_put_byte(&buf, in_buf[x]);
in_buf -= p->linesize[0];
}
}
}
/* total length */ /* total length */
return buf - orig_buf; return buf - orig_buf;
} }