mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-07 11:13:41 +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>
260 lines
7.9 KiB
C
260 lines
7.9 KiB
C
/*
|
|
* Interplay C93 video decoder
|
|
* Copyright (c) 2007 Anssi Hannula <anssi.hannula@gmail.com>
|
|
*
|
|
* 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 "avcodec.h"
|
|
#include "bytestream.h"
|
|
#include "internal.h"
|
|
|
|
typedef struct {
|
|
AVFrame pictures[2];
|
|
int currentpic;
|
|
} C93DecoderContext;
|
|
|
|
typedef enum {
|
|
C93_8X8_FROM_PREV = 0x02,
|
|
C93_4X4_FROM_PREV = 0x06,
|
|
C93_4X4_FROM_CURR = 0x07,
|
|
C93_8X8_2COLOR = 0x08,
|
|
C93_4X4_2COLOR = 0x0A,
|
|
C93_4X4_4COLOR_GRP = 0x0B,
|
|
C93_4X4_4COLOR = 0x0D,
|
|
C93_NOOP = 0x0E,
|
|
C93_8X8_INTRA = 0x0F,
|
|
} C93BlockType;
|
|
|
|
#define WIDTH 320
|
|
#define HEIGHT 192
|
|
|
|
#define C93_HAS_PALETTE 0x01
|
|
#define C93_FIRST_FRAME 0x02
|
|
|
|
static av_cold int decode_init(AVCodecContext *avctx)
|
|
{
|
|
C93DecoderContext * const c93 = avctx->priv_data;
|
|
|
|
avcodec_get_frame_defaults(&c93->pictures[0]);
|
|
avcodec_get_frame_defaults(&c93->pictures[1]);
|
|
avctx->pix_fmt = AV_PIX_FMT_PAL8;
|
|
return 0;
|
|
}
|
|
|
|
static av_cold int decode_end(AVCodecContext *avctx)
|
|
{
|
|
C93DecoderContext * const c93 = avctx->priv_data;
|
|
|
|
av_frame_unref(&c93->pictures[0]);
|
|
av_frame_unref(&c93->pictures[1]);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static inline int copy_block(AVCodecContext *avctx, uint8_t *to,
|
|
uint8_t *from, int offset, int height, int stride)
|
|
{
|
|
int i;
|
|
int width = height;
|
|
int from_x = offset % WIDTH;
|
|
int from_y = offset / WIDTH;
|
|
int overflow = from_x + width - WIDTH;
|
|
|
|
if (!from) {
|
|
/* silently ignoring predictive blocks in first frame */
|
|
return 0;
|
|
}
|
|
|
|
if (from_y + height > HEIGHT) {
|
|
av_log(avctx, AV_LOG_ERROR, "invalid offset %d during C93 decoding\n",
|
|
offset);
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
|
|
if (overflow > 0) {
|
|
width -= overflow;
|
|
for (i = 0; i < height; i++) {
|
|
memcpy(&to[i*stride+width], &from[(from_y+i)*stride], overflow);
|
|
}
|
|
}
|
|
|
|
for (i = 0; i < height; i++) {
|
|
memcpy(&to[i*stride], &from[(from_y+i)*stride+from_x], width);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static inline void draw_n_color(uint8_t *out, int stride, int width,
|
|
int height, int bpp, uint8_t cols[4], uint8_t grps[4], uint32_t col)
|
|
{
|
|
int x, y;
|
|
for (y = 0; y < height; y++) {
|
|
if (grps)
|
|
cols[0] = grps[3 * (y >> 1)];
|
|
for (x = 0; x < width; x++) {
|
|
if (grps)
|
|
cols[1]= grps[(x >> 1) + 1];
|
|
out[x + y*stride] = cols[col & ((1 << bpp) - 1)];
|
|
col >>= bpp;
|
|
}
|
|
}
|
|
}
|
|
|
|
static int decode_frame(AVCodecContext *avctx, void *data,
|
|
int *got_frame, AVPacket *avpkt)
|
|
{
|
|
const uint8_t *buf = avpkt->data;
|
|
int buf_size = avpkt->size;
|
|
C93DecoderContext * const c93 = avctx->priv_data;
|
|
AVFrame * const newpic = &c93->pictures[c93->currentpic];
|
|
AVFrame * const oldpic = &c93->pictures[c93->currentpic^1];
|
|
GetByteContext gb;
|
|
uint8_t *out;
|
|
int stride, ret, i, x, y, b, bt = 0;
|
|
|
|
c93->currentpic ^= 1;
|
|
|
|
if ((ret = ff_reget_buffer(avctx, newpic)) < 0) {
|
|
av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
|
|
return ret;
|
|
}
|
|
|
|
stride = newpic->linesize[0];
|
|
|
|
bytestream2_init(&gb, buf, buf_size);
|
|
b = bytestream2_get_byte(&gb);
|
|
if (b & C93_FIRST_FRAME) {
|
|
newpic->pict_type = AV_PICTURE_TYPE_I;
|
|
newpic->key_frame = 1;
|
|
} else {
|
|
newpic->pict_type = AV_PICTURE_TYPE_P;
|
|
newpic->key_frame = 0;
|
|
}
|
|
|
|
for (y = 0; y < HEIGHT; y += 8) {
|
|
out = newpic->data[0] + y * stride;
|
|
for (x = 0; x < WIDTH; x += 8) {
|
|
uint8_t *copy_from = oldpic->data[0];
|
|
unsigned int offset, j;
|
|
uint8_t cols[4], grps[4];
|
|
C93BlockType block_type;
|
|
|
|
if (!bt)
|
|
bt = bytestream2_get_byte(&gb);
|
|
|
|
block_type= bt & 0x0F;
|
|
switch (block_type) {
|
|
case C93_8X8_FROM_PREV:
|
|
offset = bytestream2_get_le16(&gb);
|
|
if ((ret = copy_block(avctx, out, copy_from, offset, 8, stride)) < 0)
|
|
return ret;
|
|
break;
|
|
|
|
case C93_4X4_FROM_CURR:
|
|
copy_from = newpic->data[0];
|
|
case C93_4X4_FROM_PREV:
|
|
for (j = 0; j < 8; j += 4) {
|
|
for (i = 0; i < 8; i += 4) {
|
|
offset = bytestream2_get_le16(&gb);
|
|
if ((ret = copy_block(avctx, &out[j*stride+i],
|
|
copy_from, offset, 4, stride)) < 0)
|
|
return ret;
|
|
}
|
|
}
|
|
break;
|
|
|
|
case C93_8X8_2COLOR:
|
|
bytestream2_get_buffer(&gb, cols, 2);
|
|
for (i = 0; i < 8; i++) {
|
|
draw_n_color(out + i*stride, stride, 8, 1, 1, cols,
|
|
NULL, bytestream2_get_byte(&gb));
|
|
}
|
|
|
|
break;
|
|
|
|
case C93_4X4_2COLOR:
|
|
case C93_4X4_4COLOR:
|
|
case C93_4X4_4COLOR_GRP:
|
|
for (j = 0; j < 8; j += 4) {
|
|
for (i = 0; i < 8; i += 4) {
|
|
if (block_type == C93_4X4_2COLOR) {
|
|
bytestream2_get_buffer(&gb, cols, 2);
|
|
draw_n_color(out + i + j*stride, stride, 4, 4,
|
|
1, cols, NULL, bytestream2_get_le16(&gb));
|
|
} else if (block_type == C93_4X4_4COLOR) {
|
|
bytestream2_get_buffer(&gb, cols, 4);
|
|
draw_n_color(out + i + j*stride, stride, 4, 4,
|
|
2, cols, NULL, bytestream2_get_le32(&gb));
|
|
} else {
|
|
bytestream2_get_buffer(&gb, grps, 4);
|
|
draw_n_color(out + i + j*stride, stride, 4, 4,
|
|
1, cols, grps, bytestream2_get_le16(&gb));
|
|
}
|
|
}
|
|
}
|
|
break;
|
|
|
|
case C93_NOOP:
|
|
break;
|
|
|
|
case C93_8X8_INTRA:
|
|
for (j = 0; j < 8; j++)
|
|
bytestream2_get_buffer(&gb, out + j*stride, 8);
|
|
break;
|
|
|
|
default:
|
|
av_log(avctx, AV_LOG_ERROR, "unexpected type %x at %dx%d\n",
|
|
block_type, x, y);
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
bt >>= 4;
|
|
out += 8;
|
|
}
|
|
}
|
|
|
|
if (b & C93_HAS_PALETTE) {
|
|
uint32_t *palette = (uint32_t *) newpic->data[1];
|
|
for (i = 0; i < 256; i++) {
|
|
palette[i] = 0xFFU << 24 | bytestream2_get_be24(&gb);
|
|
}
|
|
newpic->palette_has_changed = 1;
|
|
} else {
|
|
if (oldpic->data[1])
|
|
memcpy(newpic->data[1], oldpic->data[1], 256 * 4);
|
|
}
|
|
|
|
if ((ret = av_frame_ref(data, newpic)) < 0)
|
|
return ret;
|
|
*got_frame = 1;
|
|
|
|
return buf_size;
|
|
}
|
|
|
|
AVCodec ff_c93_decoder = {
|
|
.name = "c93",
|
|
.type = AVMEDIA_TYPE_VIDEO,
|
|
.id = AV_CODEC_ID_C93,
|
|
.priv_data_size = sizeof(C93DecoderContext),
|
|
.init = decode_init,
|
|
.close = decode_end,
|
|
.decode = decode_frame,
|
|
.capabilities = CODEC_CAP_DR1,
|
|
.long_name = NULL_IF_CONFIG_SMALL("Interplay C93"),
|
|
};
|