* 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>
337 lines
10 KiB
C
337 lines
10 KiB
C
/*
|
|
* Copyright (c) 2003 Michael Niedermayer
|
|
*
|
|
* 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
|
|
* ASUS V1/V2 decoder.
|
|
*/
|
|
|
|
#include "libavutil/attributes.h"
|
|
#include "libavutil/mem.h"
|
|
|
|
#include "asv.h"
|
|
#include "avcodec.h"
|
|
#include "put_bits.h"
|
|
#include "internal.h"
|
|
#include "mathops.h"
|
|
#include "mpeg12data.h"
|
|
|
|
#define VLC_BITS 6
|
|
#define ASV2_LEVEL_VLC_BITS 10
|
|
|
|
static VLC ccp_vlc;
|
|
static VLC level_vlc;
|
|
static VLC dc_ccp_vlc;
|
|
static VLC ac_ccp_vlc;
|
|
static VLC asv2_level_vlc;
|
|
|
|
static av_cold void init_vlcs(ASV1Context *a)
|
|
{
|
|
static int done = 0;
|
|
|
|
if (!done) {
|
|
done = 1;
|
|
|
|
INIT_VLC_STATIC(&ccp_vlc, VLC_BITS, 17,
|
|
&ff_asv_ccp_tab[0][1], 2, 1,
|
|
&ff_asv_ccp_tab[0][0], 2, 1, 64);
|
|
INIT_VLC_STATIC(&dc_ccp_vlc, VLC_BITS, 8,
|
|
&ff_asv_dc_ccp_tab[0][1], 2, 1,
|
|
&ff_asv_dc_ccp_tab[0][0], 2, 1, 64);
|
|
INIT_VLC_STATIC(&ac_ccp_vlc, VLC_BITS, 16,
|
|
&ff_asv_ac_ccp_tab[0][1], 2, 1,
|
|
&ff_asv_ac_ccp_tab[0][0], 2, 1, 64);
|
|
INIT_VLC_STATIC(&level_vlc, VLC_BITS, 7,
|
|
&ff_asv_level_tab[0][1], 2, 1,
|
|
&ff_asv_level_tab[0][0], 2, 1, 64);
|
|
INIT_VLC_STATIC(&asv2_level_vlc, ASV2_LEVEL_VLC_BITS, 63,
|
|
&ff_asv2_level_tab[0][1], 2, 1,
|
|
&ff_asv2_level_tab[0][0], 2, 1, 1024);
|
|
}
|
|
}
|
|
|
|
//FIXME write a reversed bitstream reader to avoid the double reverse
|
|
static inline int asv2_get_bits(GetBitContext *gb, int n)
|
|
{
|
|
return ff_reverse[get_bits(gb, n) << (8-n)];
|
|
}
|
|
|
|
static inline int asv1_get_level(GetBitContext *gb)
|
|
{
|
|
int code = get_vlc2(gb, level_vlc.table, VLC_BITS, 1);
|
|
|
|
if (code == 3)
|
|
return get_sbits(gb, 8);
|
|
else
|
|
return code - 3;
|
|
}
|
|
|
|
static inline int asv2_get_level(GetBitContext *gb)
|
|
{
|
|
int code = get_vlc2(gb, asv2_level_vlc.table, ASV2_LEVEL_VLC_BITS, 1);
|
|
|
|
if (code == 31)
|
|
return (int8_t)asv2_get_bits(gb, 8);
|
|
else
|
|
return code - 31;
|
|
}
|
|
|
|
static inline int asv1_decode_block(ASV1Context *a, int16_t block[64])
|
|
{
|
|
int i;
|
|
|
|
block[0] = 8 * get_bits(&a->gb, 8);
|
|
|
|
for (i = 0; i < 11; i++) {
|
|
const int ccp = get_vlc2(&a->gb, ccp_vlc.table, VLC_BITS, 1);
|
|
|
|
if (ccp) {
|
|
if (ccp == 16)
|
|
break;
|
|
if (ccp < 0 || i >= 10) {
|
|
av_log(a->avctx, AV_LOG_ERROR, "coded coeff pattern damaged\n");
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
|
|
if (ccp & 8)
|
|
block[a->scantable.permutated[4 * i + 0]] = (asv1_get_level(&a->gb) * a->intra_matrix[4 * i + 0]) >> 4;
|
|
if (ccp & 4)
|
|
block[a->scantable.permutated[4 * i + 1]] = (asv1_get_level(&a->gb) * a->intra_matrix[4 * i + 1]) >> 4;
|
|
if (ccp & 2)
|
|
block[a->scantable.permutated[4 * i + 2]] = (asv1_get_level(&a->gb) * a->intra_matrix[4 * i + 2]) >> 4;
|
|
if (ccp & 1)
|
|
block[a->scantable.permutated[4 * i + 3]] = (asv1_get_level(&a->gb) * a->intra_matrix[4 * i + 3]) >> 4;
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static inline int asv2_decode_block(ASV1Context *a, int16_t block[64])
|
|
{
|
|
int i, count, ccp;
|
|
|
|
count = asv2_get_bits(&a->gb, 4);
|
|
|
|
block[0] = 8 * asv2_get_bits(&a->gb, 8);
|
|
|
|
ccp = get_vlc2(&a->gb, dc_ccp_vlc.table, VLC_BITS, 1);
|
|
if (ccp) {
|
|
if (ccp & 4)
|
|
block[a->scantable.permutated[1]] = (asv2_get_level(&a->gb) * a->intra_matrix[1]) >> 4;
|
|
if (ccp & 2)
|
|
block[a->scantable.permutated[2]] = (asv2_get_level(&a->gb) * a->intra_matrix[2]) >> 4;
|
|
if (ccp & 1)
|
|
block[a->scantable.permutated[3]] = (asv2_get_level(&a->gb) * a->intra_matrix[3]) >> 4;
|
|
}
|
|
|
|
for (i = 1; i < count + 1; i++) {
|
|
const int ccp = get_vlc2(&a->gb, ac_ccp_vlc.table, VLC_BITS, 1);
|
|
|
|
if (ccp) {
|
|
if (ccp & 8)
|
|
block[a->scantable.permutated[4*i + 0]] = (asv2_get_level(&a->gb) * a->intra_matrix[4*i + 0]) >> 4;
|
|
if (ccp & 4)
|
|
block[a->scantable.permutated[4*i + 1]] = (asv2_get_level(&a->gb) * a->intra_matrix[4*i + 1]) >> 4;
|
|
if (ccp & 2)
|
|
block[a->scantable.permutated[4*i + 2]] = (asv2_get_level(&a->gb) * a->intra_matrix[4*i + 2]) >> 4;
|
|
if (ccp & 1)
|
|
block[a->scantable.permutated[4*i + 3]] = (asv2_get_level(&a->gb) * a->intra_matrix[4*i + 3]) >> 4;
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static inline int decode_mb(ASV1Context *a, int16_t block[6][64])
|
|
{
|
|
int i;
|
|
|
|
a->dsp.clear_blocks(block[0]);
|
|
|
|
if (a->avctx->codec_id == AV_CODEC_ID_ASV1) {
|
|
for (i = 0; i < 6; i++) {
|
|
if (asv1_decode_block(a, block[i]) < 0)
|
|
return -1;
|
|
}
|
|
} else {
|
|
for (i = 0; i < 6; i++) {
|
|
if (asv2_decode_block(a, block[i]) < 0)
|
|
return -1;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static inline void idct_put(ASV1Context *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)
|
|
{
|
|
ASV1Context * const a = avctx->priv_data;
|
|
const uint8_t *buf = avpkt->data;
|
|
int buf_size = avpkt->size;
|
|
AVFrame * const p = data;
|
|
int mb_x, mb_y, ret;
|
|
|
|
if ((ret = ff_get_buffer(avctx, p, 0)) < 0) {
|
|
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
|
|
return ret;
|
|
}
|
|
p->pict_type = AV_PICTURE_TYPE_I;
|
|
p->key_frame = 1;
|
|
|
|
av_fast_padded_malloc(&a->bitstream_buffer, &a->bitstream_buffer_size,
|
|
buf_size);
|
|
if (!a->bitstream_buffer)
|
|
return AVERROR(ENOMEM);
|
|
|
|
if (avctx->codec_id == AV_CODEC_ID_ASV1)
|
|
a->dsp.bswap_buf((uint32_t*)a->bitstream_buffer, (const uint32_t*)buf, buf_size/4);
|
|
else {
|
|
int i;
|
|
for (i = 0; i < buf_size; i++)
|
|
a->bitstream_buffer[i] = ff_reverse[buf[i]];
|
|
}
|
|
|
|
init_get_bits(&a->gb, a->bitstream_buffer, buf_size*8);
|
|
|
|
for (mb_y = 0; mb_y < a->mb_height2; mb_y++) {
|
|
for (mb_x = 0; mb_x < a->mb_width2; mb_x++) {
|
|
if ((ret = decode_mb(a, a->block)) < 0)
|
|
return ret;
|
|
|
|
idct_put(a, p, mb_x, mb_y);
|
|
}
|
|
}
|
|
|
|
if (a->mb_width2 != a->mb_width) {
|
|
mb_x = a->mb_width2;
|
|
for (mb_y = 0; mb_y < a->mb_height2; mb_y++) {
|
|
if ((ret = decode_mb(a, a->block)) < 0)
|
|
return ret;
|
|
|
|
idct_put(a, p, mb_x, mb_y);
|
|
}
|
|
}
|
|
|
|
if (a->mb_height2 != a->mb_height) {
|
|
mb_y = a->mb_height2;
|
|
for (mb_x = 0; mb_x < a->mb_width; mb_x++) {
|
|
if ((ret = decode_mb(a, a->block)) < 0)
|
|
return ret;
|
|
|
|
idct_put(a, p, mb_x, mb_y);
|
|
}
|
|
}
|
|
|
|
*got_frame = 1;
|
|
|
|
emms_c();
|
|
|
|
return (get_bits_count(&a->gb) + 31) / 32 * 4;
|
|
}
|
|
|
|
static av_cold int decode_init(AVCodecContext *avctx)
|
|
{
|
|
ASV1Context * const a = avctx->priv_data;
|
|
const int scale = avctx->codec_id == AV_CODEC_ID_ASV1 ? 1 : 2;
|
|
int i;
|
|
|
|
ff_asv_common_init(avctx);
|
|
init_vlcs(a);
|
|
ff_init_scantable(a->dsp.idct_permutation, &a->scantable, ff_asv_scantab);
|
|
avctx->pix_fmt = AV_PIX_FMT_YUV420P;
|
|
|
|
if (avctx->extradata_size < 1 || (a->inv_qscale = avctx->extradata[0]) == 0) {
|
|
av_log(avctx, AV_LOG_ERROR, "illegal qscale 0\n");
|
|
if (avctx->codec_id == AV_CODEC_ID_ASV1)
|
|
a->inv_qscale = 6;
|
|
else
|
|
a->inv_qscale = 10;
|
|
}
|
|
|
|
for (i = 0; i < 64; i++) {
|
|
int index = ff_asv_scantab[i];
|
|
|
|
a->intra_matrix[i] = 64 * scale * ff_mpeg1_default_intra_matrix[index] / a->inv_qscale;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static av_cold int decode_end(AVCodecContext *avctx)
|
|
{
|
|
ASV1Context * const a = avctx->priv_data;
|
|
|
|
av_freep(&a->bitstream_buffer);
|
|
a->bitstream_buffer_size = 0;
|
|
|
|
return 0;
|
|
}
|
|
|
|
#if CONFIG_ASV1_DECODER
|
|
AVCodec ff_asv1_decoder = {
|
|
.name = "asv1",
|
|
.type = AVMEDIA_TYPE_VIDEO,
|
|
.id = AV_CODEC_ID_ASV1,
|
|
.priv_data_size = sizeof(ASV1Context),
|
|
.init = decode_init,
|
|
.close = decode_end,
|
|
.decode = decode_frame,
|
|
.capabilities = CODEC_CAP_DR1,
|
|
.long_name = NULL_IF_CONFIG_SMALL("ASUS V1"),
|
|
};
|
|
#endif
|
|
|
|
#if CONFIG_ASV2_DECODER
|
|
AVCodec ff_asv2_decoder = {
|
|
.name = "asv2",
|
|
.type = AVMEDIA_TYPE_VIDEO,
|
|
.id = AV_CODEC_ID_ASV2,
|
|
.priv_data_size = sizeof(ASV1Context),
|
|
.init = decode_init,
|
|
.close = decode_end,
|
|
.decode = decode_frame,
|
|
.capabilities = CODEC_CAP_DR1,
|
|
.long_name = NULL_IF_CONFIG_SMALL("ASUS V2"),
|
|
};
|
|
#endif
|
|
|