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>
189 lines
5.3 KiB
C
189 lines
5.3 KiB
C
/*
|
|
* AVS video decoder.
|
|
* Copyright (c) 2006 Aurelien Jacobs <aurel@gnuage.org>
|
|
*
|
|
* 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 "get_bits.h"
|
|
#include "internal.h"
|
|
|
|
|
|
typedef struct {
|
|
AVFrame picture;
|
|
} AvsContext;
|
|
|
|
typedef enum {
|
|
AVS_VIDEO = 0x01,
|
|
AVS_AUDIO = 0x02,
|
|
AVS_PALETTE = 0x03,
|
|
AVS_GAME_DATA = 0x04,
|
|
} AvsBlockType;
|
|
|
|
typedef enum {
|
|
AVS_I_FRAME = 0x00,
|
|
AVS_P_FRAME_3X3 = 0x01,
|
|
AVS_P_FRAME_2X2 = 0x02,
|
|
AVS_P_FRAME_2X3 = 0x03,
|
|
} AvsVideoSubType;
|
|
|
|
|
|
static int
|
|
avs_decode_frame(AVCodecContext * avctx,
|
|
void *data, int *got_frame, AVPacket *avpkt)
|
|
{
|
|
const uint8_t *buf = avpkt->data;
|
|
const uint8_t *buf_end = avpkt->data + avpkt->size;
|
|
int buf_size = avpkt->size;
|
|
AvsContext *const avs = avctx->priv_data;
|
|
AVFrame *picture = data;
|
|
AVFrame *const p = &avs->picture;
|
|
const uint8_t *table, *vect;
|
|
uint8_t *out;
|
|
int i, j, x, y, stride, ret, vect_w = 3, vect_h = 3;
|
|
AvsVideoSubType sub_type;
|
|
AvsBlockType type;
|
|
GetBitContext change_map = {0}; //init to silence warning
|
|
|
|
if ((ret = ff_reget_buffer(avctx, p)) < 0) {
|
|
av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
|
|
return ret;
|
|
}
|
|
p->pict_type = AV_PICTURE_TYPE_P;
|
|
p->key_frame = 0;
|
|
|
|
out = avs->picture.data[0];
|
|
stride = avs->picture.linesize[0];
|
|
|
|
if (buf_end - buf < 4)
|
|
return AVERROR_INVALIDDATA;
|
|
sub_type = buf[0];
|
|
type = buf[1];
|
|
buf += 4;
|
|
|
|
if (type == AVS_PALETTE) {
|
|
int first, last;
|
|
uint32_t *pal = (uint32_t *) avs->picture.data[1];
|
|
|
|
first = AV_RL16(buf);
|
|
last = first + AV_RL16(buf + 2);
|
|
if (first >= 256 || last > 256 || buf_end - buf < 4 + 4 + 3 * (last - first))
|
|
return AVERROR_INVALIDDATA;
|
|
buf += 4;
|
|
for (i=first; i<last; i++, buf+=3) {
|
|
pal[i] = (buf[0] << 18) | (buf[1] << 10) | (buf[2] << 2);
|
|
pal[i] |= 0xFFU << 24 | (pal[i] >> 6) & 0x30303;
|
|
}
|
|
|
|
sub_type = buf[0];
|
|
type = buf[1];
|
|
buf += 4;
|
|
}
|
|
|
|
if (type != AVS_VIDEO)
|
|
return AVERROR_INVALIDDATA;
|
|
|
|
switch (sub_type) {
|
|
case AVS_I_FRAME:
|
|
p->pict_type = AV_PICTURE_TYPE_I;
|
|
p->key_frame = 1;
|
|
case AVS_P_FRAME_3X3:
|
|
vect_w = 3;
|
|
vect_h = 3;
|
|
break;
|
|
|
|
case AVS_P_FRAME_2X2:
|
|
vect_w = 2;
|
|
vect_h = 2;
|
|
break;
|
|
|
|
case AVS_P_FRAME_2X3:
|
|
vect_w = 2;
|
|
vect_h = 3;
|
|
break;
|
|
|
|
default:
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
|
|
if (buf_end - buf < 256 * vect_w * vect_h)
|
|
return AVERROR_INVALIDDATA;
|
|
table = buf + (256 * vect_w * vect_h);
|
|
if (sub_type != AVS_I_FRAME) {
|
|
int map_size = ((318 / vect_w + 7) / 8) * (198 / vect_h);
|
|
if (buf_end - table < map_size)
|
|
return AVERROR_INVALIDDATA;
|
|
init_get_bits(&change_map, table, map_size * 8);
|
|
table += map_size;
|
|
}
|
|
|
|
for (y=0; y<198; y+=vect_h) {
|
|
for (x=0; x<318; x+=vect_w) {
|
|
if (sub_type == AVS_I_FRAME || get_bits1(&change_map)) {
|
|
if (buf_end - table < 1)
|
|
return AVERROR_INVALIDDATA;
|
|
vect = &buf[*table++ * (vect_w * vect_h)];
|
|
for (j=0; j<vect_w; j++) {
|
|
out[(y + 0) * stride + x + j] = vect[(0 * vect_w) + j];
|
|
out[(y + 1) * stride + x + j] = vect[(1 * vect_w) + j];
|
|
if (vect_h == 3)
|
|
out[(y + 2) * stride + x + j] =
|
|
vect[(2 * vect_w) + j];
|
|
}
|
|
}
|
|
}
|
|
if (sub_type != AVS_I_FRAME)
|
|
align_get_bits(&change_map);
|
|
}
|
|
|
|
if ((ret = av_frame_ref(picture, &avs->picture)) < 0)
|
|
return ret;
|
|
*got_frame = 1;
|
|
|
|
return buf_size;
|
|
}
|
|
|
|
static av_cold int avs_decode_init(AVCodecContext * avctx)
|
|
{
|
|
AvsContext *const avs = avctx->priv_data;
|
|
avctx->pix_fmt = AV_PIX_FMT_PAL8;
|
|
avcodec_get_frame_defaults(&avs->picture);
|
|
avcodec_set_dimensions(avctx, 318, 198);
|
|
return 0;
|
|
}
|
|
|
|
static av_cold int avs_decode_end(AVCodecContext *avctx)
|
|
{
|
|
AvsContext *s = avctx->priv_data;
|
|
av_frame_unref(&s->picture);
|
|
return 0;
|
|
}
|
|
|
|
|
|
AVCodec ff_avs_decoder = {
|
|
.name = "avs",
|
|
.type = AVMEDIA_TYPE_VIDEO,
|
|
.id = AV_CODEC_ID_AVS,
|
|
.priv_data_size = sizeof(AvsContext),
|
|
.init = avs_decode_init,
|
|
.decode = avs_decode_frame,
|
|
.close = avs_decode_end,
|
|
.capabilities = CODEC_CAP_DR1,
|
|
.long_name = NULL_IF_CONFIG_SMALL("AVS (Audio Video Standard) video"),
|
|
};
|