mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-12-17 20:40:07 +01:00
* 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>
261 lines
7.7 KiB
C
261 lines
7.7 KiB
C
/*
|
|
* Psygnosis YOP decoder
|
|
*
|
|
* Copyright (C) 2010 Mohamed Naufal Basheer <naufal11@gmail.com>
|
|
* derived from the code by
|
|
* Copyright (C) 2009 Thomas P. Higdon <thomas.p.higdon@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 "libavutil/intreadwrite.h"
|
|
#include "libavutil/imgutils.h"
|
|
|
|
#include "avcodec.h"
|
|
#include "get_bits.h"
|
|
#include "internal.h"
|
|
|
|
typedef struct YopDecContext {
|
|
AVCodecContext *avctx;
|
|
|
|
int num_pal_colors;
|
|
int first_color[2];
|
|
int frame_data_length;
|
|
|
|
uint8_t *low_nibble;
|
|
uint8_t *srcptr;
|
|
uint8_t *src_end;
|
|
uint8_t *dstptr;
|
|
uint8_t *dstbuf;
|
|
} YopDecContext;
|
|
|
|
// These tables are taken directly from:
|
|
// http://wiki.multimedia.cx/index.php?title=Psygnosis_YOP
|
|
|
|
/**
|
|
* Lookup table for painting macroblocks. Bytes 0-2 of each entry contain
|
|
* the macroblock positions to be painted (taken as (0, B0, B1, B2)).
|
|
* Byte 3 contains the number of bytes consumed on the input,
|
|
* equal to max(bytes 0-2) + 1.
|
|
*/
|
|
static const uint8_t paint_lut[15][4] =
|
|
{{1, 2, 3, 4}, {1, 2, 0, 3},
|
|
{1, 2, 1, 3}, {1, 2, 2, 3},
|
|
{1, 0, 2, 3}, {1, 0, 0, 2},
|
|
{1, 0, 1, 2}, {1, 1, 2, 3},
|
|
{0, 1, 2, 3}, {0, 1, 0, 2},
|
|
{1, 1, 0, 2}, {0, 1, 1, 2},
|
|
{0, 0, 1, 2}, {0, 0, 0, 1},
|
|
{1, 1, 1, 2},
|
|
};
|
|
|
|
/**
|
|
* Lookup table for copying macroblocks. Each entry contains the respective
|
|
* x and y pixel offset for the copy source.
|
|
*/
|
|
static const int8_t motion_vector[16][2] =
|
|
{{-4, -4}, {-2, -4},
|
|
{ 0, -4}, { 2, -4},
|
|
{-4, -2}, {-4, 0},
|
|
{-3, -3}, {-1, -3},
|
|
{ 1, -3}, { 3, -3},
|
|
{-3, -1}, {-2, -2},
|
|
{ 0, -2}, { 2, -2},
|
|
{ 4, -2}, {-2, 0},
|
|
};
|
|
|
|
static av_cold int yop_decode_init(AVCodecContext *avctx)
|
|
{
|
|
YopDecContext *s = avctx->priv_data;
|
|
s->avctx = avctx;
|
|
|
|
if (avctx->width & 1 || avctx->height & 1 ||
|
|
av_image_check_size(avctx->width, avctx->height, 0, avctx) < 0) {
|
|
av_log(avctx, AV_LOG_ERROR, "YOP has invalid dimensions\n");
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
|
|
if (avctx->extradata_size < 3) {
|
|
av_log(avctx, AV_LOG_ERROR, "Missing or incomplete extradata.\n");
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
|
|
avctx->pix_fmt = AV_PIX_FMT_PAL8;
|
|
|
|
s->num_pal_colors = avctx->extradata[0];
|
|
s->first_color[0] = avctx->extradata[1];
|
|
s->first_color[1] = avctx->extradata[2];
|
|
|
|
if (s->num_pal_colors + s->first_color[0] > 256 ||
|
|
s->num_pal_colors + s->first_color[1] > 256) {
|
|
av_log(avctx, AV_LOG_ERROR,
|
|
"Palette parameters invalid, header probably corrupt\n");
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* Paint a macroblock using the pattern in paint_lut.
|
|
* @param s codec context
|
|
* @param tag the tag that was in the nibble
|
|
*/
|
|
static int yop_paint_block(YopDecContext *s, int linesize, int tag)
|
|
{
|
|
if (s->src_end - s->srcptr < paint_lut[tag][3]) {
|
|
av_log(s->avctx, AV_LOG_ERROR, "Packet too small.\n");
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
|
|
s->dstptr[0] = s->srcptr[0];
|
|
s->dstptr[1] = s->srcptr[paint_lut[tag][0]];
|
|
s->dstptr[linesize] = s->srcptr[paint_lut[tag][1]];
|
|
s->dstptr[linesize + 1] = s->srcptr[paint_lut[tag][2]];
|
|
|
|
// The number of src bytes consumed is in the last part of the lut entry.
|
|
s->srcptr += paint_lut[tag][3];
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* Copy a previously painted macroblock to the current_block.
|
|
* @param copy_tag the tag that was in the nibble
|
|
*/
|
|
static int yop_copy_previous_block(YopDecContext *s, int linesize, int copy_tag)
|
|
{
|
|
uint8_t *bufptr;
|
|
|
|
// Calculate position for the copy source
|
|
bufptr = s->dstptr + motion_vector[copy_tag][0] +
|
|
linesize * motion_vector[copy_tag][1];
|
|
if (bufptr < s->dstbuf) {
|
|
av_log(s->avctx, AV_LOG_ERROR, "File probably corrupt\n");
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
|
|
s->dstptr[0] = bufptr[0];
|
|
s->dstptr[1] = bufptr[1];
|
|
s->dstptr[linesize] = bufptr[linesize];
|
|
s->dstptr[linesize + 1] = bufptr[linesize + 1];
|
|
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* Return the next nibble in sequence, consuming a new byte on the input
|
|
* only if necessary.
|
|
*/
|
|
static uint8_t yop_get_next_nibble(YopDecContext *s)
|
|
{
|
|
int ret;
|
|
|
|
if (s->low_nibble) {
|
|
ret = *s->low_nibble & 0xf;
|
|
s->low_nibble = NULL;
|
|
}else {
|
|
s->low_nibble = s->srcptr++;
|
|
ret = *s->low_nibble >> 4;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
static int yop_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
|
|
AVPacket *avpkt)
|
|
{
|
|
YopDecContext *s = avctx->priv_data;
|
|
AVFrame *frame = data;
|
|
int tag, firstcolor, is_odd_frame;
|
|
int ret, i, x, y;
|
|
uint32_t *palette;
|
|
|
|
if (avpkt->size < 4 + 3 * s->num_pal_colors) {
|
|
av_log(avctx, AV_LOG_ERROR, "Packet too small.\n");
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
|
|
ret = ff_get_buffer(avctx, frame, 0);
|
|
if (ret < 0) {
|
|
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
|
|
return ret;
|
|
}
|
|
|
|
if (!avctx->frame_number)
|
|
memset(frame->data[1], 0, AVPALETTE_SIZE);
|
|
|
|
s->dstbuf = frame->data[0];
|
|
s->dstptr = frame->data[0];
|
|
s->srcptr = avpkt->data + 4;
|
|
s->src_end = avpkt->data + avpkt->size;
|
|
s->low_nibble = NULL;
|
|
|
|
is_odd_frame = avpkt->data[0];
|
|
if(is_odd_frame>1){
|
|
av_log(avctx, AV_LOG_ERROR, "frame is too odd %d\n", is_odd_frame);
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
firstcolor = s->first_color[is_odd_frame];
|
|
palette = (uint32_t *)frame->data[1];
|
|
|
|
for (i = 0; i < s->num_pal_colors; i++, s->srcptr += 3) {
|
|
palette[i + firstcolor] = (s->srcptr[0] << 18) |
|
|
(s->srcptr[1] << 10) |
|
|
(s->srcptr[2] << 2);
|
|
palette[i + firstcolor] |= 0xFFU << 24 |
|
|
(palette[i + firstcolor] >> 6) & 0x30303;
|
|
}
|
|
|
|
frame->palette_has_changed = 1;
|
|
|
|
for (y = 0; y < avctx->height; y += 2) {
|
|
for (x = 0; x < avctx->width; x += 2) {
|
|
if (s->srcptr - avpkt->data >= avpkt->size) {
|
|
av_log(avctx, AV_LOG_ERROR, "Packet too small.\n");
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
|
|
tag = yop_get_next_nibble(s);
|
|
|
|
if (tag != 0xf) {
|
|
ret = yop_paint_block(s, frame->linesize[0], tag);
|
|
if (ret < 0)
|
|
return ret;
|
|
} else {
|
|
tag = yop_get_next_nibble(s);
|
|
ret = yop_copy_previous_block(s, frame->linesize[0], tag);
|
|
if (ret < 0)
|
|
return ret;
|
|
}
|
|
s->dstptr += 2;
|
|
}
|
|
s->dstptr += 2*frame->linesize[0] - x;
|
|
}
|
|
|
|
*got_frame = 1;
|
|
return avpkt->size;
|
|
}
|
|
|
|
AVCodec ff_yop_decoder = {
|
|
.name = "yop",
|
|
.type = AVMEDIA_TYPE_VIDEO,
|
|
.id = AV_CODEC_ID_YOP,
|
|
.priv_data_size = sizeof(YopDecContext),
|
|
.init = yop_decode_init,
|
|
.decode = yop_decode_frame,
|
|
.long_name = NULL_IF_CONFIG_SMALL("Psygnosis YOP Video"),
|
|
};
|