* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavutil/attributes.h"
#include "libavutil/imgutils.h"
+#include "libavutil/internal.h"
+
+#define BITSTREAM_READER_LE
#include "avcodec.h"
-#include "dsputil.h"
#include "binkdata.h"
#include "binkdsp.h"
+#include "bitstream.h"
+#include "blockdsp.h"
+#include "hpeldsp.h"
#include "internal.h"
#include "mathops.h"
-#define BITSTREAM_READER_LE
-#include "get_bits.h"
-
#define BINK_FLAG_ALPHA 0x00100000
#define BINK_FLAG_GRAY 0x00020000
uint8_t syms[16]; ///< leaf value to symbol mapping
} Tree;
-#define GET_HUFF(gb, tree) (tree).syms[get_vlc2(gb, bink_trees[(tree).vlc_num].table,\
- bink_trees[(tree).vlc_num].bits, 1)]
+#define GET_HUFF(bc, tree) \
+ (tree).syms[bitstream_read_vlc(bc, bink_trees[(tree).vlc_num].table, \
+ bink_trees[(tree).vlc_num].bits, 1)]
/**
* data structure used for decoding single Bink data type
*/
typedef struct BinkContext {
AVCodecContext *avctx;
- DSPContext dsp;
- BinkDSPContext bdsp;
- AVFrame *pic, *last;
+ BlockDSPContext bdsp;
+ HpelDSPContext hdsp;
+ BinkDSPContext binkdsp;
+ AVFrame *last;
int version; ///< internal Bink file version
int has_alpha;
int swap_planes;
/**
* Merge two consequent lists of equal size depending on bits read.
*
- * @param gb context for reading bits
+ * @param bc context for reading bits
* @param dst buffer where merged list will be written to
* @param src pointer to the head of the first list (the second lists starts at src+size)
* @param size input lists size
*/
-static void merge(GetBitContext *gb, uint8_t *dst, uint8_t *src, int size)
+static void merge(BitstreamContext *bc, uint8_t *dst, uint8_t *src, int size)
{
uint8_t *src2 = src + size;
int size2 = size;
do {
- if (!get_bits1(gb)) {
+ if (!bitstream_read_bit(bc)) {
*dst++ = *src++;
size--;
} else {
/**
* Read information about Huffman tree used to decode data.
*
- * @param gb context for reading bits
+ * @param bc context for reading bits
* @param tree pointer for storing tree data
*/
-static void read_tree(GetBitContext *gb, Tree *tree)
+static void read_tree(BitstreamContext *bc, Tree *tree)
{
uint8_t tmp1[16] = { 0 }, tmp2[16], *in = tmp1, *out = tmp2;
int i, t, len;
- tree->vlc_num = get_bits(gb, 4);
+ tree->vlc_num = bitstream_read(bc, 4);
if (!tree->vlc_num) {
for (i = 0; i < 16; i++)
tree->syms[i] = i;
return;
}
- if (get_bits1(gb)) {
- len = get_bits(gb, 3);
+ if (bitstream_read_bit(bc)) {
+ len = bitstream_read(bc, 3);
for (i = 0; i <= len; i++) {
- tree->syms[i] = get_bits(gb, 4);
+ tree->syms[i] = bitstream_read(bc, 4);
tmp1[tree->syms[i]] = 1;
}
for (i = 0; i < 16 && len < 16 - 1; i++)
if (!tmp1[i])
tree->syms[++len] = i;
} else {
- len = get_bits(gb, 2);
+ len = bitstream_read(bc, 2);
for (i = 0; i < 16; i++)
in[i] = i;
for (i = 0; i <= len; i++) {
int size = 1 << i;
for (t = 0; t < 16; t += size << 1)
- merge(gb, out + t, in + t, size);
+ merge(bc, out + t, in + t, size);
FFSWAP(uint8_t*, in, out);
}
memcpy(tree->syms, in, 16);
/**
* Prepare bundle for decoding data.
*
- * @param gb context for reading bits
+ * @param bc context for reading bits
* @param c decoder context
* @param bundle_num number of the bundle to initialize
*/
-static void read_bundle(GetBitContext *gb, BinkContext *c, int bundle_num)
+static void read_bundle(BitstreamContext *bc, BinkContext *c, int bundle_num)
{
int i;
if (bundle_num == BINK_SRC_COLORS) {
for (i = 0; i < 16; i++)
- read_tree(gb, &c->col_high[i]);
+ read_tree(bc, &c->col_high[i]);
c->col_lastval = 0;
}
if (bundle_num != BINK_SRC_INTRA_DC && bundle_num != BINK_SRC_INTER_DC)
- read_tree(gb, &c->bundle[bundle_num].tree);
+ read_tree(bc, &c->bundle[bundle_num].tree);
c->bundle[bundle_num].cur_dec =
c->bundle[bundle_num].cur_ptr = c->bundle[bundle_num].data;
}
/**
* common check before starting decoding bundle data
*
- * @param gb context for reading bits
+ * @param bc context for reading bits
* @param b bundle
* @param t variable where number of elements to decode will be stored
*/
-#define CHECK_READ_VAL(gb, b, t) \
+#define CHECK_READ_VAL(bc, b, t) \
if (!b->cur_dec || (b->cur_dec > b->cur_ptr)) \
return 0; \
- t = get_bits(gb, b->len); \
+ t = bitstream_read(bc, b->len); \
if (!t) { \
b->cur_dec = NULL; \
return 0; \
} \
-static int read_runs(AVCodecContext *avctx, GetBitContext *gb, Bundle *b)
+static int read_runs(AVCodecContext *avctx, BitstreamContext *bc, Bundle *b)
{
int t, v;
const uint8_t *dec_end;
- CHECK_READ_VAL(gb, b, t);
+ CHECK_READ_VAL(bc, b, t);
dec_end = b->cur_dec + t;
if (dec_end > b->data_end) {
av_log(avctx, AV_LOG_ERROR, "Run value went out of bounds\n");
return AVERROR_INVALIDDATA;
}
- if (get_bits1(gb)) {
- v = get_bits(gb, 4);
+ if (bitstream_read_bit(bc)) {
+ v = bitstream_read(bc, 4);
memset(b->cur_dec, v, t);
b->cur_dec += t;
} else {
while (b->cur_dec < dec_end)
- *b->cur_dec++ = GET_HUFF(gb, b->tree);
+ *b->cur_dec++ = GET_HUFF(bc, b->tree);
}
return 0;
}
-static int read_motion_values(AVCodecContext *avctx, GetBitContext *gb, Bundle *b)
+static int read_motion_values(AVCodecContext *avctx, BitstreamContext *bc, Bundle *b)
{
- int t, sign, v;
+ int t, v;
const uint8_t *dec_end;
- CHECK_READ_VAL(gb, b, t);
+ CHECK_READ_VAL(bc, b, t);
dec_end = b->cur_dec + t;
if (dec_end > b->data_end) {
av_log(avctx, AV_LOG_ERROR, "Too many motion values\n");
return AVERROR_INVALIDDATA;
}
- if (get_bits1(gb)) {
- v = get_bits(gb, 4);
+ if (bitstream_read_bit(bc)) {
+ v = bitstream_read(bc, 4);
if (v) {
- sign = -get_bits1(gb);
- v = (v ^ sign) - sign;
+ v = bitstream_apply_sign(bc, v);
}
memset(b->cur_dec, v, t);
b->cur_dec += t;
} else {
while (b->cur_dec < dec_end) {
- v = GET_HUFF(gb, b->tree);
+ v = GET_HUFF(bc, b->tree);
if (v) {
- sign = -get_bits1(gb);
- v = (v ^ sign) - sign;
+ v = bitstream_apply_sign(bc, v);
}
*b->cur_dec++ = v;
}
static const uint8_t bink_rlelens[4] = { 4, 8, 12, 32 };
-static int read_block_types(AVCodecContext *avctx, GetBitContext *gb, Bundle *b)
+static int read_block_types(AVCodecContext *avctx, BitstreamContext *bc, Bundle *b)
{
int t, v;
int last = 0;
const uint8_t *dec_end;
- CHECK_READ_VAL(gb, b, t);
+ CHECK_READ_VAL(bc, b, t);
dec_end = b->cur_dec + t;
if (dec_end > b->data_end) {
av_log(avctx, AV_LOG_ERROR, "Too many block type values\n");
return AVERROR_INVALIDDATA;
}
- if (get_bits1(gb)) {
- v = get_bits(gb, 4);
+ if (bitstream_read_bit(bc)) {
+ v = bitstream_read(bc, 4);
memset(b->cur_dec, v, t);
b->cur_dec += t;
} else {
while (b->cur_dec < dec_end) {
- v = GET_HUFF(gb, b->tree);
+ v = GET_HUFF(bc, b->tree);
if (v < 12) {
last = v;
*b->cur_dec++ = v;
return 0;
}
-static int read_patterns(AVCodecContext *avctx, GetBitContext *gb, Bundle *b)
+static int read_patterns(AVCodecContext *avctx, BitstreamContext *bc, Bundle *b)
{
int t, v;
const uint8_t *dec_end;
- CHECK_READ_VAL(gb, b, t);
+ CHECK_READ_VAL(bc, b, t);
dec_end = b->cur_dec + t;
if (dec_end > b->data_end) {
av_log(avctx, AV_LOG_ERROR, "Too many pattern values\n");
return AVERROR_INVALIDDATA;
}
while (b->cur_dec < dec_end) {
- v = GET_HUFF(gb, b->tree);
- v |= GET_HUFF(gb, b->tree) << 4;
+ v = GET_HUFF(bc, b->tree);
+ v |= GET_HUFF(bc, b->tree) << 4;
*b->cur_dec++ = v;
}
return 0;
}
-static int read_colors(GetBitContext *gb, Bundle *b, BinkContext *c)
+static int read_colors(BitstreamContext *bc, Bundle *b, BinkContext *c)
{
int t, sign, v;
const uint8_t *dec_end;
- CHECK_READ_VAL(gb, b, t);
+ CHECK_READ_VAL(bc, b, t);
dec_end = b->cur_dec + t;
if (dec_end > b->data_end) {
av_log(c->avctx, AV_LOG_ERROR, "Too many color values\n");
return AVERROR_INVALIDDATA;
}
- if (get_bits1(gb)) {
- c->col_lastval = GET_HUFF(gb, c->col_high[c->col_lastval]);
- v = GET_HUFF(gb, b->tree);
+ if (bitstream_read_bit(bc)) {
+ c->col_lastval = GET_HUFF(bc, c->col_high[c->col_lastval]);
+ v = GET_HUFF(bc, b->tree);
v = (c->col_lastval << 4) | v;
if (c->version < 'i') {
sign = ((int8_t) v) >> 7;
b->cur_dec += t;
} else {
while (b->cur_dec < dec_end) {
- c->col_lastval = GET_HUFF(gb, c->col_high[c->col_lastval]);
- v = GET_HUFF(gb, b->tree);
+ c->col_lastval = GET_HUFF(bc, c->col_high[c->col_lastval]);
+ v = GET_HUFF(bc, b->tree);
v = (c->col_lastval << 4) | v;
if (c->version < 'i') {
sign = ((int8_t) v) >> 7;
/** number of bits used to store first DC value in bundle */
#define DC_START_BITS 11
-static int read_dcs(AVCodecContext *avctx, GetBitContext *gb, Bundle *b,
+static int read_dcs(AVCodecContext *avctx, BitstreamContext *bc, Bundle *b,
int start_bits, int has_sign)
{
- int i, j, len, len2, bsize, sign, v, v2;
+ int i, j, len, len2, bsize, v, v2;
int16_t *dst = (int16_t*)b->cur_dec;
int16_t *dst_end = (int16_t*)b->data_end;
- CHECK_READ_VAL(gb, b, len);
- v = get_bits(gb, start_bits - has_sign);
+ CHECK_READ_VAL(bc, b, len);
+ v = bitstream_read(bc, start_bits - has_sign);
if (v && has_sign) {
- sign = -get_bits1(gb);
- v = (v ^ sign) - sign;
+ v = bitstream_apply_sign(bc, v);
}
if (dst_end - dst < 1)
return AVERROR_INVALIDDATA;
len2 = FFMIN(len - i, 8);
if (dst_end - dst < len2)
return AVERROR_INVALIDDATA;
- bsize = get_bits(gb, 4);
+ bsize = bitstream_read(bc, 4);
if (bsize) {
for (j = 0; j < len2; j++) {
- v2 = get_bits(gb, bsize);
+ v2 = bitstream_read(bc, bsize);
if (v2) {
- sign = -get_bits1(gb);
- v2 = (v2 ^ sign) - sign;
+ v2 = bitstream_apply_sign(bc, v2);
}
v += v2;
*dst++ = v;
return ret;
}
-static void binkb_init_bundle(BinkContext *c, int bundle_num)
+static av_cold void binkb_init_bundle(BinkContext *c, int bundle_num)
{
c->bundle[bundle_num].cur_dec =
c->bundle[bundle_num].cur_ptr = c->bundle[bundle_num].data;
c->bundle[bundle_num].len = 13;
}
-static void binkb_init_bundles(BinkContext *c)
+static av_cold void binkb_init_bundles(BinkContext *c)
{
int i;
for (i = 0; i < BINKB_NB_SRC; i++)
binkb_init_bundle(c, i);
}
-static int binkb_read_bundle(BinkContext *c, GetBitContext *gb, int bundle_num)
+static int binkb_read_bundle(BinkContext *c, BitstreamContext *bc, int bundle_num)
{
const int bits = binkb_bundle_sizes[bundle_num];
const int mask = 1 << (bits - 1);
Bundle *b = &c->bundle[bundle_num];
int i, len;
- CHECK_READ_VAL(gb, b, len);
+ CHECK_READ_VAL(bc, b, len);
if (b->data_end - b->cur_dec < len * (1 + (bits > 8)))
return AVERROR_INVALIDDATA;
if (bits <= 8) {
if (!issigned) {
for (i = 0; i < len; i++)
- *b->cur_dec++ = get_bits(gb, bits);
+ *b->cur_dec++ = bitstream_read(bc, bits);
} else {
for (i = 0; i < len; i++)
- *b->cur_dec++ = get_bits(gb, bits) - mask;
+ *b->cur_dec++ = bitstream_read(bc, bits) - mask;
}
} else {
int16_t *dst = (int16_t*)b->cur_dec;
if (!issigned) {
for (i = 0; i < len; i++)
- *dst++ = get_bits(gb, bits);
+ *dst++ = bitstream_read(bc, bits);
} else {
for (i = 0; i < len; i++)
- *dst++ = get_bits(gb, bits) - mask;
+ *dst++ = bitstream_read(bc, bits) - mask;
}
b->cur_dec = (uint8_t*)dst;
}
/**
* Read 8x8 block of DCT coefficients.
*
- * @param gb context for reading bits
+ * @param bc context for reading bits
* @param block place for storing coefficients
* @param scan scan order table
* @param quant_matrices quantization matrices
* @return 0 for success, negative value in other cases
*/
-static int read_dct_coeffs(GetBitContext *gb, int32_t block[64], const uint8_t *scan,
+static int read_dct_coeffs(BitstreamContext *bc, int32_t block[64],
+ const uint8_t *scan,
const int32_t quant_matrices[16][64], int q)
{
int coef_list[128];
int mode_list[128];
- int i, t, bits, ccoef, mode, sign;
+ int i, t, bits, ccoef, mode;
int list_start = 64, list_end = 64, list_pos;
int coef_count = 0;
int coef_idx[64];
coef_list[list_end] = 2; mode_list[list_end++] = 3;
coef_list[list_end] = 3; mode_list[list_end++] = 3;
- for (bits = get_bits(gb, 4) - 1; bits >= 0; bits--) {
+ for (bits = bitstream_read(bc, 4) - 1; bits >= 0; bits--) {
list_pos = list_start;
while (list_pos < list_end) {
- if (!(mode_list[list_pos] | coef_list[list_pos]) || !get_bits1(gb)) {
+ if (!(mode_list[list_pos] | coef_list[list_pos]) || !bitstream_read_bit(bc)) {
list_pos++;
continue;
}
mode_list[list_pos++] = 0;
}
for (i = 0; i < 4; i++, ccoef++) {
- if (get_bits1(gb)) {
+ if (bitstream_read_bit(bc)) {
coef_list[--list_start] = ccoef;
mode_list[ list_start] = 3;
} else {
if (!bits) {
- t = 1 - (get_bits1(gb) << 1);
+ t = 1 - (bitstream_read_bit(bc) << 1);
} else {
- t = get_bits(gb, bits) | 1 << bits;
- sign = -get_bits1(gb);
- t = (t ^ sign) - sign;
+ t = bitstream_read(bc, bits) | 1 << bits;
+ t = bitstream_apply_sign(bc, t);
}
block[scan[ccoef]] = t;
coef_idx[coef_count++] = ccoef;
break;
case 3:
if (!bits) {
- t = 1 - (get_bits1(gb) << 1);
+ t = 1 - (bitstream_read_bit(bc) << 1);
} else {
- t = get_bits(gb, bits) | 1 << bits;
- sign = -get_bits1(gb);
- t = (t ^ sign) - sign;
+ t = bitstream_read(bc, bits) | 1 << bits;
+ t = bitstream_apply_sign(bc, t);
}
block[scan[ccoef]] = t;
coef_idx[coef_count++] = ccoef;
}
if (q == -1) {
- quant_idx = get_bits(gb, 4);
+ quant_idx = bitstream_read(bc, 4);
} else {
quant_idx = q;
}
+ if (quant_idx >= 16)
+ return AVERROR_INVALIDDATA;
+
quant = quant_matrices[quant_idx];
block[0] = (block[0] * quant[0]) >> 11;
/**
* Read 8x8 block with residue after motion compensation.
*
- * @param gb context for reading bits
+ * @param bc context for reading bits
* @param block place to store read data
* @param masks_count number of masks to decode
* @return 0 on success, negative value in other cases
*/
-static int read_residue(GetBitContext *gb, DCTELEM block[64], int masks_count)
+static int read_residue(BitstreamContext *bc, int16_t block[64], int masks_count)
{
int coef_list[128];
int mode_list[128];
- int i, sign, mask, ccoef, mode;
+ int i, mask, ccoef, mode;
int list_start = 64, list_end = 64, list_pos;
int nz_coeff[64];
int nz_coeff_count = 0;
coef_list[list_end] = 44; mode_list[list_end++] = 0;
coef_list[list_end] = 0; mode_list[list_end++] = 2;
- for (mask = 1 << get_bits(gb, 3); mask; mask >>= 1) {
+ for (mask = 1 << bitstream_read(bc, 3); mask; mask >>= 1) {
for (i = 0; i < nz_coeff_count; i++) {
- if (!get_bits1(gb))
+ if (!bitstream_read_bit(bc))
continue;
if (block[nz_coeff[i]] < 0)
block[nz_coeff[i]] -= mask;
}
list_pos = list_start;
while (list_pos < list_end) {
- if (!(coef_list[list_pos] | mode_list[list_pos]) || !get_bits1(gb)) {
+ if (!(coef_list[list_pos] | mode_list[list_pos]) || !bitstream_read_bit(bc)) {
list_pos++;
continue;
}
mode_list[list_pos++] = 0;
}
for (i = 0; i < 4; i++, ccoef++) {
- if (get_bits1(gb)) {
+ if (bitstream_read_bit(bc)) {
coef_list[--list_start] = ccoef;
mode_list[ list_start] = 3;
} else {
nz_coeff[nz_coeff_count++] = bink_scan[ccoef];
- sign = -get_bits1(gb);
- block[bink_scan[ccoef]] = (mask ^ sign) - sign;
+ block[bink_scan[ccoef]] = bitstream_apply_sign(bc, mask);
masks_count--;
if (masks_count < 0)
return 0;
break;
case 3:
nz_coeff[nz_coeff_count++] = bink_scan[ccoef];
- sign = -get_bits1(gb);
- block[bink_scan[ccoef]] = (mask ^ sign) - sign;
+ block[bink_scan[ccoef]] = bitstream_apply_sign(bc, mask);
coef_list[list_pos] = 0;
mode_list[list_pos++] = 0;
masks_count--;
memcpy(dst + i*stride, tmp + i*8, 8);
}
-static int binkb_decode_plane(BinkContext *c, GetBitContext *gb, int plane_idx,
- int is_key, int is_chroma)
+static int binkb_decode_plane(BinkContext *c, AVFrame *frame, BitstreamContext *bc,
+ int plane_idx, int is_key, int is_chroma)
{
int blk, ret;
int i, j, bx, by;
int v, col[2];
const uint8_t *scan;
int xoff, yoff;
- LOCAL_ALIGNED_16(DCTELEM, block, [64]);
+ LOCAL_ALIGNED_16(int16_t, block, [64]);
LOCAL_ALIGNED_16(int32_t, dctblock, [64]);
int coordmap[64];
int ybias = is_key ? -15 : 0;
int qp;
- const int stride = c->pic->linesize[plane_idx];
+ const int stride = frame->linesize[plane_idx];
int bw = is_chroma ? (c->avctx->width + 15) >> 4 : (c->avctx->width + 7) >> 3;
int bh = is_chroma ? (c->avctx->height + 15) >> 4 : (c->avctx->height + 7) >> 3;
binkb_init_bundles(c);
- ref_start = c->pic->data[plane_idx];
- ref_end = c->pic->data[plane_idx] + (bh * c->pic->linesize[plane_idx] + bw) * 8;
+ ref_start = frame->data[plane_idx];
+ ref_end = frame->data[plane_idx] + (bh * frame->linesize[plane_idx] + bw) * 8;
for (i = 0; i < 64; i++)
coordmap[i] = (i & 7) + (i >> 3) * stride;
for (by = 0; by < bh; by++) {
for (i = 0; i < BINKB_NB_SRC; i++) {
- if ((ret = binkb_read_bundle(c, gb, i)) < 0)
+ if ((ret = binkb_read_bundle(c, bc, i)) < 0)
return ret;
}
- dst = c->pic->data[plane_idx] + 8*by*stride;
+ dst = frame->data[plane_idx] + 8*by*stride;
for (bx = 0; bx < bw; bx++, dst += 8) {
blk = binkb_get_value(c, BINKB_SRC_BLOCK_TYPES);
switch (blk) {
case 0:
break;
case 1:
- scan = bink_patterns[get_bits(gb, 4)];
+ scan = bink_patterns[bitstream_read(bc, 4)];
i = 0;
do {
- int mode, run;
-
- mode = get_bits1(gb);
- run = get_bits(gb, binkb_runbits[i]) + 1;
+ int mode = bitstream_read_bit(bc);
+ int run = bitstream_read(bc, binkb_runbits[i]) + 1;
i += run;
if (i > 64) {
memset(dctblock, 0, sizeof(*dctblock) * 64);
dctblock[0] = binkb_get_value(c, BINKB_SRC_INTRA_DC);
qp = binkb_get_value(c, BINKB_SRC_INTRA_Q);
- read_dct_coeffs(gb, dctblock, bink_scan, binkb_intra_quant, qp);
- c->bdsp.idct_put(dst, stride, dctblock);
+ read_dct_coeffs(bc, dctblock, bink_scan, binkb_intra_quant, qp);
+ c->binkdsp.idct_put(dst, stride, dctblock);
break;
case 3:
xoff = binkb_get_value(c, BINKB_SRC_X_OFF);
if (ref < ref_start || ref + 8*stride > ref_end) {
av_log(c->avctx, AV_LOG_WARNING, "Reference block is out of bounds\n");
} else if (ref + 8*stride < dst || ref >= dst + 8*stride) {
- c->dsp.put_pixels_tab[1][0](dst, ref, stride, 8);
+ c->hdsp.put_pixels_tab[1][0](dst, ref, stride, 8);
} else {
put_pixels8x8_overlapped(dst, ref, stride);
}
- c->dsp.clear_block(block);
+ c->bdsp.clear_block(block);
v = binkb_get_value(c, BINKB_SRC_INTER_COEFS);
- read_residue(gb, block, v);
- c->dsp.add_pixels8(dst, block, stride);
+ read_residue(bc, block, v);
+ c->binkdsp.add_pixels8(dst, block, stride);
break;
case 4:
xoff = binkb_get_value(c, BINKB_SRC_X_OFF);
if (ref < ref_start || ref + 8 * stride > ref_end) {
av_log(c->avctx, AV_LOG_WARNING, "Reference block is out of bounds\n");
} else if (ref + 8*stride < dst || ref >= dst + 8*stride) {
- c->dsp.put_pixels_tab[1][0](dst, ref, stride, 8);
+ c->hdsp.put_pixels_tab[1][0](dst, ref, stride, 8);
} else {
put_pixels8x8_overlapped(dst, ref, stride);
}
memset(dctblock, 0, sizeof(*dctblock) * 64);
dctblock[0] = binkb_get_value(c, BINKB_SRC_INTER_DC);
qp = binkb_get_value(c, BINKB_SRC_INTER_Q);
- read_dct_coeffs(gb, dctblock, bink_scan, binkb_inter_quant, qp);
- c->bdsp.idct_add(dst, stride, dctblock);
+ read_dct_coeffs(bc, dctblock, bink_scan, binkb_inter_quant, qp);
+ c->binkdsp.idct_add(dst, stride, dctblock);
break;
case 5:
v = binkb_get_value(c, BINKB_SRC_COLORS);
- c->dsp.fill_block_tab[1](dst, v, stride, 8);
+ c->bdsp.fill_block_tab[1](dst, v, stride, 8);
break;
case 6:
for (i = 0; i < 2; i++)
if (ref < ref_start || ref + 8 * stride > ref_end) {
av_log(c->avctx, AV_LOG_WARNING, "Reference block is out of bounds\n");
} else if (ref + 8*stride < dst || ref >= dst + 8*stride) {
- c->dsp.put_pixels_tab[1][0](dst, ref, stride, 8);
+ c->hdsp.put_pixels_tab[1][0](dst, ref, stride, 8);
} else {
put_pixels8x8_overlapped(dst, ref, stride);
}
}
}
}
- if (get_bits_count(gb) & 0x1F) //next plane data starts at 32-bit boundary
- skip_bits_long(gb, 32 - (get_bits_count(gb) & 0x1F));
+ if (bitstream_tell(bc) & 0x1F) // next plane data starts at 32-bit boundary
+ bitstream_skip(bc, 32 - (bitstream_tell(bc) & 0x1F));
+
+ return 0;
+}
+
+static int bink_put_pixels(BinkContext *c,
+ uint8_t *dst, uint8_t *prev, int stride,
+ uint8_t *ref_start,
+ uint8_t *ref_end)
+{
+ int xoff = get_value(c, BINK_SRC_X_OFF);
+ int yoff = get_value(c, BINK_SRC_Y_OFF);
+ uint8_t *ref = prev + xoff + yoff * stride;
+ if (ref < ref_start || ref > ref_end) {
+ av_log(c->avctx, AV_LOG_ERROR, "Copy out of bounds @%d, %d\n",
+ xoff, yoff);
+ return AVERROR_INVALIDDATA;
+ }
+ c->hdsp.put_pixels_tab[1][0](dst, ref, stride, 8);
return 0;
}
-static int bink_decode_plane(BinkContext *c, GetBitContext *gb, int plane_idx,
- int is_chroma)
+static int bink_decode_plane(BinkContext *c, AVFrame *frame, BitstreamContext *bc,
+ int plane_idx, int is_chroma)
{
int blk, ret;
int i, j, bx, by;
- uint8_t *dst, *prev, *ref, *ref_start, *ref_end;
+ uint8_t *dst, *prev, *ref_start, *ref_end;
int v, col[2];
const uint8_t *scan;
- int xoff, yoff;
- LOCAL_ALIGNED_16(DCTELEM, block, [64]);
+ LOCAL_ALIGNED_16(int16_t, block, [64]);
LOCAL_ALIGNED_16(uint8_t, ublock, [64]);
LOCAL_ALIGNED_16(int32_t, dctblock, [64]);
int coordmap[64];
- const int stride = c->pic->linesize[plane_idx];
+ const int stride = frame->linesize[plane_idx];
int bw = is_chroma ? (c->avctx->width + 15) >> 4 : (c->avctx->width + 7) >> 3;
int bh = is_chroma ? (c->avctx->height + 15) >> 4 : (c->avctx->height + 7) >> 3;
int width = c->avctx->width >> is_chroma;
init_lengths(c, FFMAX(width, 8), bw);
for (i = 0; i < BINK_NB_SRC; i++)
- read_bundle(gb, c, i);
+ read_bundle(bc, c, i);
ref_start = c->last->data[plane_idx] ? c->last->data[plane_idx]
- : c->pic->data[plane_idx];
+ : frame->data[plane_idx];
ref_end = ref_start
+ (bw - 1 + c->last->linesize[plane_idx] * (bh - 1)) * 8;
coordmap[i] = (i & 7) + (i >> 3) * stride;
for (by = 0; by < bh; by++) {
- if ((ret = read_block_types(c->avctx, gb, &c->bundle[BINK_SRC_BLOCK_TYPES])) < 0)
+ if ((ret = read_block_types(c->avctx, bc, &c->bundle[BINK_SRC_BLOCK_TYPES])) < 0)
return ret;
- if ((ret = read_block_types(c->avctx, gb, &c->bundle[BINK_SRC_SUB_BLOCK_TYPES])) < 0)
+ if ((ret = read_block_types(c->avctx, bc, &c->bundle[BINK_SRC_SUB_BLOCK_TYPES])) < 0)
return ret;
- if ((ret = read_colors(gb, &c->bundle[BINK_SRC_COLORS], c)) < 0)
+ if ((ret = read_colors(bc, &c->bundle[BINK_SRC_COLORS], c)) < 0)
return ret;
- if ((ret = read_patterns(c->avctx, gb, &c->bundle[BINK_SRC_PATTERN])) < 0)
+ if ((ret = read_patterns(c->avctx, bc, &c->bundle[BINK_SRC_PATTERN])) < 0)
return ret;
- if ((ret = read_motion_values(c->avctx, gb, &c->bundle[BINK_SRC_X_OFF])) < 0)
+ if ((ret = read_motion_values(c->avctx, bc, &c->bundle[BINK_SRC_X_OFF])) < 0)
return ret;
- if ((ret = read_motion_values(c->avctx, gb, &c->bundle[BINK_SRC_Y_OFF])) < 0)
+ if ((ret = read_motion_values(c->avctx, bc, &c->bundle[BINK_SRC_Y_OFF])) < 0)
return ret;
- if ((ret = read_dcs(c->avctx, gb, &c->bundle[BINK_SRC_INTRA_DC], DC_START_BITS, 0)) < 0)
+ if ((ret = read_dcs(c->avctx, bc, &c->bundle[BINK_SRC_INTRA_DC], DC_START_BITS, 0)) < 0)
return ret;
- if ((ret = read_dcs(c->avctx, gb, &c->bundle[BINK_SRC_INTER_DC], DC_START_BITS, 1)) < 0)
+ if ((ret = read_dcs(c->avctx, bc, &c->bundle[BINK_SRC_INTER_DC], DC_START_BITS, 1)) < 0)
return ret;
- if ((ret = read_runs(c->avctx, gb, &c->bundle[BINK_SRC_RUN])) < 0)
+ if ((ret = read_runs(c->avctx, bc, &c->bundle[BINK_SRC_RUN])) < 0)
return ret;
if (by == bh)
break;
- dst = c->pic->data[plane_idx] + 8*by*stride;
+ dst = frame->data[plane_idx] + 8*by*stride;
prev = (c->last->data[plane_idx] ? c->last->data[plane_idx]
- : c->pic->data[plane_idx]) + 8*by*stride;
+ : frame->data[plane_idx]) + 8*by*stride;
for (bx = 0; bx < bw; bx++, dst += 8, prev += 8) {
blk = get_value(c, BINK_SRC_BLOCK_TYPES);
// 16x16 block type on odd line means part of the already decoded block, so skip it
}
switch (blk) {
case SKIP_BLOCK:
- c->dsp.put_pixels_tab[1][0](dst, prev, stride, 8);
+ c->hdsp.put_pixels_tab[1][0](dst, prev, stride, 8);
break;
case SCALED_BLOCK:
blk = get_value(c, BINK_SRC_SUB_BLOCK_TYPES);
switch (blk) {
case RUN_BLOCK:
- scan = bink_patterns[get_bits(gb, 4)];
+ scan = bink_patterns[bitstream_read(bc, 4)];
i = 0;
do {
int run = get_value(c, BINK_SRC_RUN) + 1;
av_log(c->avctx, AV_LOG_ERROR, "Run went out of bounds\n");
return AVERROR_INVALIDDATA;
}
- if (get_bits1(gb)) {
+ if (bitstream_read_bit(bc)) {
v = get_value(c, BINK_SRC_COLORS);
for (j = 0; j < run; j++)
ublock[*scan++] = v;
case INTRA_BLOCK:
memset(dctblock, 0, sizeof(*dctblock) * 64);
dctblock[0] = get_value(c, BINK_SRC_INTRA_DC);
- read_dct_coeffs(gb, dctblock, bink_scan, bink_intra_quant, -1);
- c->bdsp.idct_put(ublock, 8, dctblock);
+ read_dct_coeffs(bc, dctblock, bink_scan, bink_intra_quant, -1);
+ c->binkdsp.idct_put(ublock, 8, dctblock);
break;
case FILL_BLOCK:
v = get_value(c, BINK_SRC_COLORS);
- c->dsp.fill_block_tab[0](dst, v, stride, 16);
+ c->bdsp.fill_block_tab[0](dst, v, stride, 16);
break;
case PATTERN_BLOCK:
for (i = 0; i < 2; i++)
return AVERROR_INVALIDDATA;
}
if (blk != FILL_BLOCK)
- c->bdsp.scale_block(ublock, dst, stride);
+ c->binkdsp.scale_block(ublock, dst, stride);
bx++;
dst += 8;
prev += 8;
break;
case MOTION_BLOCK:
- xoff = get_value(c, BINK_SRC_X_OFF);
- yoff = get_value(c, BINK_SRC_Y_OFF);
- ref = prev + xoff + yoff * stride;
- if (ref < ref_start || ref > ref_end) {
- av_log(c->avctx, AV_LOG_ERROR, "Copy out of bounds @%d, %d\n",
- bx*8 + xoff, by*8 + yoff);
- return AVERROR_INVALIDDATA;
- }
- c->dsp.put_pixels_tab[1][0](dst, ref, stride, 8);
+ ret = bink_put_pixels(c, dst, prev, stride,
+ ref_start, ref_end);
+ if (ret < 0)
+ return ret;
break;
case RUN_BLOCK:
- scan = bink_patterns[get_bits(gb, 4)];
+ scan = bink_patterns[bitstream_read(bc, 4)];
i = 0;
do {
int run = get_value(c, BINK_SRC_RUN) + 1;
av_log(c->avctx, AV_LOG_ERROR, "Run went out of bounds\n");
return AVERROR_INVALIDDATA;
}
- if (get_bits1(gb)) {
+ if (bitstream_read_bit(bc)) {
v = get_value(c, BINK_SRC_COLORS);
for (j = 0; j < run; j++)
dst[coordmap[*scan++]] = v;
dst[coordmap[*scan++]] = get_value(c, BINK_SRC_COLORS);
break;
case RESIDUE_BLOCK:
- xoff = get_value(c, BINK_SRC_X_OFF);
- yoff = get_value(c, BINK_SRC_Y_OFF);
- ref = prev + xoff + yoff * stride;
- if (ref < ref_start || ref > ref_end) {
- av_log(c->avctx, AV_LOG_ERROR, "Copy out of bounds @%d, %d\n",
- bx*8 + xoff, by*8 + yoff);
- return AVERROR_INVALIDDATA;
- }
- c->dsp.put_pixels_tab[1][0](dst, ref, stride, 8);
- c->dsp.clear_block(block);
- v = get_bits(gb, 7);
- read_residue(gb, block, v);
- c->dsp.add_pixels8(dst, block, stride);
+ ret = bink_put_pixels(c, dst, prev, stride,
+ ref_start, ref_end);
+ if (ret < 0)
+ return ret;
+ c->bdsp.clear_block(block);
+ v = bitstream_read(bc, 7);
+ read_residue(bc, block, v);
+ c->binkdsp.add_pixels8(dst, block, stride);
break;
case INTRA_BLOCK:
memset(dctblock, 0, sizeof(*dctblock) * 64);
dctblock[0] = get_value(c, BINK_SRC_INTRA_DC);
- read_dct_coeffs(gb, dctblock, bink_scan, bink_intra_quant, -1);
- c->bdsp.idct_put(dst, stride, dctblock);
+ read_dct_coeffs(bc, dctblock, bink_scan, bink_intra_quant, -1);
+ c->binkdsp.idct_put(dst, stride, dctblock);
break;
case FILL_BLOCK:
v = get_value(c, BINK_SRC_COLORS);
- c->dsp.fill_block_tab[1](dst, v, stride, 8);
+ c->bdsp.fill_block_tab[1](dst, v, stride, 8);
break;
case INTER_BLOCK:
- xoff = get_value(c, BINK_SRC_X_OFF);
- yoff = get_value(c, BINK_SRC_Y_OFF);
- ref = prev + xoff + yoff * stride;
- c->dsp.put_pixels_tab[1][0](dst, ref, stride, 8);
+ ret = bink_put_pixels(c, dst, prev, stride,
+ ref_start, ref_end);
+ if (ret < 0)
+ return ret;
memset(dctblock, 0, sizeof(*dctblock) * 64);
dctblock[0] = get_value(c, BINK_SRC_INTER_DC);
- read_dct_coeffs(gb, dctblock, bink_scan, bink_inter_quant, -1);
- c->bdsp.idct_add(dst, stride, dctblock);
+ read_dct_coeffs(bc, dctblock, bink_scan, bink_inter_quant, -1);
+ c->binkdsp.idct_add(dst, stride, dctblock);
break;
case PATTERN_BLOCK:
for (i = 0; i < 2; i++)
}
}
}
- if (get_bits_count(gb) & 0x1F) //next plane data starts at 32-bit boundary
- skip_bits_long(gb, 32 - (get_bits_count(gb) & 0x1F));
+ if (bitstream_tell(bc) & 0x1F) // next plane data starts at 32-bit boundary
+ bitstream_skip(bc, 32 - (bitstream_tell(bc) & 0x1F));
return 0;
}
static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *pkt)
{
BinkContext * const c = avctx->priv_data;
- GetBitContext gb;
+ AVFrame *frame = data;
+ BitstreamContext bc;
int plane, plane_idx, ret;
int bits_count = pkt->size << 3;
if (c->version > 'b') {
- if(c->pic->data[0])
- avctx->release_buffer(avctx, c->pic);
-
- if ((ret = ff_get_buffer(avctx, c->pic)) < 0) {
+ if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return ret;
}
} else {
- if ((ret = avctx->reget_buffer(avctx, c->pic)) < 0) {
+ if ((ret = ff_reget_buffer(avctx, c->last)) < 0) {
av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
return ret;
}
+ if ((ret = av_frame_ref(frame, c->last)) < 0)
+ return ret;
}
- init_get_bits(&gb, pkt->data, bits_count);
+ bitstream_init(&bc, pkt->data, bits_count);
if (c->has_alpha) {
if (c->version >= 'i')
- skip_bits_long(&gb, 32);
- if ((ret = bink_decode_plane(c, &gb, 3, 0)) < 0)
+ bitstream_skip(&bc, 32);
+ if ((ret = bink_decode_plane(c, frame, &bc, 3, 0)) < 0)
return ret;
}
if (c->version >= 'i')
- skip_bits_long(&gb, 32);
+ bitstream_skip(&bc, 32);
for (plane = 0; plane < 3; plane++) {
plane_idx = (!plane || !c->swap_planes) ? plane : (plane ^ 3);
if (c->version > 'b') {
- if ((ret = bink_decode_plane(c, &gb, plane_idx, !!plane)) < 0)
+ if ((ret = bink_decode_plane(c, frame, &bc, plane_idx, !!plane)) < 0)
return ret;
} else {
- if ((ret = binkb_decode_plane(c, &gb, plane_idx, !pkt->pts, !!plane)) < 0)
+ if ((ret = binkb_decode_plane(c, frame, &bc, plane_idx,
+ !avctx->frame_number, !!plane)) < 0)
return ret;
}
- if (get_bits_count(&gb) >= bits_count)
+ if (bitstream_tell(&bc) >= bits_count)
break;
}
emms_c();
- *got_frame = 1;
- *(AVFrame*)data = *c->pic;
+ if (c->version > 'b') {
+ av_frame_unref(c->last);
+ if ((ret = av_frame_ref(c->last, frame)) < 0)
+ return ret;
+ }
- if (c->version > 'b')
- FFSWAP(AVFrame*, c->pic, c->last);
+ *got_frame = 1;
/* always report that the buffer was completely consumed */
return pkt->size;
}
/**
- * Caclulate quantization tables for version b
+ * Calculate quantization tables for version b
*/
static av_cold void binkb_calc_quant(void)
{
}
c->avctx = avctx;
- c->pic = avcodec_alloc_frame();
- c->last = avcodec_alloc_frame();
- if (!c->pic || !c->last) {
- avcodec_free_frame(&c->pic);
- avcodec_free_frame(&c->last);
+ c->last = av_frame_alloc();
+ if (!c->last)
return AVERROR(ENOMEM);
- }
if ((ret = av_image_check_size(avctx->width, avctx->height, 0, avctx)) < 0)
return ret;
avctx->pix_fmt = c->has_alpha ? AV_PIX_FMT_YUVA420P : AV_PIX_FMT_YUV420P;
- avctx->idct_algo = FF_IDCT_BINK;
- ff_dsputil_init(&c->dsp, avctx);
- ff_binkdsp_init(&c->bdsp);
+ ff_blockdsp_init(&c->bdsp, avctx);
+ ff_hpeldsp_init(&c->hdsp, avctx->flags);
+ ff_binkdsp_init(&c->binkdsp);
init_bundles(c);
{
BinkContext * const c = avctx->priv_data;
- if (c->pic->data[0])
- avctx->release_buffer(avctx, c->pic);
- if (c->last->data[0])
- avctx->release_buffer(avctx, c->last);
- avcodec_free_frame(&c->pic);
- avcodec_free_frame(&c->last);
+ av_frame_free(&c->last);
free_bundles(c);
return 0;
AVCodec ff_bink_decoder = {
.name = "binkvideo",
+ .long_name = NULL_IF_CONFIG_SMALL("Bink video"),
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_BINKVIDEO,
.priv_data_size = sizeof(BinkContext),
.init = decode_init,
.close = decode_end,
.decode = decode_frame,
- .long_name = NULL_IF_CONFIG_SMALL("Bink video"),
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};