#include "avcodec.h"
#include "h263.h"
+#include "internal.h"
#include "intrax8.h"
#include "mathops.h"
#include "mpegutils.h"
s->picture_number++; // FIXME ?
if (w->j_type) {
- ff_intrax8_decode_picture(&w->x8, 2 * s->qscale, (s->qscale - 1) | 1);
+ ff_intrax8_decode_picture(&w->x8, &s->current_picture,
+ &s->gb, &s->mb_x, &s->mb_y,
+ 2 * s->qscale, (s->qscale - 1) | 1,
+ s->loop_filter, s->low_delay);
+
+ ff_er_add_slice(&w->s.er, 0, 0,
+ (w->s.mb_x >> 1) - 1, (w->s.mb_y >> 1) - 1,
+ ER_MB_END);
return 1;
}
}
} else {
if (s->pict_type == AV_PICTURE_TYPE_P)
- av_dlog(s->avctx, "%d%d ", s->inter_intra_pred, cbp);
- av_dlog(s->avctx, "I at %d %d %d %06X\n", s->mb_x, s->mb_y,
+ ff_dlog(s->avctx, "%d%d ", s->inter_intra_pred, cbp);
+ ff_dlog(s->avctx, "I at %d %d %d %06X\n", s->mb_x, s->mb_y,
((cbp & 3) ? 1 : 0) + ((cbp & 0x3C) ? 2 : 0),
show_bits(&s->gb, 24));
s->ac_pred = get_bits1(&s->gb);
if (s->inter_intra_pred) {
s->h263_aic_dir = get_vlc2(&s->gb, ff_inter_intra_vlc.table,
INTER_INTRA_VLC_BITS, 1);
- av_dlog(s->avctx, "%d%d %d %d/",
+ ff_dlog(s->avctx, "%d%d %d %d/",
s->ac_pred, s->h263_aic_dir, s->mb_x, s->mb_y);
}
if (s->per_mb_rl_table && cbp) {
ff_wmv2_common_init(w);
- ff_intrax8_common_init(&w->x8, &w->s);
-
- return 0;
+ return ff_intrax8_common_init(avctx, &w->x8, &w->s.idsp,
+ w->s.block, w->s.block_last_index,
+ w->s.mb_width, w->s.mb_height);
}
static av_cold int wmv2_decode_end(AVCodecContext *avctx)
.init = wmv2_decode_init,
.close = wmv2_decode_end,
.decode = ff_h263_decode_frame,
- .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_DR1,
.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P,
AV_PIX_FMT_NONE },
};