* 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>
341 lines
11 KiB
C
341 lines
11 KiB
C
/*
|
|
* BMP image format decoder
|
|
* Copyright (c) 2005 Mans Rullgard
|
|
*
|
|
* 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 "avcodec.h"
|
|
#include "bytestream.h"
|
|
#include "bmp.h"
|
|
#include "internal.h"
|
|
#include "msrledec.h"
|
|
|
|
static int bmp_decode_frame(AVCodecContext *avctx,
|
|
void *data, int *got_frame,
|
|
AVPacket *avpkt)
|
|
{
|
|
const uint8_t *buf = avpkt->data;
|
|
int buf_size = avpkt->size;
|
|
AVFrame *p = data;
|
|
unsigned int fsize, hsize;
|
|
int width, height;
|
|
unsigned int depth;
|
|
BiCompression comp;
|
|
unsigned int ihsize;
|
|
int i, j, n, linesize, ret;
|
|
uint32_t rgb[3] = {0};
|
|
uint32_t alpha = 0;
|
|
uint8_t *ptr;
|
|
int dsize;
|
|
const uint8_t *buf0 = buf;
|
|
GetByteContext gb;
|
|
|
|
if (buf_size < 14) {
|
|
av_log(avctx, AV_LOG_ERROR, "buf size too small (%d)\n", buf_size);
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
|
|
if (bytestream_get_byte(&buf) != 'B' ||
|
|
bytestream_get_byte(&buf) != 'M') {
|
|
av_log(avctx, AV_LOG_ERROR, "bad magic number\n");
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
|
|
fsize = bytestream_get_le32(&buf);
|
|
if (buf_size < fsize) {
|
|
av_log(avctx, AV_LOG_ERROR, "not enough data (%d < %d), trying to decode anyway\n",
|
|
buf_size, fsize);
|
|
fsize = buf_size;
|
|
}
|
|
|
|
buf += 2; /* reserved1 */
|
|
buf += 2; /* reserved2 */
|
|
|
|
hsize = bytestream_get_le32(&buf); /* header size */
|
|
ihsize = bytestream_get_le32(&buf); /* more header size */
|
|
if (ihsize + 14 > hsize) {
|
|
av_log(avctx, AV_LOG_ERROR, "invalid header size %d\n", hsize);
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
|
|
/* sometimes file size is set to some headers size, set a real size in that case */
|
|
if (fsize == 14 || fsize == ihsize + 14)
|
|
fsize = buf_size - 2;
|
|
|
|
if (fsize <= hsize) {
|
|
av_log(avctx, AV_LOG_ERROR, "declared file size is less than header size (%d < %d)\n",
|
|
fsize, hsize);
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
|
|
switch (ihsize) {
|
|
case 40: // windib
|
|
case 56: // windib v3
|
|
case 64: // OS/2 v2
|
|
case 108: // windib v4
|
|
case 124: // windib v5
|
|
width = bytestream_get_le32(&buf);
|
|
height = bytestream_get_le32(&buf);
|
|
break;
|
|
case 12: // OS/2 v1
|
|
width = bytestream_get_le16(&buf);
|
|
height = bytestream_get_le16(&buf);
|
|
break;
|
|
default:
|
|
av_log(avctx, AV_LOG_ERROR, "unsupported BMP file, patch welcome\n");
|
|
return AVERROR_PATCHWELCOME;
|
|
}
|
|
|
|
/* planes */
|
|
if (bytestream_get_le16(&buf) != 1) {
|
|
av_log(avctx, AV_LOG_ERROR, "invalid BMP header\n");
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
|
|
depth = bytestream_get_le16(&buf);
|
|
|
|
if (ihsize >= 40)
|
|
comp = bytestream_get_le32(&buf);
|
|
else
|
|
comp = BMP_RGB;
|
|
|
|
if (comp != BMP_RGB && comp != BMP_BITFIELDS && comp != BMP_RLE4 &&
|
|
comp != BMP_RLE8) {
|
|
av_log(avctx, AV_LOG_ERROR, "BMP coding %d not supported\n", comp);
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
|
|
if (comp == BMP_BITFIELDS) {
|
|
buf += 20;
|
|
rgb[0] = bytestream_get_le32(&buf);
|
|
rgb[1] = bytestream_get_le32(&buf);
|
|
rgb[2] = bytestream_get_le32(&buf);
|
|
alpha = bytestream_get_le32(&buf);
|
|
}
|
|
|
|
avctx->width = width;
|
|
avctx->height = height > 0 ? height : -height;
|
|
|
|
avctx->pix_fmt = AV_PIX_FMT_NONE;
|
|
|
|
switch (depth) {
|
|
case 32:
|
|
if (comp == BMP_BITFIELDS) {
|
|
if (rgb[0] == 0xFF000000 && rgb[1] == 0x00FF0000 && rgb[2] == 0x0000FF00)
|
|
avctx->pix_fmt = alpha ? AV_PIX_FMT_ABGR : AV_PIX_FMT_0BGR;
|
|
else if (rgb[0] == 0x00FF0000 && rgb[1] == 0x0000FF00 && rgb[2] == 0x000000FF)
|
|
avctx->pix_fmt = alpha ? AV_PIX_FMT_BGRA : AV_PIX_FMT_BGR0;
|
|
else if (rgb[0] == 0x0000FF00 && rgb[1] == 0x00FF0000 && rgb[2] == 0xFF000000)
|
|
avctx->pix_fmt = alpha ? AV_PIX_FMT_ARGB : AV_PIX_FMT_0RGB;
|
|
else if (rgb[0] == 0x000000FF && rgb[1] == 0x0000FF00 && rgb[2] == 0x00FF0000)
|
|
avctx->pix_fmt = alpha ? AV_PIX_FMT_RGBA : AV_PIX_FMT_RGB0;
|
|
else {
|
|
av_log(avctx, AV_LOG_ERROR, "Unknown bitfields %0X %0X %0X\n", rgb[0], rgb[1], rgb[2]);
|
|
return AVERROR(EINVAL);
|
|
}
|
|
} else {
|
|
avctx->pix_fmt = AV_PIX_FMT_BGRA;
|
|
}
|
|
break;
|
|
case 24:
|
|
avctx->pix_fmt = AV_PIX_FMT_BGR24;
|
|
break;
|
|
case 16:
|
|
if (comp == BMP_RGB)
|
|
avctx->pix_fmt = AV_PIX_FMT_RGB555;
|
|
else if (comp == BMP_BITFIELDS) {
|
|
if (rgb[0] == 0xF800 && rgb[1] == 0x07E0 && rgb[2] == 0x001F)
|
|
avctx->pix_fmt = AV_PIX_FMT_RGB565;
|
|
else if (rgb[0] == 0x7C00 && rgb[1] == 0x03E0 && rgb[2] == 0x001F)
|
|
avctx->pix_fmt = AV_PIX_FMT_RGB555;
|
|
else if (rgb[0] == 0x0F00 && rgb[1] == 0x00F0 && rgb[2] == 0x000F)
|
|
avctx->pix_fmt = AV_PIX_FMT_RGB444;
|
|
else {
|
|
av_log(avctx, AV_LOG_ERROR, "Unknown bitfields %0X %0X %0X\n", rgb[0], rgb[1], rgb[2]);
|
|
return AVERROR(EINVAL);
|
|
}
|
|
}
|
|
break;
|
|
case 8:
|
|
if (hsize - ihsize - 14 > 0)
|
|
avctx->pix_fmt = AV_PIX_FMT_PAL8;
|
|
else
|
|
avctx->pix_fmt = AV_PIX_FMT_GRAY8;
|
|
break;
|
|
case 1:
|
|
case 4:
|
|
if (hsize - ihsize - 14 > 0) {
|
|
avctx->pix_fmt = AV_PIX_FMT_PAL8;
|
|
} else {
|
|
av_log(avctx, AV_LOG_ERROR, "Unknown palette for %d-colour BMP\n", 1<<depth);
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
break;
|
|
default:
|
|
av_log(avctx, AV_LOG_ERROR, "depth %d not supported\n", depth);
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
|
|
if (avctx->pix_fmt == AV_PIX_FMT_NONE) {
|
|
av_log(avctx, AV_LOG_ERROR, "unsupported pixel format\n");
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
|
|
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;
|
|
|
|
buf = buf0 + hsize;
|
|
dsize = buf_size - hsize;
|
|
|
|
/* Line size in file multiple of 4 */
|
|
n = ((avctx->width * depth + 31) / 8) & ~3;
|
|
|
|
if (n * avctx->height > dsize && comp != BMP_RLE4 && comp != BMP_RLE8) {
|
|
av_log(avctx, AV_LOG_ERROR, "not enough data (%d < %d)\n",
|
|
dsize, n * avctx->height);
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
|
|
// RLE may skip decoding some picture areas, so blank picture before decoding
|
|
if (comp == BMP_RLE4 || comp == BMP_RLE8)
|
|
memset(p->data[0], 0, avctx->height * p->linesize[0]);
|
|
|
|
if (height > 0) {
|
|
ptr = p->data[0] + (avctx->height - 1) * p->linesize[0];
|
|
linesize = -p->linesize[0];
|
|
} else {
|
|
ptr = p->data[0];
|
|
linesize = p->linesize[0];
|
|
}
|
|
|
|
if (avctx->pix_fmt == AV_PIX_FMT_PAL8) {
|
|
int colors = 1 << depth;
|
|
|
|
memset(p->data[1], 0, 1024);
|
|
|
|
if (ihsize >= 36) {
|
|
int t;
|
|
buf = buf0 + 46;
|
|
t = bytestream_get_le32(&buf);
|
|
if (t < 0 || t > (1 << depth)) {
|
|
av_log(avctx, AV_LOG_ERROR, "Incorrect number of colors - %X for bitdepth %d\n", t, depth);
|
|
} else if (t) {
|
|
colors = t;
|
|
}
|
|
}
|
|
buf = buf0 + 14 + ihsize; //palette location
|
|
// OS/2 bitmap, 3 bytes per palette entry
|
|
if ((hsize-ihsize-14) < (colors << 2)) {
|
|
if ((hsize-ihsize-14) < colors * 3) {
|
|
av_log(avctx, AV_LOG_ERROR, "palette doesnt fit in packet\n");
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
for (i = 0; i < colors; i++)
|
|
((uint32_t*)p->data[1])[i] = (0xFFU<<24) | bytestream_get_le24(&buf);
|
|
} else {
|
|
for (i = 0; i < colors; i++)
|
|
((uint32_t*)p->data[1])[i] = 0xFFU << 24 | bytestream_get_le32(&buf);
|
|
}
|
|
buf = buf0 + hsize;
|
|
}
|
|
if (comp == BMP_RLE4 || comp == BMP_RLE8) {
|
|
if (height < 0) {
|
|
p->data[0] += p->linesize[0] * (avctx->height - 1);
|
|
p->linesize[0] = -p->linesize[0];
|
|
}
|
|
bytestream2_init(&gb, buf, dsize);
|
|
ff_msrle_decode(avctx, (AVPicture*)p, depth, &gb);
|
|
if (height < 0) {
|
|
p->data[0] += p->linesize[0] * (avctx->height - 1);
|
|
p->linesize[0] = -p->linesize[0];
|
|
}
|
|
} else {
|
|
switch (depth) {
|
|
case 1:
|
|
for (i = 0; i < avctx->height; i++) {
|
|
int j;
|
|
for (j = 0; j < n; j++) {
|
|
ptr[j*8+0] = buf[j] >> 7;
|
|
ptr[j*8+1] = (buf[j] >> 6) & 1;
|
|
ptr[j*8+2] = (buf[j] >> 5) & 1;
|
|
ptr[j*8+3] = (buf[j] >> 4) & 1;
|
|
ptr[j*8+4] = (buf[j] >> 3) & 1;
|
|
ptr[j*8+5] = (buf[j] >> 2) & 1;
|
|
ptr[j*8+6] = (buf[j] >> 1) & 1;
|
|
ptr[j*8+7] = buf[j] & 1;
|
|
}
|
|
buf += n;
|
|
ptr += linesize;
|
|
}
|
|
break;
|
|
case 8:
|
|
case 24:
|
|
case 32:
|
|
for (i = 0; i < avctx->height; i++) {
|
|
memcpy(ptr, buf, n);
|
|
buf += n;
|
|
ptr += linesize;
|
|
}
|
|
break;
|
|
case 4:
|
|
for (i = 0; i < avctx->height; i++) {
|
|
int j;
|
|
for (j = 0; j < n; j++) {
|
|
ptr[j*2+0] = (buf[j] >> 4) & 0xF;
|
|
ptr[j*2+1] = buf[j] & 0xF;
|
|
}
|
|
buf += n;
|
|
ptr += linesize;
|
|
}
|
|
break;
|
|
case 16:
|
|
for (i = 0; i < avctx->height; i++) {
|
|
const uint16_t *src = (const uint16_t *) buf;
|
|
uint16_t *dst = (uint16_t *) ptr;
|
|
|
|
for (j = 0; j < avctx->width; j++)
|
|
*dst++ = av_le2ne16(*src++);
|
|
|
|
buf += n;
|
|
ptr += linesize;
|
|
}
|
|
break;
|
|
default:
|
|
av_log(avctx, AV_LOG_ERROR, "BMP decoder is broken\n");
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
}
|
|
|
|
*got_frame = 1;
|
|
|
|
return buf_size;
|
|
}
|
|
|
|
AVCodec ff_bmp_decoder = {
|
|
.name = "bmp",
|
|
.type = AVMEDIA_TYPE_VIDEO,
|
|
.id = AV_CODEC_ID_BMP,
|
|
.decode = bmp_decode_frame,
|
|
.capabilities = CODEC_CAP_DR1,
|
|
.long_name = NULL_IF_CONFIG_SMALL("BMP (Windows and OS/2 bitmap)"),
|
|
};
|