* 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>
236 lines
6.7 KiB
C
236 lines
6.7 KiB
C
/*
|
|
* LucasArts VIMA decoder
|
|
* Copyright (c) 2012 Paul B Mahol
|
|
*
|
|
* 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/channel_layout.h"
|
|
#include "avcodec.h"
|
|
#include "get_bits.h"
|
|
#include "internal.h"
|
|
#include "adpcm_data.h"
|
|
|
|
typedef struct {
|
|
uint16_t predict_table[5786 * 2];
|
|
} VimaContext;
|
|
|
|
static const uint8_t size_table[] =
|
|
{
|
|
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
|
|
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
|
|
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
|
|
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
|
|
6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
|
|
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7
|
|
};
|
|
|
|
static const int8_t index_table1[] =
|
|
{
|
|
-1, 4, -1, 4
|
|
};
|
|
|
|
static const int8_t index_table2[] =
|
|
{
|
|
-1, -1, 2, 6, -1, -1, 2, 6
|
|
};
|
|
|
|
static const int8_t index_table3[] =
|
|
{
|
|
-1, -1, -1, -1, 1, 2, 4, 6,
|
|
-1, -1, -1, -1, 1, 2, 4, 6
|
|
};
|
|
|
|
static const int8_t index_table4[] =
|
|
{
|
|
-1, -1, -1, -1, -1, -1, -1, -1,
|
|
1, 1, 1, 2, 2, 4, 5, 6,
|
|
-1, -1, -1, -1, -1, -1, -1, -1,
|
|
1, 1, 1, 2, 2, 4, 5, 6
|
|
};
|
|
|
|
static const int8_t index_table5[] =
|
|
{
|
|
-1, -1, -1, -1, -1, -1, -1, -1,
|
|
-1, -1, -1, -1, -1, -1, -1, -1,
|
|
1, 1, 1, 1, 1, 2, 2, 2,
|
|
2, 4, 4, 4, 5, 5, 6, 6,
|
|
-1, -1, -1, -1, -1, -1, -1, -1,
|
|
-1, -1, -1, -1, -1, -1, -1, -1,
|
|
1, 1, 1, 1, 1, 2, 2, 2,
|
|
2, 4, 4, 4, 5, 5, 6, 6
|
|
};
|
|
|
|
static const int8_t index_table6[] =
|
|
{
|
|
-1, -1, -1, -1, -1, -1, -1, -1,
|
|
-1, -1, -1, -1, -1, -1, -1, -1,
|
|
-1, -1, -1, -1, -1, -1, -1, -1,
|
|
-1, -1, -1, -1, -1, -1, -1, -1,
|
|
1, 1, 1, 1, 1, 1, 1, 1,
|
|
1, 1, 2, 2, 2, 2, 2, 2,
|
|
2, 2, 4, 4, 4, 4, 4, 4,
|
|
5, 5, 5, 5, 6, 6, 6, 6,
|
|
-1, -1, -1, -1, -1, -1, -1, -1,
|
|
-1, -1, -1, -1, -1, -1, -1, -1,
|
|
-1, -1, -1, -1, -1, -1, -1, -1,
|
|
-1, -1, -1, -1, -1, -1, -1, -1,
|
|
1, 1, 1, 1, 1, 1, 1, 1,
|
|
1, 1, 2, 2, 2, 2, 2, 2,
|
|
2, 2, 4, 4, 4, 4, 4, 4,
|
|
5, 5, 5, 5, 6, 6, 6, 6
|
|
};
|
|
|
|
static const int8_t* const step_index_tables[] =
|
|
{
|
|
index_table1, index_table2, index_table3,
|
|
index_table4, index_table5, index_table6
|
|
};
|
|
|
|
static av_cold int decode_init(AVCodecContext *avctx)
|
|
{
|
|
VimaContext *vima = avctx->priv_data;
|
|
int start_pos;
|
|
|
|
for (start_pos = 0; start_pos < 64; start_pos++) {
|
|
unsigned int dest_pos, table_pos;
|
|
|
|
for (table_pos = 0, dest_pos = start_pos;
|
|
table_pos < FF_ARRAY_ELEMS(ff_adpcm_step_table);
|
|
table_pos++, dest_pos += 64) {
|
|
int put = 0, count, table_value;
|
|
|
|
table_value = ff_adpcm_step_table[table_pos];
|
|
for (count = 32; count != 0; count >>= 1) {
|
|
if (start_pos & count)
|
|
put += table_value;
|
|
table_value >>= 1;
|
|
}
|
|
vima->predict_table[dest_pos] = put;
|
|
}
|
|
}
|
|
|
|
avctx->sample_fmt = AV_SAMPLE_FMT_S16;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int decode_frame(AVCodecContext *avctx, void *data,
|
|
int *got_frame_ptr, AVPacket *pkt)
|
|
{
|
|
GetBitContext gb;
|
|
VimaContext *vima = avctx->priv_data;
|
|
AVFrame *frame = data;
|
|
int16_t pcm_data[2];
|
|
uint32_t samples;
|
|
int8_t channel_hint[2];
|
|
int ret, chan, channels = 1;
|
|
|
|
if (pkt->size < 13)
|
|
return AVERROR_INVALIDDATA;
|
|
|
|
if ((ret = init_get_bits8(&gb, pkt->data, pkt->size)) < 0)
|
|
return ret;
|
|
|
|
samples = get_bits_long(&gb, 32);
|
|
if (samples == 0xffffffff) {
|
|
skip_bits_long(&gb, 32);
|
|
samples = get_bits_long(&gb, 32);
|
|
}
|
|
|
|
if (samples > pkt->size * 2)
|
|
return AVERROR_INVALIDDATA;
|
|
|
|
channel_hint[0] = get_sbits(&gb, 8);
|
|
if (channel_hint[0] & 0x80) {
|
|
channel_hint[0] = ~channel_hint[0];
|
|
channels = 2;
|
|
}
|
|
avctx->channels = channels;
|
|
avctx->channel_layout = (channels == 2) ? AV_CH_LAYOUT_STEREO :
|
|
AV_CH_LAYOUT_MONO;
|
|
pcm_data[0] = get_sbits(&gb, 16);
|
|
if (channels > 1) {
|
|
channel_hint[1] = get_sbits(&gb, 8);
|
|
pcm_data[1] = get_sbits(&gb, 16);
|
|
}
|
|
|
|
frame->nb_samples = samples;
|
|
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
|
|
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
|
|
return ret;
|
|
}
|
|
|
|
for (chan = 0; chan < channels; chan++) {
|
|
uint16_t *dest = (uint16_t*)frame->data[0] + chan;
|
|
int step_index = channel_hint[chan];
|
|
int output = pcm_data[chan];
|
|
int sample;
|
|
|
|
for (sample = 0; sample < samples; sample++) {
|
|
int lookup_size, lookup, highbit, lowbits;
|
|
|
|
step_index = av_clip(step_index, 0, 88);
|
|
lookup_size = size_table[step_index];
|
|
lookup = get_bits(&gb, lookup_size);
|
|
highbit = 1 << (lookup_size - 1);
|
|
lowbits = highbit - 1;
|
|
|
|
if (lookup & highbit)
|
|
lookup ^= highbit;
|
|
else
|
|
highbit = 0;
|
|
|
|
if (lookup == lowbits) {
|
|
output = get_sbits(&gb, 16);
|
|
} else {
|
|
int predict_index, diff;
|
|
|
|
predict_index = (lookup << (7 - lookup_size)) | (step_index << 6);
|
|
predict_index = av_clip(predict_index, 0, 5785);
|
|
diff = vima->predict_table[predict_index];
|
|
if (lookup)
|
|
diff += ff_adpcm_step_table[step_index] >> (lookup_size - 1);
|
|
if (highbit)
|
|
diff = -diff;
|
|
|
|
output = av_clip_int16(output + diff);
|
|
}
|
|
|
|
*dest = output;
|
|
dest += channels;
|
|
|
|
step_index += step_index_tables[lookup_size - 2][lookup];
|
|
}
|
|
}
|
|
|
|
*got_frame_ptr = 1;
|
|
|
|
return pkt->size;
|
|
}
|
|
|
|
AVCodec ff_vima_decoder = {
|
|
.name = "vima",
|
|
.type = AVMEDIA_TYPE_AUDIO,
|
|
.id = AV_CODEC_ID_VIMA,
|
|
.priv_data_size = sizeof(VimaContext),
|
|
.init = decode_init,
|
|
.decode = decode_frame,
|
|
.capabilities = CODEC_CAP_DR1,
|
|
.long_name = NULL_IF_CONFIG_SMALL("LucasArts VIMA audio"),
|
|
};
|