virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

Bink video decoder now can use extradata to detect alpha plane presence

Browse Source 
Originally committed as revision 21979 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Kostya Shishkov 2010-02-23 06:39:23 +00:00
parent a45972a806
commit ba3e821414
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/bink.c
View File

@ -27,6 +27,9 @@
#define ALT_BITSTREAM_READER_LE #define ALT_BITSTREAM_READER_LE
#include "get_bits.h" #include "get_bits.h"
#define BINK_FLAG_ALPHA 0x00100000
#define BINK_FLAG_GRAY 0x00020000
static VLC bink_trees[16]; static VLC bink_trees[16];
/** /**
@ -930,13 +933,19 @@ static av_cold int decode_init(AVCodecContext *avctx)
BinkContext * const c = avctx->priv_data; BinkContext * const c = avctx->priv_data;
static VLC_TYPE table[16 * 128][2]; static VLC_TYPE table[16 * 128][2];
int i; int i;
int flags;
c->version = avctx->codec_tag >> 24; c->version = avctx->codec_tag >> 24;
if (c->version < 'c') { if (c->version < 'c') {
av_log(avctx, AV_LOG_ERROR, "Too old version '%c'\n", c->version); av_log(avctx, AV_LOG_ERROR, "Too old version '%c'\n", c->version);
return -1; return -1;
} }
c->has_alpha = 0; //TODO: demuxer should supply decoder with flags if (avctx->extradata_size < 4) {
av_log(avctx, AV_LOG_ERROR, "Extradata missing or too short\n");
return -1;
}
flags = AV_RL32(avctx->extradata);
c->has_alpha = flags & BINK_FLAG_ALPHA;
c->swap_planes = c->version >= 'i'; c->swap_planes = c->version >= 'i';
if (!bink_trees[15].table) { if (!bink_trees[15].table) {
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {