*/
#include "avcodec.h"
+#include "mpeg_er.h"
+#include "mpegutils.h"
#include "mpegvideo.h"
#include "h263.h"
#include "h261.h"
-#include "h261data.h"
+#include "internal.h"
#define H261_MBA_VLC_BITS 9
#define H261_MTYPE_VLC_BITS 6
if (!done) {
done = 1;
INIT_VLC_STATIC(&h261_mba_vlc, H261_MBA_VLC_BITS, 35,
- h261_mba_bits, 1, 1,
- h261_mba_code, 1, 1, 662);
+ ff_h261_mba_bits, 1, 1,
+ ff_h261_mba_code, 1, 1, 662);
INIT_VLC_STATIC(&h261_mtype_vlc, H261_MTYPE_VLC_BITS, 10,
- h261_mtype_bits, 1, 1,
- h261_mtype_code, 1, 1, 80);
+ ff_h261_mtype_bits, 1, 1,
+ ff_h261_mtype_code, 1, 1, 80);
INIT_VLC_STATIC(&h261_mv_vlc, H261_MV_VLC_BITS, 17,
- &h261_mv_tab[0][1], 2, 1,
- &h261_mv_tab[0][0], 2, 1, 144);
+ &ff_h261_mv_tab[0][1], 2, 1,
+ &ff_h261_mv_tab[0][0], 2, 1, 144);
INIT_VLC_STATIC(&h261_cbp_vlc, H261_CBP_VLC_BITS, 63,
- &h261_cbp_tab[0][1], 2, 1,
- &h261_cbp_tab[0][0], 2, 1, 512);
- ff_init_rl(&h261_rl_tcoeff, ff_h261_rl_table_store);
- INIT_VLC_RL(h261_rl_tcoeff, 552);
+ &ff_h261_cbp_tab[0][1], 2, 1,
+ &ff_h261_cbp_tab[0][0], 2, 1, 512);
+ INIT_VLC_RL(ff_h261_rl_tcoeff, 552);
}
}
MpegEncContext *const s = &h->s;
// set defaults
- ff_MPV_decode_defaults(s);
+ ff_mpv_decode_defaults(s);
s->avctx = avctx;
s->width = s->avctx->coded_width;
s->height = s->avctx->coded_height;
avctx->pix_fmt = AV_PIX_FMT_YUV420P;
s->codec_id = avctx->codec->id;
+ ff_h261_common_init();
h261_decode_init_vlc(h);
h->gob_start_code_skipped = 0;
* Decode the group of blocks / video packet header.
* @return <0 if no resync found
*/
-static int ff_h261_resync(H261Context *h)
+static int h261_resync(H261Context *h)
{
MpegEncContext *const s = &h->s;
int left, ret;
s->mb_skipped = 1;
h->mtype &= ~MB_TYPE_H261_FIL;
- ff_MPV_decode_mb(s, s->block);
+ ff_mpv_decode_mb(s, s->block);
}
return 0;
}
+static const int mvmap[17] = {
+ 0, -1, -2, -3, -4, -5, -6, -7, -8, -9, -10, -11, -12, -13, -14, -15, -16
+};
+
static int decode_mv_component(GetBitContext *gb, int v)
{
int mv_diff = get_vlc2(gb, h261_mv_vlc.table, H261_MV_VLC_BITS, 2);
{
MpegEncContext *const s = &h->s;
int code, level, i, j, run;
- RLTable *rl = &h261_rl_tcoeff;
+ RLTable *rl = &ff_h261_rl_tcoeff;
const uint8_t *scan_table;
/* For the variable length encoding there are two code tables, one being
// Read mtype
h->mtype = get_vlc2(&s->gb, h261_mtype_vlc.table, H261_MTYPE_VLC_BITS, 2);
- h->mtype = h261_mtype_map[h->mtype];
+ if (h->mtype < 0 || h->mtype >= FF_ARRAY_ELEMS(ff_h261_mtype_map)) {
+ av_log(s->avctx, AV_LOG_ERROR, "Invalid mtype index %d\n",
+ h->mtype);
+ return SLICE_ERROR;
+ }
+ h->mtype = ff_h261_mtype_map[h->mtype];
// Read mquant
if (IS_QUANT(h->mtype))
intra:
/* decode each block */
if (s->mb_intra || HAS_CBP(h->mtype)) {
- s->dsp.clear_blocks(s->block[0]);
+ s->bdsp.clear_blocks(s->block[0]);
for (i = 0; i < 6; i++) {
if (h261_decode_block(h, s->block[i], i, cbp & 32) < 0)
return SLICE_ERROR;
s->block_last_index[i] = -1;
}
- ff_MPV_decode_mb(s, s->block);
+ ff_mpv_decode_mb(s, s->block);
return SLICE_OK;
}
i += 32;
s->picture_number = (s->picture_number & ~31) + i;
- s->avctx->time_base = (AVRational) { 1001, 30000 };
- s->current_picture.f.pts = s->picture_number;
+ s->avctx->framerate = (AVRational) { 30000, 1001 };
/* PTYPE starts here */
skip_bits1(&s->gb); /* split screen off */
int ret;
AVFrame *pict = data;
- av_dlog(avctx, "*****frame %d size=%d\n", avctx->frame_number, buf_size);
- av_dlog(avctx, "bytes=%x %x %x %x\n", buf[0], buf[1], buf[2], buf[3]);
- s->flags = avctx->flags;
- s->flags2 = avctx->flags2;
+ ff_dlog(avctx, "*****frame %d size=%d\n", avctx->frame_number, buf_size);
+ ff_dlog(avctx, "bytes=%x %x %x %x\n", buf[0], buf[1], buf[2], buf[3]);
h->gob_start_code_skipped = 0;
if (!s->context_initialized)
// we need the IDCT permutaton for reading a custom matrix
- if (ff_MPV_common_init(s) < 0)
- return -1;
-
- /* We need to set current_picture_ptr before reading the header,
- * otherwise we cannot store anything in there. */
- if (s->current_picture_ptr == NULL || s->current_picture_ptr->f.data[0]) {
- int i = ff_find_unused_picture(s, 0);
- if (i < 0)
- return i;
- s->current_picture_ptr = &s->picture[i];
- }
+ ff_mpv_idct_init(s);
ret = h261_decode_picture_header(h);
if (s->width != avctx->coded_width || s->height != avctx->coded_height) {
ParseContext pc = s->parse_context; // FIXME move this demuxing hack to libavformat
s->parse_context.buffer = 0;
- ff_MPV_common_end(s);
+ ff_mpv_common_end(s);
s->parse_context = pc;
}
+
if (!s->context_initialized) {
- avcodec_set_dimensions(avctx, s->width, s->height);
+ if ((ret = ff_mpv_common_init(s)) < 0)
+ return ret;
+
+ ret = ff_set_dimensions(avctx, s->width, s->height);
+ if (ret < 0)
+ return ret;
goto retry;
}
// for skipping the frame
- s->current_picture.f.pict_type = s->pict_type;
- s->current_picture.f.key_frame = s->pict_type == AV_PICTURE_TYPE_I;
+ s->current_picture.f->pict_type = s->pict_type;
+ s->current_picture.f->key_frame = s->pict_type == AV_PICTURE_TYPE_I;
if ((avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type == AV_PICTURE_TYPE_B) ||
(avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type != AV_PICTURE_TYPE_I) ||
avctx->skip_frame >= AVDISCARD_ALL)
return get_consumed_bytes(s, buf_size);
- if (ff_MPV_frame_start(s, avctx) < 0)
+ if (ff_mpv_frame_start(s, avctx) < 0)
return -1;
ff_mpeg_er_frame_start(s);
s->mb_y = 0;
while (h->gob_number < (s->mb_height == 18 ? 12 : 5)) {
- if (ff_h261_resync(h) < 0)
+ if (h261_resync(h) < 0)
break;
h261_decode_gob(h);
}
- ff_MPV_frame_end(s);
+ ff_mpv_frame_end(s);
- assert(s->current_picture.f.pict_type == s->current_picture_ptr->f.pict_type);
- assert(s->current_picture.f.pict_type == s->pict_type);
+ assert(s->current_picture.f->pict_type == s->current_picture_ptr->f->pict_type);
+ assert(s->current_picture.f->pict_type == s->pict_type);
- if ((ret = av_frame_ref(pict, &s->current_picture_ptr->f)) < 0)
+ if ((ret = av_frame_ref(pict, s->current_picture_ptr->f)) < 0)
return ret;
ff_print_debug_info(s, s->current_picture_ptr);
H261Context *h = avctx->priv_data;
MpegEncContext *s = &h->s;
- ff_MPV_common_end(s);
+ ff_mpv_common_end(s);
return 0;
}
AVCodec ff_h261_decoder = {
.name = "h261",
+ .long_name = NULL_IF_CONFIG_SMALL("H.261"),
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_H261,
.priv_data_size = sizeof(H261Context),
.init = h261_decode_init,
.close = h261_decode_end,
.decode = h261_decode_frame,
- .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("H.261"),
+ .capabilities = AV_CODEC_CAP_DR1,
};