* 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>
257 lines
8.0 KiB
C
257 lines
8.0 KiB
C
/*
|
|
* Sony PlayStation MDEC (Motion DECoder)
|
|
* Copyright (c) 2003 Michael Niedermayer
|
|
*
|
|
* based upon code from Sebastian Jedruszkiewicz <elf@frogger.rules.pl>
|
|
*
|
|
* 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
|
|
* Sony PlayStation MDEC (Motion DECoder)
|
|
* This is very similar to intra-only MPEG-1.
|
|
*/
|
|
|
|
#include "avcodec.h"
|
|
#include "mpegvideo.h"
|
|
#include "mpeg12.h"
|
|
#include "thread.h"
|
|
|
|
typedef struct MDECContext {
|
|
AVCodecContext *avctx;
|
|
DSPContext dsp;
|
|
ThreadFrame frame;
|
|
GetBitContext gb;
|
|
ScanTable scantable;
|
|
int version;
|
|
int qscale;
|
|
int last_dc[3];
|
|
int mb_width;
|
|
int mb_height;
|
|
int mb_x, mb_y;
|
|
DECLARE_ALIGNED(16, int16_t, block)[6][64];
|
|
uint8_t *bitstream_buffer;
|
|
unsigned int bitstream_buffer_size;
|
|
int block_last_index[6];
|
|
} MDECContext;
|
|
|
|
//very similar to MPEG-1
|
|
static inline int mdec_decode_block_intra(MDECContext *a, int16_t *block, int n)
|
|
{
|
|
int level, diff, i, j, run;
|
|
int component;
|
|
RLTable *rl = &ff_rl_mpeg1;
|
|
uint8_t * const scantable = a->scantable.permutated;
|
|
const uint16_t *quant_matrix = ff_mpeg1_default_intra_matrix;
|
|
const int qscale = a->qscale;
|
|
|
|
/* DC coefficient */
|
|
if (a->version == 2) {
|
|
block[0] = 2 * get_sbits(&a->gb, 10) + 1024;
|
|
} else {
|
|
component = (n <= 3 ? 0 : n - 4 + 1);
|
|
diff = decode_dc(&a->gb, component);
|
|
if (diff >= 0xffff)
|
|
return AVERROR_INVALIDDATA;
|
|
a->last_dc[component] += diff;
|
|
block[0] = a->last_dc[component] << 3;
|
|
}
|
|
|
|
i = 0;
|
|
{
|
|
OPEN_READER(re, &a->gb);
|
|
/* now quantify & encode AC coefficients */
|
|
for (;;) {
|
|
UPDATE_CACHE(re, &a->gb);
|
|
GET_RL_VLC(level, run, re, &a->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0);
|
|
|
|
if (level == 127) {
|
|
break;
|
|
} else if (level != 0) {
|
|
i += run;
|
|
j = scantable[i];
|
|
level = (level * qscale * quant_matrix[j]) >> 3;
|
|
level = (level ^ SHOW_SBITS(re, &a->gb, 1)) - SHOW_SBITS(re, &a->gb, 1);
|
|
LAST_SKIP_BITS(re, &a->gb, 1);
|
|
} else {
|
|
/* escape */
|
|
run = SHOW_UBITS(re, &a->gb, 6)+1; LAST_SKIP_BITS(re, &a->gb, 6);
|
|
UPDATE_CACHE(re, &a->gb);
|
|
level = SHOW_SBITS(re, &a->gb, 10); SKIP_BITS(re, &a->gb, 10);
|
|
i += run;
|
|
j = scantable[i];
|
|
if (level < 0) {
|
|
level = -level;
|
|
level = (level * qscale * quant_matrix[j]) >> 3;
|
|
level = (level - 1) | 1;
|
|
level = -level;
|
|
} else {
|
|
level = (level * qscale * quant_matrix[j]) >> 3;
|
|
level = (level - 1) | 1;
|
|
}
|
|
}
|
|
if (i > 63) {
|
|
av_log(a->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n", a->mb_x, a->mb_y);
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
|
|
block[j] = level;
|
|
}
|
|
CLOSE_READER(re, &a->gb);
|
|
}
|
|
a->block_last_index[n] = i;
|
|
return 0;
|
|
}
|
|
|
|
static inline int decode_mb(MDECContext *a, int16_t block[6][64])
|
|
{
|
|
int i, ret;
|
|
const int block_index[6] = { 5, 4, 0, 1, 2, 3 };
|
|
|
|
a->dsp.clear_blocks(block[0]);
|
|
|
|
for (i = 0; i < 6; i++) {
|
|
if ((ret = mdec_decode_block_intra(a, block[block_index[i]],
|
|
block_index[i])) < 0)
|
|
return ret;
|
|
if (get_bits_left(&a->gb) < 0)
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static inline void idct_put(MDECContext *a, AVFrame *frame, int mb_x, int mb_y)
|
|
{
|
|
int16_t (*block)[64] = a->block;
|
|
int linesize = frame->linesize[0];
|
|
|
|
uint8_t *dest_y = frame->data[0] + (mb_y * 16* linesize ) + mb_x * 16;
|
|
uint8_t *dest_cb = frame->data[1] + (mb_y * 8 * frame->linesize[1]) + mb_x * 8;
|
|
uint8_t *dest_cr = frame->data[2] + (mb_y * 8 * frame->linesize[2]) + mb_x * 8;
|
|
|
|
a->dsp.idct_put(dest_y, linesize, block[0]);
|
|
a->dsp.idct_put(dest_y + 8, linesize, block[1]);
|
|
a->dsp.idct_put(dest_y + 8 * linesize, linesize, block[2]);
|
|
a->dsp.idct_put(dest_y + 8 * linesize + 8, linesize, block[3]);
|
|
|
|
if (!(a->avctx->flags & CODEC_FLAG_GRAY)) {
|
|
a->dsp.idct_put(dest_cb, frame->linesize[1], block[4]);
|
|
a->dsp.idct_put(dest_cr, frame->linesize[2], block[5]);
|
|
}
|
|
}
|
|
|
|
static int decode_frame(AVCodecContext *avctx,
|
|
void *data, int *got_frame,
|
|
AVPacket *avpkt)
|
|
{
|
|
MDECContext * const a = avctx->priv_data;
|
|
const uint8_t *buf = avpkt->data;
|
|
int buf_size = avpkt->size;
|
|
ThreadFrame frame = { .f = data };
|
|
int i, ret;
|
|
|
|
if ((ret = ff_thread_get_buffer(avctx, &frame, 0)) < 0) {
|
|
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
|
|
return ret;
|
|
}
|
|
frame.f->pict_type = AV_PICTURE_TYPE_I;
|
|
frame.f->key_frame = 1;
|
|
|
|
av_fast_malloc(&a->bitstream_buffer, &a->bitstream_buffer_size, buf_size + FF_INPUT_BUFFER_PADDING_SIZE);
|
|
if (!a->bitstream_buffer)
|
|
return AVERROR(ENOMEM);
|
|
for (i = 0; i < buf_size; i += 2) {
|
|
a->bitstream_buffer[i] = buf[i + 1];
|
|
a->bitstream_buffer[i + 1] = buf[i];
|
|
}
|
|
init_get_bits(&a->gb, a->bitstream_buffer, buf_size * 8);
|
|
|
|
/* skip over 4 preamble bytes in stream (typically 0xXX 0xXX 0x00 0x38) */
|
|
skip_bits(&a->gb, 32);
|
|
|
|
a->qscale = get_bits(&a->gb, 16);
|
|
a->version = get_bits(&a->gb, 16);
|
|
|
|
a->last_dc[0] = a->last_dc[1] = a->last_dc[2] = 128;
|
|
|
|
for (a->mb_x = 0; a->mb_x < a->mb_width; a->mb_x++) {
|
|
for (a->mb_y = 0; a->mb_y < a->mb_height; a->mb_y++) {
|
|
if ((ret = decode_mb(a, a->block)) < 0)
|
|
return ret;
|
|
|
|
idct_put(a, frame.f, a->mb_x, a->mb_y);
|
|
}
|
|
}
|
|
|
|
*got_frame = 1;
|
|
|
|
return (get_bits_count(&a->gb) + 31) / 32 * 4;
|
|
}
|
|
|
|
static av_cold int decode_init(AVCodecContext *avctx)
|
|
{
|
|
MDECContext * const a = avctx->priv_data;
|
|
|
|
a->mb_width = (avctx->coded_width + 15) / 16;
|
|
a->mb_height = (avctx->coded_height + 15) / 16;
|
|
|
|
a->avctx = avctx;
|
|
|
|
ff_dsputil_init(&a->dsp, avctx);
|
|
ff_mpeg12_init_vlcs();
|
|
ff_init_scantable(a->dsp.idct_permutation, &a->scantable, ff_zigzag_direct);
|
|
|
|
if (avctx->idct_algo == FF_IDCT_AUTO)
|
|
avctx->idct_algo = FF_IDCT_SIMPLE;
|
|
avctx->pix_fmt = AV_PIX_FMT_YUVJ420P;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static av_cold int decode_init_thread_copy(AVCodecContext *avctx)
|
|
{
|
|
MDECContext * const a = avctx->priv_data;
|
|
|
|
a->avctx = avctx;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static av_cold int decode_end(AVCodecContext *avctx)
|
|
{
|
|
MDECContext * const a = avctx->priv_data;
|
|
|
|
av_freep(&a->bitstream_buffer);
|
|
a->bitstream_buffer_size = 0;
|
|
|
|
return 0;
|
|
}
|
|
|
|
AVCodec ff_mdec_decoder = {
|
|
.name = "mdec",
|
|
.type = AVMEDIA_TYPE_VIDEO,
|
|
.id = AV_CODEC_ID_MDEC,
|
|
.priv_data_size = sizeof(MDECContext),
|
|
.init = decode_init,
|
|
.close = decode_end,
|
|
.decode = decode_frame,
|
|
.capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS,
|
|
.long_name = NULL_IF_CONFIG_SMALL("Sony PlayStation MDEC (Motion DECoder)"),
|
|
.init_thread_copy = ONLY_IF_THREADS_ENABLED(decode_init_thread_copy)
|
|
};
|