* 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>
306 lines
8.9 KiB
C
306 lines
8.9 KiB
C
/*
|
|
* CDXL video decoder
|
|
* Copyright (c) 2011-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
|
|
*/
|
|
|
|
#define UNCHECKED_BITSTREAM_READER 1
|
|
|
|
#include "libavutil/intreadwrite.h"
|
|
#include "libavutil/imgutils.h"
|
|
#include "avcodec.h"
|
|
#include "get_bits.h"
|
|
#include "internal.h"
|
|
|
|
#define BIT_PLANAR 0x00
|
|
#define CHUNKY 0x20
|
|
#define BYTE_PLANAR 0x40
|
|
#define BIT_LINE 0x80
|
|
#define BYTE_LINE 0xC0
|
|
|
|
typedef struct {
|
|
AVCodecContext *avctx;
|
|
int bpp;
|
|
int format;
|
|
int padded_bits;
|
|
const uint8_t *palette;
|
|
int palette_size;
|
|
const uint8_t *video;
|
|
int video_size;
|
|
uint8_t *new_video;
|
|
int new_video_size;
|
|
} CDXLVideoContext;
|
|
|
|
static av_cold int cdxl_decode_init(AVCodecContext *avctx)
|
|
{
|
|
CDXLVideoContext *c = avctx->priv_data;
|
|
|
|
c->new_video_size = 0;
|
|
c->avctx = avctx;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void import_palette(CDXLVideoContext *c, uint32_t *new_palette)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < c->palette_size / 2; i++) {
|
|
unsigned rgb = AV_RB16(&c->palette[i * 2]);
|
|
unsigned r = ((rgb >> 8) & 0xF) * 0x11;
|
|
unsigned g = ((rgb >> 4) & 0xF) * 0x11;
|
|
unsigned b = (rgb & 0xF) * 0x11;
|
|
AV_WN32(&new_palette[i], (0xFFU << 24) | (r << 16) | (g << 8) | b);
|
|
}
|
|
}
|
|
|
|
static void bitplanar2chunky(CDXLVideoContext *c, int linesize, uint8_t *out)
|
|
{
|
|
GetBitContext gb;
|
|
int x, y, plane;
|
|
|
|
init_get_bits(&gb, c->video, c->video_size * 8);
|
|
for (plane = 0; plane < c->bpp; plane++) {
|
|
for (y = 0; y < c->avctx->height; y++) {
|
|
for (x = 0; x < c->avctx->width; x++)
|
|
out[linesize * y + x] |= get_bits1(&gb) << plane;
|
|
skip_bits(&gb, c->padded_bits);
|
|
}
|
|
}
|
|
}
|
|
|
|
static void bitline2chunky(CDXLVideoContext *c, int linesize, uint8_t *out)
|
|
{
|
|
GetBitContext gb;
|
|
int x, y, plane;
|
|
|
|
init_get_bits(&gb, c->video, c->video_size * 8);
|
|
for (y = 0; y < c->avctx->height; y++) {
|
|
for (plane = 0; plane < c->bpp; plane++) {
|
|
for (x = 0; x < c->avctx->width; x++)
|
|
out[linesize * y + x] |= get_bits1(&gb) << plane;
|
|
skip_bits(&gb, c->padded_bits);
|
|
}
|
|
}
|
|
}
|
|
|
|
static void import_format(CDXLVideoContext *c, int linesize, uint8_t *out)
|
|
{
|
|
memset(out, 0, linesize * c->avctx->height);
|
|
|
|
switch (c->format) {
|
|
case BIT_PLANAR:
|
|
bitplanar2chunky(c, linesize, out);
|
|
break;
|
|
case BIT_LINE:
|
|
bitline2chunky(c, linesize, out);
|
|
break;
|
|
}
|
|
}
|
|
|
|
static void cdxl_decode_rgb(CDXLVideoContext *c, AVFrame *frame)
|
|
{
|
|
uint32_t *new_palette = (uint32_t *)frame->data[1];
|
|
|
|
memset(frame->data[1], 0, AVPALETTE_SIZE);
|
|
import_palette(c, new_palette);
|
|
import_format(c, frame->linesize[0], frame->data[0]);
|
|
}
|
|
|
|
static void cdxl_decode_ham6(CDXLVideoContext *c, AVFrame *frame)
|
|
{
|
|
AVCodecContext *avctx = c->avctx;
|
|
uint32_t new_palette[16], r, g, b;
|
|
uint8_t *ptr, *out, index, op;
|
|
int x, y;
|
|
|
|
ptr = c->new_video;
|
|
out = frame->data[0];
|
|
|
|
import_palette(c, new_palette);
|
|
import_format(c, avctx->width, c->new_video);
|
|
|
|
for (y = 0; y < avctx->height; y++) {
|
|
r = new_palette[0] & 0xFF0000;
|
|
g = new_palette[0] & 0xFF00;
|
|
b = new_palette[0] & 0xFF;
|
|
for (x = 0; x < avctx->width; x++) {
|
|
index = *ptr++;
|
|
op = index >> 4;
|
|
index &= 15;
|
|
switch (op) {
|
|
case 0:
|
|
r = new_palette[index] & 0xFF0000;
|
|
g = new_palette[index] & 0xFF00;
|
|
b = new_palette[index] & 0xFF;
|
|
break;
|
|
case 1:
|
|
b = index * 0x11;
|
|
break;
|
|
case 2:
|
|
r = index * 0x11 << 16;
|
|
break;
|
|
case 3:
|
|
g = index * 0x11 << 8;
|
|
break;
|
|
}
|
|
AV_WL24(out + x * 3, r | g | b);
|
|
}
|
|
out += frame->linesize[0];
|
|
}
|
|
}
|
|
|
|
static void cdxl_decode_ham8(CDXLVideoContext *c, AVFrame *frame)
|
|
{
|
|
AVCodecContext *avctx = c->avctx;
|
|
uint32_t new_palette[64], r, g, b;
|
|
uint8_t *ptr, *out, index, op;
|
|
int x, y;
|
|
|
|
ptr = c->new_video;
|
|
out = frame->data[0];
|
|
|
|
import_palette(c, new_palette);
|
|
import_format(c, avctx->width, c->new_video);
|
|
|
|
for (y = 0; y < avctx->height; y++) {
|
|
r = new_palette[0] & 0xFF0000;
|
|
g = new_palette[0] & 0xFF00;
|
|
b = new_palette[0] & 0xFF;
|
|
for (x = 0; x < avctx->width; x++) {
|
|
index = *ptr++;
|
|
op = index >> 6;
|
|
index &= 63;
|
|
switch (op) {
|
|
case 0:
|
|
r = new_palette[index] & 0xFF0000;
|
|
g = new_palette[index] & 0xFF00;
|
|
b = new_palette[index] & 0xFF;
|
|
break;
|
|
case 1:
|
|
b = (index << 2) | (b & 3);
|
|
break;
|
|
case 2:
|
|
r = (index << 18) | (r & (3 << 16));
|
|
break;
|
|
case 3:
|
|
g = (index << 10) | (g & (3 << 8));
|
|
break;
|
|
}
|
|
AV_WL24(out + x * 3, r | g | b);
|
|
}
|
|
out += frame->linesize[0];
|
|
}
|
|
}
|
|
|
|
static int cdxl_decode_frame(AVCodecContext *avctx, void *data,
|
|
int *got_frame, AVPacket *pkt)
|
|
{
|
|
CDXLVideoContext *c = avctx->priv_data;
|
|
AVFrame * const p = data;
|
|
int ret, w, h, encoding, aligned_width, buf_size = pkt->size;
|
|
const uint8_t *buf = pkt->data;
|
|
|
|
if (buf_size < 32)
|
|
return AVERROR_INVALIDDATA;
|
|
encoding = buf[1] & 7;
|
|
c->format = buf[1] & 0xE0;
|
|
w = AV_RB16(&buf[14]);
|
|
h = AV_RB16(&buf[16]);
|
|
c->bpp = buf[19];
|
|
c->palette_size = AV_RB16(&buf[20]);
|
|
c->palette = buf + 32;
|
|
c->video = c->palette + c->palette_size;
|
|
c->video_size = buf_size - c->palette_size - 32;
|
|
|
|
if (c->palette_size > 512)
|
|
return AVERROR_INVALIDDATA;
|
|
if (buf_size < c->palette_size + 32)
|
|
return AVERROR_INVALIDDATA;
|
|
if (c->bpp < 1)
|
|
return AVERROR_INVALIDDATA;
|
|
if (c->format != BIT_PLANAR && c->format != BIT_LINE) {
|
|
av_log_ask_for_sample(avctx, "unsupported pixel format: 0x%0x\n", c->format);
|
|
return AVERROR_PATCHWELCOME;
|
|
}
|
|
|
|
if ((ret = av_image_check_size(w, h, 0, avctx)) < 0)
|
|
return ret;
|
|
if (w != avctx->width || h != avctx->height)
|
|
avcodec_set_dimensions(avctx, w, h);
|
|
|
|
aligned_width = FFALIGN(c->avctx->width, 16);
|
|
c->padded_bits = aligned_width - c->avctx->width;
|
|
if (c->video_size < aligned_width * avctx->height * c->bpp / 8)
|
|
return AVERROR_INVALIDDATA;
|
|
if (!encoding && c->palette_size && c->bpp <= 8) {
|
|
avctx->pix_fmt = AV_PIX_FMT_PAL8;
|
|
} else if (encoding == 1 && (c->bpp == 6 || c->bpp == 8)) {
|
|
if (c->palette_size != (1 << (c->bpp - 1)))
|
|
return AVERROR_INVALIDDATA;
|
|
avctx->pix_fmt = AV_PIX_FMT_BGR24;
|
|
} else {
|
|
av_log_ask_for_sample(avctx, "unsupported encoding %d and bpp %d\n",
|
|
encoding, c->bpp);
|
|
return AVERROR_PATCHWELCOME;
|
|
}
|
|
|
|
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;
|
|
|
|
if (encoding) {
|
|
av_fast_padded_malloc(&c->new_video, &c->new_video_size,
|
|
h * w + FF_INPUT_BUFFER_PADDING_SIZE);
|
|
if (!c->new_video)
|
|
return AVERROR(ENOMEM);
|
|
if (c->bpp == 8)
|
|
cdxl_decode_ham8(c, p);
|
|
else
|
|
cdxl_decode_ham6(c, p);
|
|
} else {
|
|
cdxl_decode_rgb(c, p);
|
|
}
|
|
*got_frame = 1;
|
|
|
|
return buf_size;
|
|
}
|
|
|
|
static av_cold int cdxl_decode_end(AVCodecContext *avctx)
|
|
{
|
|
CDXLVideoContext *c = avctx->priv_data;
|
|
|
|
av_free(c->new_video);
|
|
|
|
return 0;
|
|
}
|
|
|
|
AVCodec ff_cdxl_decoder = {
|
|
.name = "cdxl",
|
|
.type = AVMEDIA_TYPE_VIDEO,
|
|
.id = AV_CODEC_ID_CDXL,
|
|
.priv_data_size = sizeof(CDXLVideoContext),
|
|
.init = cdxl_decode_init,
|
|
.close = cdxl_decode_end,
|
|
.decode = cdxl_decode_frame,
|
|
.capabilities = CODEC_CAP_DR1,
|
|
.long_name = NULL_IF_CONFIG_SMALL("Commodore CDXL video"),
|
|
};
|