virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-14 22:22:59 +02:00
Code Issues Releases Activity

Merge commit '4a0918cae6394e503b17c71f8f171b4a795eb849'

Browse Source 
* commit '4a0918cae6394e503b17c71f8f171b4a795eb849':
  sgienc: Support encoding high bit depth images with RLE

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-11-29 15:49:31 +01:00
commit 7c56b8792c
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog
View File

@ -36,6 +36,7 @@ version <next>:
- IVR demuxer - IVR demuxer
- compensationdelay filter - compensationdelay filter
- acompressor filter - acompressor filter
- support encoding 16-bit RLE SGI images
version 2.8: version 2.8:

21
libavcodec/sgienc.c
View File

@ -46,7 +46,10 @@ static int sgi_rle_encode(PutByteContext *pbc, const uint8_t *src,
int val, count, x, start = bytestream2_tell_p(pbc); int val, count, x, start = bytestream2_tell_p(pbc);
void (*bytestream2_put)(PutByteContext *, unsigned int); void (*bytestream2_put)(PutByteContext *, unsigned int);
bytestream2_put = bytestream2_put_byte; if (bpp == 1)
bytestream2_put = bytestream2_put_byte;
else
bytestream2_put = bytestream2_put_be16;
for (x = 0; x < w; x += count) { for (x = 0; x < w; x += count) {
/* see if we can encode the next set of pixels with RLE */ /* see if we can encode the next set of pixels with RLE */
@ -55,7 +58,7 @@ static int sgi_rle_encode(PutByteContext *pbc, const uint8_t *src,
if (bytestream2_get_bytes_left_p(pbc) < bpp * 2) if (bytestream2_get_bytes_left_p(pbc) < bpp * 2)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
val = *src; val = bpp == 1 ? *src : AV_RB16(src);
bytestream2_put(pbc, count); bytestream2_put(pbc, count);
bytestream2_put(pbc, val); bytestream2_put(pbc, val);
} else { } else {
@ -67,7 +70,7 @@ static int sgi_rle_encode(PutByteContext *pbc, const uint8_t *src,
bytestream2_put(pbc, count + 0x80); bytestream2_put(pbc, count + 0x80);
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
val = src[i]; val = bpp == 1 ? src[i] : AV_RB16(src + i * bpp);
bytestream2_put(pbc, val); bytestream2_put(pbc, val);
} }
} }
@ -117,7 +120,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
case AV_PIX_FMT_GRAY16LE: case AV_PIX_FMT_GRAY16LE:
put_be = !HAVE_BIGENDIAN; put_be = !HAVE_BIGENDIAN;
case AV_PIX_FMT_GRAY16BE: case AV_PIX_FMT_GRAY16BE:
avctx->coder_type = FF_CODER_TYPE_RAW;
bytes_per_channel = 2; bytes_per_channel = 2;
pixmax = 0xFFFF; pixmax = 0xFFFF;
dimension = SGI_SINGLE_CHAN; dimension = SGI_SINGLE_CHAN;
@ -126,7 +128,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
case AV_PIX_FMT_RGB48LE: case AV_PIX_FMT_RGB48LE:
put_be = !HAVE_BIGENDIAN; put_be = !HAVE_BIGENDIAN;
case AV_PIX_FMT_RGB48BE: case AV_PIX_FMT_RGB48BE:
avctx->coder_type = FF_CODER_TYPE_RAW;
bytes_per_channel = 2; bytes_per_channel = 2;
pixmax = 0xFFFF; pixmax = 0xFFFF;
dimension = SGI_MULTI_CHAN; dimension = SGI_MULTI_CHAN;
@ -135,7 +136,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
case AV_PIX_FMT_RGBA64LE: case AV_PIX_FMT_RGBA64LE:
put_be = !HAVE_BIGENDIAN; put_be = !HAVE_BIGENDIAN;
case AV_PIX_FMT_RGBA64BE: case AV_PIX_FMT_RGBA64BE:
avctx->coder_type = FF_CODER_TYPE_RAW;
bytes_per_channel = 2; bytes_per_channel = 2;
pixmax = 0xFFFF; pixmax = 0xFFFF;
dimension = SGI_MULTI_CHAN; dimension = SGI_MULTI_CHAN;
@ -191,19 +191,20 @@ FF_ENABLE_DEPRECATION_WARNINGS
bytestream2_skip_p(&pbc, tablesize); bytestream2_skip_p(&pbc, tablesize);
/* Make an intermediate consecutive buffer. */ /* Make an intermediate consecutive buffer. */
if (!(encode_buf = av_malloc(width))) if (!(encode_buf = av_malloc(width * bytes_per_channel)))
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
for (z = 0; z < depth; z++) { for (z = 0; z < depth; z++) {
in_buf = p->data[0] + p->linesize[0] * (height - 1) + z; in_buf = p->data[0] + p->linesize[0] * (height - 1) + z * bytes_per_channel;
for (y = 0; y < height; y++) { for (y = 0; y < height; y++) {
bytestream2_put_be32(&taboff_pcb, bytestream2_tell_p(&pbc)); bytestream2_put_be32(&taboff_pcb, bytestream2_tell_p(&pbc));
for (x = 0; x < width; x++) for (x = 0; x < width * bytes_per_channel; x += bytes_per_channel)
encode_buf[x] = in_buf[depth * x]; encode_buf[x] = in_buf[depth * x];
length = sgi_rle_encode(&pbc, encode_buf, width, 1); length = sgi_rle_encode(&pbc, encode_buf, width,
bytes_per_channel);
if (length < 1) { if (length < 1) {
av_free(encode_buf); av_free(encode_buf);
return -1; return -1;