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>
250 lines
9.0 KiB
C
250 lines
9.0 KiB
C
/*
|
|
* Copyright (C) 2003 the ffmpeg project
|
|
*
|
|
* 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
|
|
* id RoQ Video Decoder by Dr. Tim Ferguson
|
|
* For more information about the id RoQ format, visit:
|
|
* http://www.csse.monash.edu.au/~timf/
|
|
*/
|
|
|
|
#include "libavutil/avassert.h"
|
|
#include "avcodec.h"
|
|
#include "bytestream.h"
|
|
#include "internal.h"
|
|
#include "roqvideo.h"
|
|
|
|
static void roqvideo_decode_frame(RoqContext *ri)
|
|
{
|
|
unsigned int chunk_id = 0, chunk_arg = 0;
|
|
unsigned long chunk_size = 0;
|
|
int i, j, k, nv1, nv2, vqflg = 0, vqflg_pos = -1;
|
|
int vqid, xpos, ypos, xp, yp, x, y, mx, my;
|
|
int frame_stats[2][4] = {{0},{0}};
|
|
roq_qcell *qcell;
|
|
int64_t chunk_start;
|
|
|
|
while (bytestream2_get_bytes_left(&ri->gb) >= 8) {
|
|
chunk_id = bytestream2_get_le16(&ri->gb);
|
|
chunk_size = bytestream2_get_le32(&ri->gb);
|
|
chunk_arg = bytestream2_get_le16(&ri->gb);
|
|
|
|
if(chunk_id == RoQ_QUAD_VQ)
|
|
break;
|
|
if(chunk_id == RoQ_QUAD_CODEBOOK) {
|
|
if((nv1 = chunk_arg >> 8) == 0)
|
|
nv1 = 256;
|
|
if((nv2 = chunk_arg & 0xff) == 0 && nv1 * 6 < chunk_size)
|
|
nv2 = 256;
|
|
for(i = 0; i < nv1; i++) {
|
|
ri->cb2x2[i].y[0] = bytestream2_get_byte(&ri->gb);
|
|
ri->cb2x2[i].y[1] = bytestream2_get_byte(&ri->gb);
|
|
ri->cb2x2[i].y[2] = bytestream2_get_byte(&ri->gb);
|
|
ri->cb2x2[i].y[3] = bytestream2_get_byte(&ri->gb);
|
|
ri->cb2x2[i].u = bytestream2_get_byte(&ri->gb);
|
|
ri->cb2x2[i].v = bytestream2_get_byte(&ri->gb);
|
|
}
|
|
for(i = 0; i < nv2; i++)
|
|
for(j = 0; j < 4; j++)
|
|
ri->cb4x4[i].idx[j] = bytestream2_get_byte(&ri->gb);
|
|
}
|
|
}
|
|
|
|
chunk_start = bytestream2_tell(&ri->gb);
|
|
xpos = ypos = 0;
|
|
|
|
if (chunk_size > bytestream2_get_bytes_left(&ri->gb)) {
|
|
av_log(ri->avctx, AV_LOG_ERROR, "Chunk does not fit in input buffer\n");
|
|
chunk_size = bytestream2_get_bytes_left(&ri->gb);
|
|
}
|
|
|
|
while (bytestream2_tell(&ri->gb) < chunk_start + chunk_size) {
|
|
for (yp = ypos; yp < ypos + 16; yp += 8)
|
|
for (xp = xpos; xp < xpos + 16; xp += 8) {
|
|
if (bytestream2_tell(&ri->gb) >= chunk_start + chunk_size) {
|
|
av_log(ri->avctx, AV_LOG_ERROR, "Input buffer too small\n");
|
|
return;
|
|
}
|
|
if (vqflg_pos < 0) {
|
|
vqflg = bytestream2_get_le16(&ri->gb);
|
|
vqflg_pos = 7;
|
|
}
|
|
vqid = (vqflg >> (vqflg_pos * 2)) & 0x3;
|
|
frame_stats[0][vqid]++;
|
|
vqflg_pos--;
|
|
|
|
switch(vqid) {
|
|
case RoQ_ID_MOT:
|
|
break;
|
|
case RoQ_ID_FCC: {
|
|
int byte = bytestream2_get_byte(&ri->gb);
|
|
mx = 8 - (byte >> 4) - ((signed char) (chunk_arg >> 8));
|
|
my = 8 - (byte & 0xf) - ((signed char) chunk_arg);
|
|
ff_apply_motion_8x8(ri, xp, yp, mx, my);
|
|
break;
|
|
}
|
|
case RoQ_ID_SLD:
|
|
qcell = ri->cb4x4 + bytestream2_get_byte(&ri->gb);
|
|
ff_apply_vector_4x4(ri, xp, yp, ri->cb2x2 + qcell->idx[0]);
|
|
ff_apply_vector_4x4(ri, xp + 4, yp, ri->cb2x2 + qcell->idx[1]);
|
|
ff_apply_vector_4x4(ri, xp, yp + 4, ri->cb2x2 + qcell->idx[2]);
|
|
ff_apply_vector_4x4(ri, xp + 4, yp + 4, ri->cb2x2 + qcell->idx[3]);
|
|
break;
|
|
case RoQ_ID_CCC:
|
|
for (k = 0; k < 4; k++) {
|
|
x = xp; y = yp;
|
|
if(k & 0x01) x += 4;
|
|
if(k & 0x02) y += 4;
|
|
|
|
if (bytestream2_tell(&ri->gb) >= chunk_start + chunk_size) {
|
|
av_log(ri->avctx, AV_LOG_ERROR, "Input buffer too small\n");
|
|
return;
|
|
}
|
|
if (vqflg_pos < 0) {
|
|
vqflg = bytestream2_get_le16(&ri->gb);
|
|
vqflg_pos = 7;
|
|
}
|
|
vqid = (vqflg >> (vqflg_pos * 2)) & 0x3;
|
|
frame_stats[1][vqid]++;
|
|
vqflg_pos--;
|
|
switch(vqid) {
|
|
case RoQ_ID_MOT:
|
|
break;
|
|
case RoQ_ID_FCC: {
|
|
int byte = bytestream2_get_byte(&ri->gb);
|
|
mx = 8 - (byte >> 4) - ((signed char) (chunk_arg >> 8));
|
|
my = 8 - (byte & 0xf) - ((signed char) chunk_arg);
|
|
ff_apply_motion_4x4(ri, x, y, mx, my);
|
|
break;
|
|
}
|
|
case RoQ_ID_SLD:
|
|
qcell = ri->cb4x4 + bytestream2_get_byte(&ri->gb);
|
|
ff_apply_vector_2x2(ri, x, y, ri->cb2x2 + qcell->idx[0]);
|
|
ff_apply_vector_2x2(ri, x + 2, y, ri->cb2x2 + qcell->idx[1]);
|
|
ff_apply_vector_2x2(ri, x, y + 2, ri->cb2x2 + qcell->idx[2]);
|
|
ff_apply_vector_2x2(ri, x + 2, y + 2, ri->cb2x2 + qcell->idx[3]);
|
|
break;
|
|
case RoQ_ID_CCC:
|
|
ff_apply_vector_2x2(ri, x, y, ri->cb2x2 + bytestream2_get_byte(&ri->gb));
|
|
ff_apply_vector_2x2(ri, x + 2, y, ri->cb2x2 + bytestream2_get_byte(&ri->gb));
|
|
ff_apply_vector_2x2(ri, x, y + 2, ri->cb2x2 + bytestream2_get_byte(&ri->gb));
|
|
ff_apply_vector_2x2(ri, x + 2, y + 2, ri->cb2x2 + bytestream2_get_byte(&ri->gb));
|
|
break;
|
|
}
|
|
}
|
|
break;
|
|
default:
|
|
av_assert2(0);
|
|
}
|
|
}
|
|
|
|
xpos += 16;
|
|
if (xpos >= ri->width) {
|
|
xpos -= ri->width;
|
|
ypos += 16;
|
|
}
|
|
if(ypos >= ri->height)
|
|
break;
|
|
}
|
|
}
|
|
|
|
|
|
static av_cold int roq_decode_init(AVCodecContext *avctx)
|
|
{
|
|
RoqContext *s = avctx->priv_data;
|
|
|
|
s->avctx = avctx;
|
|
|
|
if (avctx->width % 16 || avctx->height % 16) {
|
|
av_log(avctx, AV_LOG_ERROR,
|
|
"Dimensions must be a multiple of 16\n");
|
|
return AVERROR_PATCHWELCOME;
|
|
}
|
|
|
|
s->width = avctx->width;
|
|
s->height = avctx->height;
|
|
|
|
s->last_frame = av_frame_alloc();
|
|
s->current_frame = av_frame_alloc();
|
|
if (!s->current_frame || !s->last_frame) {
|
|
av_frame_free(&s->current_frame);
|
|
av_frame_free(&s->last_frame);
|
|
return AVERROR(ENOMEM);
|
|
}
|
|
|
|
avctx->pix_fmt = AV_PIX_FMT_YUV444P;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int roq_decode_frame(AVCodecContext *avctx,
|
|
void *data, int *got_frame,
|
|
AVPacket *avpkt)
|
|
{
|
|
const uint8_t *buf = avpkt->data;
|
|
int buf_size = avpkt->size;
|
|
RoqContext *s = avctx->priv_data;
|
|
int copy= !s->current_frame->data[0];
|
|
int ret;
|
|
|
|
if ((ret = ff_reget_buffer(avctx, s->current_frame)) < 0) {
|
|
av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
|
|
return ret;
|
|
}
|
|
|
|
if(copy)
|
|
av_picture_copy((AVPicture*)s->current_frame, (AVPicture*)s->last_frame,
|
|
avctx->pix_fmt, avctx->width, avctx->height);
|
|
|
|
bytestream2_init(&s->gb, buf, buf_size);
|
|
roqvideo_decode_frame(s);
|
|
|
|
if ((ret = av_frame_ref(data, s->current_frame)) < 0)
|
|
return ret;
|
|
*got_frame = 1;
|
|
|
|
/* shuffle frames */
|
|
FFSWAP(AVFrame *, s->current_frame, s->last_frame);
|
|
|
|
return buf_size;
|
|
}
|
|
|
|
static av_cold int roq_decode_end(AVCodecContext *avctx)
|
|
{
|
|
RoqContext *s = avctx->priv_data;
|
|
|
|
av_frame_free(&s->current_frame);
|
|
av_frame_free(&s->last_frame);
|
|
|
|
return 0;
|
|
}
|
|
|
|
AVCodec ff_roq_decoder = {
|
|
.name = "roqvideo",
|
|
.type = AVMEDIA_TYPE_VIDEO,
|
|
.id = AV_CODEC_ID_ROQ,
|
|
.priv_data_size = sizeof(RoqContext),
|
|
.init = roq_decode_init,
|
|
.close = roq_decode_end,
|
|
.decode = roq_decode_frame,
|
|
.capabilities = CODEC_CAP_DR1,
|
|
.long_name = NULL_IF_CONFIG_SMALL("id RoQ video"),
|
|
};
|