mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02:00
80e9e63c94
* commit '759001c534287a96dc96d1e274665feb7059145d': lavc decoders: work with refcounted frames. Anton Khirnov (1): lavc decoders: work with refcounted frames. Clément Bœsch (47): lavc/ansi: reset file lavc/ansi: re-do refcounted frame changes from Anton fraps: reset file lavc/fraps: switch to refcounted frames gifdec: reset file lavc/gifdec: switch to refcounted frames dsicinav: resolve conflicts smc: resolve conflicts zmbv: resolve conflicts rpza: resolve conflicts vble: resolve conflicts xxan: resolve conflicts targa: resolve conflicts vmnc: resolve conflicts utvideodec: resolve conflicts tscc: resolve conflicts ulti: resolve conflicts ffv1dec: resolve conflicts dnxhddec: resolve conflicts v210dec: resolve conflicts vp3: resolve conflicts vcr1: resolve conflicts v210x: resolve conflicts wavpack: resolve conflicts pngdec: fix compilation roqvideodec: resolve conflicts pictordec: resolve conflicts mdec: resolve conflicts tiertexseqv: resolve conflicts smacker: resolve conflicts vb: resolve conflicts vqavideo: resolve conflicts xl: resolve conflicts tmv: resolve conflicts vmdav: resolve conflicts truemotion1: resolve conflicts truemotion2: resolve conflicts lcldec: fix compilation libcelt_dec: fix compilation qdrw: fix compilation r210dec: fix compilation rl2: fix compilation wnv1: fix compilation yop: fix compilation tiff: resolve conflicts interplayvideo: fix compilation qpeg: resolve conflicts (FIXME/TESTME). Hendrik Leppkes (33): 012v: convert to refcounted frames 8bps: fix compilation 8svx: resolve conflicts 4xm: resolve conflicts aasc: resolve conflicts bfi: fix compilation aura: fix compilation alsdec: resolve conflicts avrndec: convert to refcounted frames avuidec: convert to refcounted frames bintext: convert to refcounted frames cavsdec: resolve conflicts brender_pix: convert to refcounted frames cinepak: resolve conflicts cinepak: avoid using AVFrame struct directly in private context cljr: fix compilation cpia: convert to refcounted frames cscd: resolve conflicts iff: resolve conflicts and do proper conversion to refcounted frames 4xm: fix reference frame handling cyuv: fix compilation dxa: fix compilation eacmv: fix compilation eamad: fix compilation eatgv: fix compilation escape124: remove unused variable. escape130: convert to refcounted frames evrcdec: convert to refcounted frames exr: convert to refcounted frames mvcdec: convert to refcounted frames paf: properly free the frame data on decode close sgirle: convert to refcounted frames lavfi/moviesrc: use refcounted frames Michael Niedermayer (56): Merge commit '759001c534287a96dc96d1e274665feb7059145d' resolve conflicts in headers motion_est: resolve conflict mpeg4videodec: fix conflicts dpcm conflict fix dpx: fix conflicts indeo3: resolve confilcts kmvc: resolve conflicts kmvc: resolve conflicts h264: resolve conflicts utils: resolve conflicts rawdec: resolve conflcits mpegvideo: resolve conflicts svq1enc: resolve conflicts mpegvideo: dont clear data, fix assertion failure on fate vsynth1 with threads pthreads: resolve conflicts frame_thread_encoder: simple compilefix not yet tested snow: update to buffer refs crytsalhd: fix compile dirac: switch to new API sonic: update to new API svq1: resolve conflict, update to new API ffwavesynth: update to new buffer API g729: update to new API indeo5: fix compile j2kdec: update to new buffer API linopencore-amr: fix compile libvorbisdec: update to new API loco: fix compile paf: update to new API proresdec: update to new API vp56: update to new api / resolve conflicts xface: convert to refcounted frames xan: fix compile&fate v408: update to ref counted buffers v308: update to ref counted buffers yuv4dec: update to ref counted buffers y41p: update to ref counted frames xbm: update to refcounted frames targa_y216: update to refcounted buffers qpeg: fix fate/crash cdxl: fix fate tscc: fix reget buffer useage targa_y216dec: fix style msmpeg4: fix fate h264: ref_picture() copy fields that have been lost too update_frame_pool: use channel field h264: Put code that prevents deadlocks back mpegvideo: dont allow last == current wmalossless: fix buffer ref messup ff_alloc_picture: free tables in case of dimension mismatches h264: fix null pointer dereference and assertion failure frame_thread_encoder: update to bufrefs ec: fix used arrays snowdec: fix off by 1 error in dimensions check h264: disallow single unpaired fields as references of frames Paul B Mahol (2): lavc/vima: convert to refcounted frames sanm: convert to refcounted frames Conflicts: libavcodec/4xm.c libavcodec/8bps.c libavcodec/8svx.c libavcodec/aasc.c libavcodec/alsdec.c libavcodec/anm.c libavcodec/ansi.c libavcodec/avs.c libavcodec/bethsoftvideo.c libavcodec/bfi.c libavcodec/c93.c libavcodec/cavsdec.c libavcodec/cdgraphics.c libavcodec/cinepak.c libavcodec/cljr.c libavcodec/cscd.c libavcodec/dnxhddec.c libavcodec/dpcm.c libavcodec/dpx.c libavcodec/dsicinav.c libavcodec/dvdec.c libavcodec/dxa.c libavcodec/eacmv.c libavcodec/eamad.c libavcodec/eatgq.c libavcodec/eatgv.c libavcodec/eatqi.c libavcodec/error_resilience.c libavcodec/escape124.c libavcodec/ffv1.h libavcodec/ffv1dec.c libavcodec/flicvideo.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/g723_1.c libavcodec/gifdec.c libavcodec/h264.c libavcodec/h264.h libavcodec/h264_direct.c libavcodec/h264_loopfilter.c libavcodec/h264_refs.c libavcodec/huffyuvdec.c libavcodec/idcinvideo.c libavcodec/iff.c libavcodec/indeo2.c libavcodec/indeo3.c libavcodec/internal.h libavcodec/interplayvideo.c libavcodec/ivi_common.c libavcodec/jvdec.c libavcodec/kgv1dec.c libavcodec/kmvc.c libavcodec/lagarith.c libavcodec/libopenjpegdec.c libavcodec/mdec.c libavcodec/mimic.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mmvideo.c libavcodec/motion_est.c libavcodec/motionpixels.c libavcodec/mpc7.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo.h libavcodec/msrle.c libavcodec/msvideo1.c libavcodec/nuv.c libavcodec/options_table.h libavcodec/pcx.c libavcodec/pictordec.c libavcodec/pngdec.c libavcodec/pnmdec.c libavcodec/pthread.c libavcodec/qpeg.c libavcodec/qtrle.c libavcodec/r210dec.c libavcodec/rawdec.c libavcodec/roqvideodec.c libavcodec/rpza.c libavcodec/smacker.c libavcodec/smc.c libavcodec/svq1dec.c libavcodec/svq1enc.c libavcodec/targa.c libavcodec/tiertexseqv.c libavcodec/tiff.c libavcodec/tmv.c libavcodec/truemotion1.c libavcodec/truemotion2.c libavcodec/tscc.c libavcodec/ulti.c libavcodec/utils.c libavcodec/utvideodec.c libavcodec/v210dec.c libavcodec/v210x.c libavcodec/vb.c libavcodec/vble.c libavcodec/vcr1.c libavcodec/vmdav.c libavcodec/vmnc.c libavcodec/vp3.c libavcodec/vp56.c libavcodec/vp56.h libavcodec/vp6.c libavcodec/vqavideo.c libavcodec/wavpack.c libavcodec/xl.c libavcodec/xxan.c libavcodec/zmbv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
246 lines
7.4 KiB
C
246 lines
7.4 KiB
C
/*
|
|
* SGI image decoder
|
|
* Todd Kirby <doubleshot@pacbell.net>
|
|
*
|
|
* This file is part of FFmpeg.
|
|
*
|
|
* FFmpeg is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* FFmpeg is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with FFmpeg; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#include "libavutil/imgutils.h"
|
|
#include "libavutil/avassert.h"
|
|
#include "avcodec.h"
|
|
#include "bytestream.h"
|
|
#include "internal.h"
|
|
#include "sgi.h"
|
|
|
|
typedef struct SgiState {
|
|
unsigned int width;
|
|
unsigned int height;
|
|
unsigned int depth;
|
|
unsigned int bytes_per_channel;
|
|
int linesize;
|
|
GetByteContext g;
|
|
} SgiState;
|
|
|
|
/**
|
|
* Expand an RLE row into a channel.
|
|
* @param s the current image state
|
|
* @param out_buf Points to one line after the output buffer.
|
|
* @param out_end end of line in output buffer
|
|
* @param pixelstride pixel stride of input buffer
|
|
* @return size of output in bytes, -1 if buffer overflows
|
|
*/
|
|
static int expand_rle_row(SgiState *s, uint8_t *out_buf,
|
|
uint8_t *out_end, int pixelstride)
|
|
{
|
|
unsigned char pixel, count;
|
|
unsigned char *orig = out_buf;
|
|
|
|
while (out_buf < out_end) {
|
|
if (bytestream2_get_bytes_left(&s->g) < 1)
|
|
return AVERROR_INVALIDDATA;
|
|
pixel = bytestream2_get_byteu(&s->g);
|
|
if (!(count = (pixel & 0x7f))) {
|
|
break;
|
|
}
|
|
|
|
/* Check for buffer overflow. */
|
|
if(out_buf + pixelstride * (count-1) >= out_end) return -1;
|
|
|
|
if (pixel & 0x80) {
|
|
while (count--) {
|
|
*out_buf = bytestream2_get_byte(&s->g);
|
|
out_buf += pixelstride;
|
|
}
|
|
} else {
|
|
pixel = bytestream2_get_byte(&s->g);
|
|
|
|
while (count--) {
|
|
*out_buf = pixel;
|
|
out_buf += pixelstride;
|
|
}
|
|
}
|
|
}
|
|
return (out_buf - orig) / pixelstride;
|
|
}
|
|
|
|
/**
|
|
* Read a run length encoded SGI image.
|
|
* @param out_buf output buffer
|
|
* @param s the current image state
|
|
* @return 0 if no error, else return error number.
|
|
*/
|
|
static int read_rle_sgi(uint8_t *out_buf, SgiState *s)
|
|
{
|
|
uint8_t *dest_row;
|
|
unsigned int len = s->height * s->depth * 4;
|
|
GetByteContext g_table = s->g;
|
|
unsigned int y, z;
|
|
unsigned int start_offset;
|
|
|
|
/* size of RLE offset and length tables */
|
|
if (len * 2 > bytestream2_get_bytes_left(&s->g)) {
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
|
|
for (z = 0; z < s->depth; z++) {
|
|
dest_row = out_buf;
|
|
for (y = 0; y < s->height; y++) {
|
|
dest_row -= s->linesize;
|
|
start_offset = bytestream2_get_be32(&g_table);
|
|
bytestream2_seek(&s->g, start_offset, SEEK_SET);
|
|
if (expand_rle_row(s, dest_row + z, dest_row + s->width*s->depth,
|
|
s->depth) != s->width) {
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* Read an uncompressed SGI image.
|
|
* @param out_buf output buffer
|
|
* @param s the current image state
|
|
* @return 0 if read success, otherwise return -1.
|
|
*/
|
|
static int read_uncompressed_sgi(unsigned char* out_buf, SgiState *s)
|
|
{
|
|
int x, y, z;
|
|
unsigned int offset = s->height * s->width * s->bytes_per_channel;
|
|
GetByteContext gp[4];
|
|
uint8_t *out_end;
|
|
|
|
/* Test buffer size. */
|
|
if (offset * s->depth > bytestream2_get_bytes_left(&s->g))
|
|
return AVERROR_INVALIDDATA;
|
|
|
|
/* Create a reader for each plane */
|
|
for (z = 0; z < s->depth; z++) {
|
|
gp[z] = s->g;
|
|
bytestream2_skip(&gp[z], z * offset);
|
|
}
|
|
|
|
for (y = s->height - 1; y >= 0; y--) {
|
|
out_end = out_buf + (y * s->linesize);
|
|
if (s->bytes_per_channel == 1) {
|
|
for (x = s->width; x > 0; x--)
|
|
for (z = 0; z < s->depth; z++)
|
|
*out_end++ = bytestream2_get_byteu(&gp[z]);
|
|
} else {
|
|
uint16_t *out16 = (uint16_t *)out_end;
|
|
for (x = s->width; x > 0; x--)
|
|
for (z = 0; z < s->depth; z++)
|
|
*out16++ = bytestream2_get_ne16u(&gp[z]);
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int decode_frame(AVCodecContext *avctx,
|
|
void *data, int *got_frame,
|
|
AVPacket *avpkt)
|
|
{
|
|
SgiState *s = avctx->priv_data;
|
|
AVFrame *p = data;
|
|
unsigned int dimension, rle;
|
|
int ret = 0;
|
|
uint8_t *out_buf, *out_end;
|
|
|
|
bytestream2_init(&s->g, avpkt->data, avpkt->size);
|
|
if (bytestream2_get_bytes_left(&s->g) < SGI_HEADER_SIZE) {
|
|
av_log(avctx, AV_LOG_ERROR, "buf_size too small (%d)\n", avpkt->size);
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
|
|
/* Test for SGI magic. */
|
|
if (bytestream2_get_be16u(&s->g) != SGI_MAGIC) {
|
|
av_log(avctx, AV_LOG_ERROR, "bad magic number\n");
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
|
|
rle = bytestream2_get_byteu(&s->g);
|
|
s->bytes_per_channel = bytestream2_get_byteu(&s->g);
|
|
dimension = bytestream2_get_be16u(&s->g);
|
|
s->width = bytestream2_get_be16u(&s->g);
|
|
s->height = bytestream2_get_be16u(&s->g);
|
|
s->depth = bytestream2_get_be16u(&s->g);
|
|
|
|
if (s->bytes_per_channel != 1 && (s->bytes_per_channel != 2 || rle)) {
|
|
av_log(avctx, AV_LOG_ERROR, "wrong channel number\n");
|
|
return -1;
|
|
}
|
|
|
|
/* Check for supported image dimensions. */
|
|
if (dimension != 2 && dimension != 3) {
|
|
av_log(avctx, AV_LOG_ERROR, "wrong dimension number\n");
|
|
return -1;
|
|
}
|
|
|
|
if (s->depth == SGI_GRAYSCALE) {
|
|
avctx->pix_fmt = s->bytes_per_channel == 2 ? AV_PIX_FMT_GRAY16BE : AV_PIX_FMT_GRAY8;
|
|
} else if (s->depth == SGI_RGB) {
|
|
avctx->pix_fmt = s->bytes_per_channel == 2 ? AV_PIX_FMT_RGB48BE : AV_PIX_FMT_RGB24;
|
|
} else if (s->depth == SGI_RGBA) {
|
|
avctx->pix_fmt = s->bytes_per_channel == 2 ? AV_PIX_FMT_RGBA64BE : AV_PIX_FMT_RGBA;
|
|
} else {
|
|
av_log(avctx, AV_LOG_ERROR, "wrong picture format\n");
|
|
return -1;
|
|
}
|
|
|
|
if (av_image_check_size(s->width, s->height, 0, avctx))
|
|
return -1;
|
|
avcodec_set_dimensions(avctx, s->width, s->height);
|
|
|
|
if (ff_get_buffer(avctx, p, 0) < 0) {
|
|
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed.\n");
|
|
return -1;
|
|
}
|
|
|
|
p->pict_type = AV_PICTURE_TYPE_I;
|
|
p->key_frame = 1;
|
|
out_buf = p->data[0];
|
|
|
|
out_end = out_buf + p->linesize[0] * s->height;
|
|
|
|
s->linesize = p->linesize[0];
|
|
|
|
/* Skip header. */
|
|
bytestream2_seek(&s->g, SGI_HEADER_SIZE, SEEK_SET);
|
|
if (rle) {
|
|
ret = read_rle_sgi(out_end, s);
|
|
} else {
|
|
ret = read_uncompressed_sgi(out_buf, s);
|
|
}
|
|
|
|
if (ret == 0) {
|
|
*got_frame = 1;
|
|
return avpkt->size;
|
|
} else {
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
AVCodec ff_sgi_decoder = {
|
|
.name = "sgi",
|
|
.type = AVMEDIA_TYPE_VIDEO,
|
|
.id = AV_CODEC_ID_SGI,
|
|
.priv_data_size = sizeof(SgiState),
|
|
.decode = decode_frame,
|
|
.long_name = NULL_IF_CONFIG_SMALL("SGI image"),
|
|
.capabilities = CODEC_CAP_DR1,
|
|
};
|