*/
#include "avcodec.h"
-#include "get_bits.h"
+#include "bitstream.h"
+#include "blockdsp.h"
+#include "bytestream.h"
+#include "bswapdsp.h"
#include "aandcttab.h"
#include "eaidct.h"
+#include "idctdsp.h"
#include "internal.h"
-#include "mpeg12.h"
#include "mpeg12data.h"
-#include "libavutil/imgutils.h"
+#include "mpeg12vlc.h"
+#include "vlc.h"
#define EA_PREAMBLE_SIZE 8
-#define MADk_TAG MKTAG('M', 'A', 'D', 'k') /* MAD i-frame */
-#define MADm_TAG MKTAG('M', 'A', 'D', 'm') /* MAD p-frame */
+#define MADk_TAG MKTAG('M', 'A', 'D', 'k') /* MAD I-frame */
+#define MADm_TAG MKTAG('M', 'A', 'D', 'm') /* MAD P-frame */
#define MADe_TAG MKTAG('M', 'A', 'D', 'e') /* MAD lqp-frame */
typedef struct MadContext {
AVCodecContext *avctx;
- DSPContext dsp;
- AVFrame last_frame;
- GetBitContext gb;
+ BlockDSPContext bdsp;
+ BswapDSPContext bbdsp;
+ IDCTDSPContext idsp;
+ AVFrame *last_frame;
+ BitstreamContext bc;
void *bitstream_buf;
unsigned int bitstream_buf_size;
DECLARE_ALIGNED(16, int16_t, block)[64];
MadContext *s = avctx->priv_data;
s->avctx = avctx;
avctx->pix_fmt = AV_PIX_FMT_YUV420P;
- ff_dsputil_init(&s->dsp, avctx);
- ff_init_scantable_permutation(s->dsp.idct_permutation, FF_NO_IDCT_PERM);
- ff_init_scantable(s->dsp.idct_permutation, &s->scantable, ff_zigzag_direct);
+ ff_blockdsp_init(&s->bdsp, avctx);
+ ff_bswapdsp_init(&s->bbdsp);
+ ff_idctdsp_init(&s->idsp, avctx);
+ ff_init_scantable_permutation(s->idsp.idct_permutation, FF_IDCT_PERM_NONE);
+ ff_init_scantable(s->idsp.idct_permutation, &s->scantable, ff_zigzag_direct);
ff_mpeg12_init_vlcs();
+
+ s->last_frame = av_frame_alloc();
+ if (!s->last_frame)
+ return AVERROR(ENOMEM);
+
return 0;
}
-static inline void comp(unsigned char *dst, int dst_stride,
- unsigned char *src, int src_stride, int add)
+static inline void comp(unsigned char *dst, ptrdiff_t dst_stride,
+ unsigned char *src, ptrdiff_t src_stride, int add)
{
int j, i;
for (j=0; j<8; j++)
if (j < 4) {
comp(frame->data[0] + (mb_y*16 + ((j&2)<<2))*frame->linesize[0] + mb_x*16 + ((j&1)<<3),
frame->linesize[0],
- t->last_frame.data[0] + (mb_y*16 + ((j&2)<<2) + mv_y)*t->last_frame.linesize[0] + mb_x*16 + ((j&1)<<3) + mv_x,
- t->last_frame.linesize[0], add);
- } else if (!(t->avctx->flags & CODEC_FLAG_GRAY)) {
+ t->last_frame->data[0] + (mb_y*16 + ((j&2)<<2) + mv_y)*t->last_frame->linesize[0] + mb_x*16 + ((j&1)<<3) + mv_x,
+ t->last_frame->linesize[0], add);
+ } else if (!(t->avctx->flags & AV_CODEC_FLAG_GRAY)) {
int index = j - 3;
comp(frame->data[index] + (mb_y*8)*frame->linesize[index] + mb_x * 8,
frame->linesize[index],
- t->last_frame.data[index] + (mb_y * 8 + (mv_y/2))*t->last_frame.linesize[index] + mb_x * 8 + (mv_x/2),
- t->last_frame.linesize[index], add);
+ t->last_frame->data[index] + (mb_y * 8 + (mv_y/2))*t->last_frame->linesize[index] + mb_x * 8 + (mv_x/2),
+ t->last_frame->linesize[index], add);
}
}
ff_ea_idct_put_c(
frame->data[0] + (mb_y*16 + ((j&2)<<2))*frame->linesize[0] + mb_x*16 + ((j&1)<<3),
frame->linesize[0], block);
- } else if (!(t->avctx->flags & CODEC_FLAG_GRAY)) {
+ } else if (!(t->avctx->flags & AV_CODEC_FLAG_GRAY)) {
int index = j - 3;
ff_ea_idct_put_c(
frame->data[index] + (mb_y*8)*frame->linesize[index] + mb_x*8,
const uint8_t *scantable = s->scantable.permutated;
int16_t *quant_matrix = s->quant_matrix;
- block[0] = (128 + get_sbits(&s->gb, 8)) * quant_matrix[0];
+ block[0] = (128 + bitstream_read_signed(&s->bc, 8)) * quant_matrix[0];
/* The RL decoder is derived from mpeg1_decode_block_intra;
Escaped level and run values a decoded differently */
i = 0;
{
- OPEN_READER(re, &s->gb);
/* now quantify & encode AC coefficients */
for (;;) {
- UPDATE_CACHE(re, &s->gb);
- GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0);
+ BITSTREAM_RL_VLC(level, run, &s->bc, rl->rl_vlc[0], TEX_VLC_BITS, 2);
if (level == 127) {
break;
} else if (level != 0) {
i += run;
+ if (i > 63) {
+ av_log(s->avctx, AV_LOG_ERROR,
+ "ac-tex damaged at %d %d\n", s->mb_x, s->mb_y);
+ return;
+ }
j = scantable[i];
level = (level*quant_matrix[j]) >> 4;
level = (level-1)|1;
- level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1);
- LAST_SKIP_BITS(re, &s->gb, 1);
+ level = bitstream_apply_sign(&s->bc, level);
} else {
/* escape */
- UPDATE_CACHE(re, &s->gb);
- level = SHOW_SBITS(re, &s->gb, 10); SKIP_BITS(re, &s->gb, 10);
+ level = bitstream_read_signed(&s->bc, 10);
- UPDATE_CACHE(re, &s->gb);
- run = SHOW_UBITS(re, &s->gb, 6)+1; LAST_SKIP_BITS(re, &s->gb, 6);
+ run = bitstream_read(&s->bc, 6) + 1;
i += run;
+ if (i > 63) {
+ av_log(s->avctx, AV_LOG_ERROR,
+ "ac-tex damaged at %d %d\n", s->mb_x, s->mb_y);
+ return;
+ }
j = scantable[i];
if (level < 0) {
level = -level;
level = (level-1)|1;
}
}
- if (i > 63) {
- av_log(s->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n", s->mb_x, s->mb_y);
- return;
- }
block[j] = level;
}
- CLOSE_READER(re, &s->gb);
}
}
-static int decode_motion(GetBitContext *gb)
+static int decode_motion(BitstreamContext *bc)
{
int value = 0;
- if (get_bits1(gb)) {
- if (get_bits1(gb))
+
+ if (bitstream_read_bit(bc)) {
+ if (bitstream_read_bit(bc))
value = -17;
- value += get_bits(gb, 4) + 1;
+ value += bitstream_read(bc, 4) + 1;
}
return value;
}
int j;
if (inter) {
- int v = decode210(&s->gb);
+ int v = bitstream_decode210(&s->bc);
if (v < 2) {
- mv_map = v ? get_bits(&s->gb, 6) : 63;
- mv_x = decode_motion(&s->gb);
- mv_y = decode_motion(&s->gb);
+ mv_map = v ? bitstream_read(&s->bc, 6) : 63;
+ mv_x = decode_motion(&s->bc);
+ mv_y = decode_motion(&s->bc);
} else {
mv_map = 0;
}
for (j=0; j<6; j++) {
if (mv_map & (1<<j)) { // mv_x and mv_y are guarded by mv_map
- int add = 2*decode_motion(&s->gb);
+ int add = 2 * decode_motion(&s->bc);
comp_block(s, frame, s->mb_x, s->mb_y, j, mv_x, mv_y, add);
} else {
- s->dsp.clear_block(s->block);
+ s->bdsp.clear_block(s->block);
decode_block_intra(s, s->block);
idct_put(s, frame, s->block, s->mb_x, s->mb_y, j);
}
{
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
- const uint8_t *buf_end = buf+buf_size;
MadContext *s = avctx->priv_data;
AVFrame *frame = data;
+ GetByteContext gb;
int width, height;
int chunk_type;
int inter, ret;
- if (buf_size < 17) {
- av_log(avctx, AV_LOG_ERROR, "Input buffer too small\n");
- *got_frame = 0;
- return -1;
- }
+ bytestream2_init(&gb, buf, buf_size);
- chunk_type = AV_RL32(&buf[0]);
+ chunk_type = bytestream2_get_le32(&gb);
inter = (chunk_type == MADm_TAG || chunk_type == MADe_TAG);
- buf += 8;
+ bytestream2_skip(&gb, 10);
- av_reduce(&avctx->time_base.num, &avctx->time_base.den,
- AV_RL16(&buf[6]), 1000, 1<<30);
+ av_reduce(&avctx->framerate.den, &avctx->framerate.num,
+ bytestream2_get_le16(&gb), 1000, 1<<30);
- width = AV_RL16(&buf[8]);
- height = AV_RL16(&buf[10]);
- calc_quant_matrix(s, buf[13]);
- buf += 16;
+ width = bytestream2_get_le16(&gb);
+ height = bytestream2_get_le16(&gb);
+ bytestream2_skip(&gb, 1);
+ calc_quant_matrix(s, bytestream2_get_byte(&gb));
+ bytestream2_skip(&gb, 2);
+
+ if (bytestream2_get_bytes_left(&gb) < 2) {
+ av_log(avctx, AV_LOG_ERROR, "Input data too small\n");
+ return AVERROR_INVALIDDATA;
+ }
if (avctx->width != width || avctx->height != height) {
- av_frame_unref(&s->last_frame);
+ av_frame_unref(s->last_frame);
if ((ret = ff_set_dimensions(avctx, width, height)) < 0)
return ret;
}
return ret;
}
- if (inter && !s->last_frame.data[0]) {
+ if (inter && !s->last_frame->data[0]) {
av_log(avctx, AV_LOG_WARNING, "Missing reference frame.\n");
- ret = ff_get_buffer(avctx, &s->last_frame, AV_GET_BUFFER_FLAG_REF);
+ ret = ff_get_buffer(avctx, s->last_frame, AV_GET_BUFFER_FLAG_REF);
if (ret < 0)
return ret;
- memset(s->last_frame.data[0], 0, s->last_frame.height *
- s->last_frame.linesize[0]);
- memset(s->last_frame.data[1], 0x80, s->last_frame.height / 2 *
- s->last_frame.linesize[1]);
- memset(s->last_frame.data[2], 0x80, s->last_frame.height / 2 *
- s->last_frame.linesize[2]);
+ memset(s->last_frame->data[0], 0, s->last_frame->height *
+ s->last_frame->linesize[0]);
+ memset(s->last_frame->data[1], 0x80, s->last_frame->height / 2 *
+ s->last_frame->linesize[1]);
+ memset(s->last_frame->data[2], 0x80, s->last_frame->height / 2 *
+ s->last_frame->linesize[2]);
}
av_fast_padded_malloc(&s->bitstream_buf, &s->bitstream_buf_size,
- buf_end - buf);
+ bytestream2_get_bytes_left(&gb));
if (!s->bitstream_buf)
return AVERROR(ENOMEM);
- s->dsp.bswap16_buf(s->bitstream_buf, (const uint16_t*)buf, (buf_end-buf)/2);
- init_get_bits(&s->gb, s->bitstream_buf, 8*(buf_end-buf));
+ s->bbdsp.bswap16_buf(s->bitstream_buf, (const uint16_t *)(buf + bytestream2_tell(&gb)),
+ bytestream2_get_bytes_left(&gb) / 2);
+ bitstream_init8(&s->bc, s->bitstream_buf, bytestream2_get_bytes_left(&gb));
for (s->mb_y=0; s->mb_y < (avctx->height+15)/16; s->mb_y++)
for (s->mb_x=0; s->mb_x < (avctx->width +15)/16; s->mb_x++)
*got_frame = 1;
if (chunk_type != MADe_TAG) {
- av_frame_unref(&s->last_frame);
- if ((ret = av_frame_ref(&s->last_frame, frame)) < 0)
+ av_frame_unref(s->last_frame);
+ if ((ret = av_frame_ref(s->last_frame, frame)) < 0)
return ret;
}
static av_cold int decode_end(AVCodecContext *avctx)
{
MadContext *t = avctx->priv_data;
- av_frame_unref(&t->last_frame);
+ av_frame_free(&t->last_frame);
av_free(t->bitstream_buf);
return 0;
}
.init = decode_init,
.close = decode_end,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
projects / ffmpeg / blobdiff