* 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>
405 lines
10 KiB
C
405 lines
10 KiB
C
/*
|
|
* Canopus Lossless Codec decoder
|
|
*
|
|
* Copyright (c) 2012 Derek Buitenhuis
|
|
*
|
|
* 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 "dsputil.h"
|
|
#include "get_bits.h"
|
|
#include "avcodec.h"
|
|
#include "internal.h"
|
|
|
|
typedef struct CLLCContext {
|
|
DSPContext dsp;
|
|
AVCodecContext *avctx;
|
|
|
|
uint8_t *swapped_buf;
|
|
int swapped_buf_size;
|
|
} CLLCContext;
|
|
|
|
static int read_code_table(CLLCContext *ctx, GetBitContext *gb, VLC *vlc)
|
|
{
|
|
uint8_t symbols[256];
|
|
uint8_t bits[256];
|
|
uint16_t codes[256];
|
|
int num_lens, num_codes, num_codes_sum, prefix;
|
|
int i, j, count;
|
|
|
|
prefix = 0;
|
|
count = 0;
|
|
num_codes_sum = 0;
|
|
|
|
num_lens = get_bits(gb, 5);
|
|
|
|
for (i = 0; i < num_lens; i++) {
|
|
num_codes = get_bits(gb, 9);
|
|
num_codes_sum += num_codes;
|
|
|
|
if (num_codes_sum > 256) {
|
|
vlc->table = NULL;
|
|
|
|
av_log(ctx->avctx, AV_LOG_ERROR,
|
|
"Too many VLCs (%d) to be read.\n", num_codes_sum);
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
|
|
for (j = 0; j < num_codes; j++) {
|
|
symbols[count] = get_bits(gb, 8);
|
|
bits[count] = i + 1;
|
|
codes[count] = prefix++;
|
|
|
|
count++;
|
|
}
|
|
|
|
prefix <<= 1;
|
|
}
|
|
|
|
return ff_init_vlc_sparse(vlc, 7, count, bits, 1, 1,
|
|
codes, 2, 2, symbols, 1, 1, 0);
|
|
}
|
|
|
|
/*
|
|
* Unlike the RGB24 read/restore, which reads in a component at a time,
|
|
* ARGB read/restore reads in ARGB quads.
|
|
*/
|
|
static int read_argb_line(CLLCContext *ctx, GetBitContext *gb, int *top_left,
|
|
VLC *vlc, uint8_t *outbuf)
|
|
{
|
|
uint8_t *dst;
|
|
int pred[4];
|
|
int code;
|
|
int i;
|
|
|
|
OPEN_READER(bits, gb);
|
|
|
|
dst = outbuf;
|
|
pred[0] = top_left[0];
|
|
pred[1] = top_left[1];
|
|
pred[2] = top_left[2];
|
|
pred[3] = top_left[3];
|
|
|
|
for (i = 0; i < ctx->avctx->width; i++) {
|
|
/* Always get the alpha component */
|
|
UPDATE_CACHE(bits, gb);
|
|
GET_VLC(code, bits, gb, vlc[0].table, 7, 2);
|
|
|
|
pred[0] += code;
|
|
dst[0] = pred[0];
|
|
|
|
/* Skip the components if they are entirely transparent */
|
|
if (dst[0]) {
|
|
/* Red */
|
|
UPDATE_CACHE(bits, gb);
|
|
GET_VLC(code, bits, gb, vlc[1].table, 7, 2);
|
|
|
|
pred[1] += code;
|
|
dst[1] = pred[1];
|
|
|
|
/* Green */
|
|
UPDATE_CACHE(bits, gb);
|
|
GET_VLC(code, bits, gb, vlc[2].table, 7, 2);
|
|
|
|
pred[2] += code;
|
|
dst[2] = pred[2];
|
|
|
|
/* Blue */
|
|
UPDATE_CACHE(bits, gb);
|
|
GET_VLC(code, bits, gb, vlc[3].table, 7, 2);
|
|
|
|
pred[3] += code;
|
|
dst[3] = pred[3];
|
|
} else {
|
|
dst[1] = 0;
|
|
dst[2] = 0;
|
|
dst[3] = 0;
|
|
}
|
|
|
|
dst += 4;
|
|
}
|
|
|
|
CLOSE_READER(bits, gb);
|
|
|
|
dst -= 4 * ctx->avctx->width;
|
|
top_left[0] = dst[0];
|
|
|
|
/* Only stash components if they are not transparent */
|
|
if (top_left[0]) {
|
|
top_left[1] = dst[1];
|
|
top_left[2] = dst[2];
|
|
top_left[3] = dst[3];
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int read_rgb24_component_line(CLLCContext *ctx, GetBitContext *gb,
|
|
int *top_left, VLC *vlc, uint8_t *outbuf)
|
|
{
|
|
uint8_t *dst;
|
|
int pred, code;
|
|
int i;
|
|
|
|
OPEN_READER(bits, gb);
|
|
|
|
dst = outbuf;
|
|
pred = *top_left;
|
|
|
|
/* Simultaneously read and restore the line */
|
|
for (i = 0; i < ctx->avctx->width; i++) {
|
|
UPDATE_CACHE(bits, gb);
|
|
GET_VLC(code, bits, gb, vlc->table, 7, 2);
|
|
|
|
pred += code;
|
|
dst[0] = pred;
|
|
dst += 3;
|
|
}
|
|
|
|
CLOSE_READER(bits, gb);
|
|
|
|
/* Stash the first pixel */
|
|
*top_left = dst[-3 * ctx->avctx->width];
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int decode_argb_frame(CLLCContext *ctx, GetBitContext *gb, AVFrame *pic)
|
|
{
|
|
AVCodecContext *avctx = ctx->avctx;
|
|
uint8_t *dst;
|
|
int pred[4];
|
|
int ret;
|
|
int i, j;
|
|
VLC vlc[4];
|
|
|
|
pred[0] = 0;
|
|
pred[1] = 0x80;
|
|
pred[2] = 0x80;
|
|
pred[3] = 0x80;
|
|
|
|
dst = pic->data[0];
|
|
|
|
skip_bits(gb, 16);
|
|
|
|
/* Read in code table for each plane */
|
|
for (i = 0; i < 4; i++) {
|
|
ret = read_code_table(ctx, gb, &vlc[i]);
|
|
if (ret < 0) {
|
|
for (j = 0; j <= i; j++)
|
|
ff_free_vlc(&vlc[j]);
|
|
|
|
av_log(ctx->avctx, AV_LOG_ERROR,
|
|
"Could not read code table %d.\n", i);
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
/* Read in and restore every line */
|
|
for (i = 0; i < avctx->height; i++) {
|
|
read_argb_line(ctx, gb, pred, vlc, dst);
|
|
|
|
dst += pic->linesize[0];
|
|
}
|
|
|
|
for (i = 0; i < 4; i++)
|
|
ff_free_vlc(&vlc[i]);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int decode_rgb24_frame(CLLCContext *ctx, GetBitContext *gb, AVFrame *pic)
|
|
{
|
|
AVCodecContext *avctx = ctx->avctx;
|
|
uint8_t *dst;
|
|
int pred[3];
|
|
int ret;
|
|
int i, j;
|
|
VLC vlc[3];
|
|
|
|
pred[0] = 0x80;
|
|
pred[1] = 0x80;
|
|
pred[2] = 0x80;
|
|
|
|
dst = pic->data[0];
|
|
|
|
skip_bits(gb, 16);
|
|
|
|
/* Read in code table for each plane */
|
|
for (i = 0; i < 3; i++) {
|
|
ret = read_code_table(ctx, gb, &vlc[i]);
|
|
if (ret < 0) {
|
|
for (j = 0; j <= i; j++)
|
|
ff_free_vlc(&vlc[j]);
|
|
|
|
av_log(ctx->avctx, AV_LOG_ERROR,
|
|
"Could not read code table %d.\n", i);
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
/* Read in and restore every line */
|
|
for (i = 0; i < avctx->height; i++) {
|
|
for (j = 0; j < 3; j++)
|
|
read_rgb24_component_line(ctx, gb, &pred[j], &vlc[j], &dst[j]);
|
|
|
|
dst += pic->linesize[0];
|
|
}
|
|
|
|
for (i = 0; i < 3; i++)
|
|
ff_free_vlc(&vlc[i]);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int cllc_decode_frame(AVCodecContext *avctx, void *data,
|
|
int *got_picture_ptr, AVPacket *avpkt)
|
|
{
|
|
CLLCContext *ctx = avctx->priv_data;
|
|
AVFrame *pic = data;
|
|
uint8_t *src = avpkt->data;
|
|
uint32_t info_tag, info_offset;
|
|
int data_size;
|
|
GetBitContext gb;
|
|
int coding_type, ret;
|
|
|
|
/* Skip the INFO header if present */
|
|
info_offset = 0;
|
|
info_tag = AV_RL32(src);
|
|
if (info_tag == MKTAG('I', 'N', 'F', 'O')) {
|
|
info_offset = AV_RL32(src + 4);
|
|
if (info_offset > UINT32_MAX - 8 || info_offset + 8 > avpkt->size) {
|
|
av_log(avctx, AV_LOG_ERROR,
|
|
"Invalid INFO header offset: 0x%08X is too large.\n",
|
|
info_offset);
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
|
|
info_offset += 8;
|
|
src += info_offset;
|
|
|
|
av_log(avctx, AV_LOG_DEBUG, "Skipping INFO chunk.\n");
|
|
}
|
|
|
|
data_size = (avpkt->size - info_offset) & ~1;
|
|
|
|
/* Make sure our bswap16'd buffer is big enough */
|
|
av_fast_padded_malloc(&ctx->swapped_buf,
|
|
&ctx->swapped_buf_size, data_size);
|
|
if (!ctx->swapped_buf) {
|
|
av_log(avctx, AV_LOG_ERROR, "Could not allocate swapped buffer.\n");
|
|
return AVERROR(ENOMEM);
|
|
}
|
|
|
|
/* bswap16 the buffer since CLLC's bitreader works in 16-bit words */
|
|
ctx->dsp.bswap16_buf((uint16_t *) ctx->swapped_buf, (uint16_t *) src,
|
|
data_size / 2);
|
|
|
|
init_get_bits(&gb, ctx->swapped_buf, data_size * 8);
|
|
|
|
/*
|
|
* Read in coding type. The types are as follows:
|
|
*
|
|
* 0 - YUY2
|
|
* 1 - BGR24 (Triples)
|
|
* 2 - BGR24 (Quads)
|
|
* 3 - BGRA
|
|
*/
|
|
coding_type = (AV_RL32(src) >> 8) & 0xFF;
|
|
av_log(avctx, AV_LOG_DEBUG, "Frame coding type: %d\n", coding_type);
|
|
|
|
switch (coding_type) {
|
|
case 1:
|
|
case 2:
|
|
avctx->pix_fmt = AV_PIX_FMT_RGB24;
|
|
avctx->bits_per_raw_sample = 8;
|
|
|
|
ret = ff_get_buffer(avctx, pic, 0);
|
|
if (ret < 0) {
|
|
av_log(avctx, AV_LOG_ERROR, "Could not allocate buffer.\n");
|
|
return ret;
|
|
}
|
|
|
|
ret = decode_rgb24_frame(ctx, &gb, pic);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
break;
|
|
case 3:
|
|
avctx->pix_fmt = AV_PIX_FMT_ARGB;
|
|
avctx->bits_per_raw_sample = 8;
|
|
|
|
ret = ff_get_buffer(avctx, pic, 0);
|
|
if (ret < 0) {
|
|
av_log(avctx, AV_LOG_ERROR, "Could not allocate buffer.\n");
|
|
return ret;
|
|
}
|
|
|
|
ret = decode_argb_frame(ctx, &gb, pic);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
break;
|
|
default:
|
|
av_log(avctx, AV_LOG_ERROR, "Unknown coding type: %d.\n", coding_type);
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
|
|
pic->key_frame = 1;
|
|
pic->pict_type = AV_PICTURE_TYPE_I;
|
|
|
|
*got_picture_ptr = 1;
|
|
|
|
return avpkt->size;
|
|
}
|
|
|
|
static av_cold int cllc_decode_close(AVCodecContext *avctx)
|
|
{
|
|
CLLCContext *ctx = avctx->priv_data;
|
|
|
|
av_freep(&ctx->swapped_buf);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static av_cold int cllc_decode_init(AVCodecContext *avctx)
|
|
{
|
|
CLLCContext *ctx = avctx->priv_data;
|
|
|
|
/* Initialize various context values */
|
|
ctx->avctx = avctx;
|
|
ctx->swapped_buf = NULL;
|
|
ctx->swapped_buf_size = 0;
|
|
|
|
ff_dsputil_init(&ctx->dsp, avctx);
|
|
|
|
return 0;
|
|
}
|
|
|
|
AVCodec ff_cllc_decoder = {
|
|
.name = "cllc",
|
|
.type = AVMEDIA_TYPE_VIDEO,
|
|
.id = AV_CODEC_ID_CLLC,
|
|
.priv_data_size = sizeof(CLLCContext),
|
|
.init = cllc_decode_init,
|
|
.decode = cllc_decode_frame,
|
|
.close = cllc_decode_close,
|
|
.capabilities = CODEC_CAP_DR1,
|
|
.long_name = NULL_IF_CONFIG_SMALL("Canopus Lossless Codec"),
|
|
};
|