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>
290 lines
9.0 KiB
C
290 lines
9.0 KiB
C
/*
|
|
* Silicon Graphics Motion Video Compressor 1 & 2 decoder
|
|
* Copyright (c) 2012 Peter Ross
|
|
*
|
|
* 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
|
|
*/
|
|
|
|
/**
|
|
* @file
|
|
* Silicon Graphics Motion Video Compressor 1 & 2 decoder
|
|
*/
|
|
|
|
#include "libavutil/intreadwrite.h"
|
|
#include "avcodec.h"
|
|
#include "bytestream.h"
|
|
#include "internal.h"
|
|
|
|
typedef struct MvcContext {
|
|
AVFrame *frame;
|
|
int vflip;
|
|
} MvcContext;
|
|
|
|
static av_cold int mvc_decode_init(AVCodecContext *avctx)
|
|
{
|
|
MvcContext *s = avctx->priv_data;
|
|
int width = avctx->width;
|
|
int height = avctx->height;
|
|
|
|
if (avctx->codec_id == AV_CODEC_ID_MVC1) {
|
|
width += 3;
|
|
height += 3;
|
|
}
|
|
width &= ~3;
|
|
height &= ~3;
|
|
if (width != avctx->width || height != avctx->height)
|
|
avcodec_set_dimensions(avctx, width, height);
|
|
|
|
avctx->pix_fmt = (avctx->codec_id == AV_CODEC_ID_MVC1) ? AV_PIX_FMT_RGB555 : AV_PIX_FMT_BGRA;
|
|
s->frame = av_frame_alloc();
|
|
if (!s->frame)
|
|
return AVERROR(ENOMEM);
|
|
|
|
s->vflip = avctx->extradata_size >= 9 && !memcmp(avctx->extradata + avctx->extradata_size - 9, "BottomUp", 9);
|
|
return 0;
|
|
}
|
|
|
|
static int decode_mvc1(AVCodecContext *avctx, GetByteContext *gb, uint8_t *dst_start, int width, int height, int linesize)
|
|
{
|
|
uint8_t *dst;
|
|
uint16_t v[8];
|
|
int mask, x, y, i;
|
|
|
|
x = y= 0;
|
|
while (bytestream2_get_bytes_left(gb) >= 6) {
|
|
mask = bytestream2_get_be16u(gb);
|
|
v[0] = bytestream2_get_be16u(gb);
|
|
v[1] = bytestream2_get_be16u(gb);
|
|
if ((v[0] & 0x8000)) {
|
|
if (bytestream2_get_bytes_left(gb) < 12) {
|
|
av_log(avctx, AV_LOG_WARNING, "buffer overflow\n");
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
for (i = 2; i < 8; i++)
|
|
v[i] = bytestream2_get_be16u(gb);
|
|
} else {
|
|
v[2] = v[4] = v[6] = v[0];
|
|
v[3] = v[5] = v[7] = v[1];
|
|
}
|
|
|
|
#define PIX16(target, true, false) \
|
|
i = (mask & target) ? true : false; \
|
|
AV_WN16A(dst, (v[i] & 0x7C00) | (v[i] & 0x3E0) | (v[i] & 0x1F)); \
|
|
dst += 2;
|
|
|
|
#define ROW16(row, a1, a0, b1, b0) \
|
|
dst = dst_start + (y + row) * linesize + x * 2; \
|
|
PIX16(1 << (row * 4), a1, a0) \
|
|
PIX16(1 << (row * 4 + 1), a1, a0) \
|
|
PIX16(1 << (row * 4 + 2), b1, b0) \
|
|
PIX16(1 << (row * 4 + 3), b1, b0)
|
|
|
|
ROW16(0, 0, 1, 2, 3);
|
|
ROW16(1, 0, 1, 2, 3);
|
|
ROW16(2, 4, 5, 6, 7);
|
|
ROW16(3, 4, 5, 6, 7);
|
|
|
|
x += 4;
|
|
if (x >= width) {
|
|
y += 4;
|
|
if (y >= height) {
|
|
break;
|
|
}
|
|
x = 0;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static void set_4x4_block(uint8_t *dst, int linesize, uint32_t pixel)
|
|
{
|
|
int i, j;
|
|
for (j = 0; j < 4; j++)
|
|
for (i = 0; i < 4; i++)
|
|
AV_WN32A(dst + j * linesize + i * 4, pixel);
|
|
}
|
|
|
|
#define PIX32(target, true, false) \
|
|
AV_WN32A(dst, (mask & target) ? v[true] : v[false]); \
|
|
dst += 4;
|
|
|
|
#define ROW32(row, a1, a0, b1, b0) \
|
|
dst = dst_start + (y + row) * linesize + x * 4; \
|
|
PIX32(1 << (row * 4), a1, a0) \
|
|
PIX32(1 << (row * 4 + 1), a1, a0) \
|
|
PIX32(1 << (row * 4 + 2), b1, b0) \
|
|
PIX32(1 << (row * 4 + 3), b1, b0)
|
|
|
|
#define MVC2_BLOCK \
|
|
ROW32(0, 1, 0, 3, 2); \
|
|
ROW32(1, 1, 0, 3, 2); \
|
|
ROW32(2, 5, 4, 7, 6); \
|
|
ROW32(3, 5, 4, 7, 6);
|
|
|
|
static int decode_mvc2(AVCodecContext *avctx, GetByteContext *gb, uint8_t *dst_start, int width, int height, int linesize, int vflip)
|
|
{
|
|
uint8_t *dst;
|
|
uint32_t color[128], v[8];
|
|
int w, h, nb_colors, i, x, y, p0, p1, mask;
|
|
|
|
if (bytestream2_get_bytes_left(gb) < 6)
|
|
return AVERROR_INVALIDDATA;
|
|
|
|
w = bytestream2_get_be16u(gb);
|
|
h = bytestream2_get_be16u(gb);
|
|
if ((w & ~3) != width || (h & ~3) != height)
|
|
av_log(avctx, AV_LOG_WARNING, "dimension mismatch\n");
|
|
|
|
if (bytestream2_get_byteu(gb)) {
|
|
av_log_ask_for_sample(avctx, "bitmap feature\n");
|
|
return AVERROR_PATCHWELCOME;
|
|
}
|
|
|
|
nb_colors = bytestream2_get_byteu(gb);
|
|
if (bytestream2_get_bytes_left(gb) < nb_colors * 3)
|
|
return AVERROR_INVALIDDATA;
|
|
for (i = 0; i < FFMIN(nb_colors, 128); i++)
|
|
color[i] = 0xFF000000 | bytestream2_get_be24u(gb);
|
|
if (nb_colors > 128)
|
|
bytestream2_skip(gb, (nb_colors - 128) * 3);
|
|
|
|
if (vflip) {
|
|
dst_start += (height - 1) * linesize;
|
|
linesize = -linesize;
|
|
}
|
|
x = y = 0;
|
|
while (bytestream2_get_bytes_left(gb) >= 1) {
|
|
p0 = bytestream2_get_byteu(gb);
|
|
if ((p0 & 0x80)) {
|
|
if ((p0 & 0x40)) {
|
|
p0 &= 0x3F;
|
|
p0 = (p0 << 2) | (p0 >> 4);
|
|
set_4x4_block(dst_start + y * linesize + x * 4, linesize, 0xFF000000 | (p0 << 16) | (p0 << 8) | p0);
|
|
} else {
|
|
int g, r;
|
|
p0 &= 0x3F;
|
|
p0 = (p0 << 2) | (p0 >> 4);
|
|
if (bytestream2_get_bytes_left(gb) < 2)
|
|
return AVERROR_INVALIDDATA;
|
|
g = bytestream2_get_byteu(gb);
|
|
r = bytestream2_get_byteu(gb);
|
|
set_4x4_block(dst_start + y * linesize + x * 4, linesize, 0xFF000000 | (r << 16) | (g << 8) | p0);
|
|
}
|
|
} else {
|
|
if (bytestream2_get_bytes_left(gb) < 1)
|
|
return AVERROR_INVALIDDATA;
|
|
p1 = bytestream2_get_byteu(gb);
|
|
if ((p1 & 0x80)) {
|
|
if ((p0 & 0x7F) == (p1 & 0x7F)) {
|
|
set_4x4_block(dst_start + y * linesize + x * 4, linesize, color[p0 & 0x7F]);
|
|
} else {
|
|
if (bytestream2_get_bytes_left(gb) < 2)
|
|
return AVERROR_INVALIDDATA;
|
|
v[0] = v[2] = v[4] = v[6] = color[p0 & 0x7F];
|
|
v[1] = v[3] = v[5] = v[7] = color[p1 & 0x7F];
|
|
mask = bytestream2_get_le16u(gb);
|
|
MVC2_BLOCK
|
|
}
|
|
} else {
|
|
if (bytestream2_get_bytes_left(gb) < 8)
|
|
return AVERROR_INVALIDDATA;
|
|
v[0] = color[p0 & 0x7F];
|
|
v[1] = color[p1 & 0x7F];
|
|
for (i = 2; i < 8; i++)
|
|
v[i] = color[bytestream2_get_byteu(gb) & 0x7F];
|
|
mask = bytestream2_get_le16u(gb);
|
|
MVC2_BLOCK
|
|
}
|
|
}
|
|
|
|
x += 4;
|
|
if (x >= width) {
|
|
y += 4;
|
|
if (y >= height)
|
|
break;
|
|
x = 0;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int mvc_decode_frame(AVCodecContext *avctx,
|
|
void *data, int *got_frame,
|
|
AVPacket *avpkt)
|
|
{
|
|
MvcContext *s = avctx->priv_data;
|
|
GetByteContext gb;
|
|
int ret;
|
|
|
|
ret = ff_reget_buffer(avctx, s->frame);
|
|
if (ret < 0) {
|
|
av_log (avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
|
|
return AVERROR(ENOMEM);
|
|
}
|
|
|
|
bytestream2_init(&gb, avpkt->data, avpkt->size);
|
|
if (avctx->codec_id == AV_CODEC_ID_MVC1)
|
|
ret = decode_mvc1(avctx, &gb, s->frame->data[0], avctx->width, avctx->height, s->frame->linesize[0]);
|
|
else
|
|
ret = decode_mvc2(avctx, &gb, s->frame->data[0], avctx->width, avctx->height, s->frame->linesize[0], s->vflip);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
*got_frame = 1;
|
|
if ((ret = av_frame_ref(data, s->frame)) < 0)
|
|
return ret;
|
|
|
|
return avpkt->size;
|
|
}
|
|
|
|
static av_cold int mvc_decode_end(AVCodecContext *avctx)
|
|
{
|
|
MvcContext *s = avctx->priv_data;
|
|
|
|
av_frame_free(&s->frame);
|
|
|
|
return 0;
|
|
}
|
|
|
|
#if CONFIG_MVC1_DECODER
|
|
AVCodec ff_mvc1_decoder = {
|
|
.name = "mvc1",
|
|
.type = AVMEDIA_TYPE_VIDEO,
|
|
.id = AV_CODEC_ID_MVC1,
|
|
.priv_data_size = sizeof(MvcContext),
|
|
.init = mvc_decode_init,
|
|
.close = mvc_decode_end,
|
|
.decode = mvc_decode_frame,
|
|
.capabilities = CODEC_CAP_DR1,
|
|
.long_name = NULL_IF_CONFIG_SMALL("Silicon Graphics Motion Video Compressor 1"),
|
|
};
|
|
#endif
|
|
|
|
#if CONFIG_MVC2_DECODER
|
|
AVCodec ff_mvc2_decoder = {
|
|
.name = "mvc2",
|
|
.type = AVMEDIA_TYPE_VIDEO,
|
|
.id = AV_CODEC_ID_MVC2,
|
|
.priv_data_size = sizeof(MvcContext),
|
|
.init = mvc_decode_init,
|
|
.close = mvc_decode_end,
|
|
.decode = mvc_decode_frame,
|
|
.capabilities = CODEC_CAP_DR1,
|
|
.long_name = NULL_IF_CONFIG_SMALL("Silicon Graphics Motion Video Compressor 2"),
|
|
};
|
|
#endif
|