time_incr++;
check_marker(&s->gb, "before time_increment in video packed header");
- skip_bits(&s->gb, s->time_increment_bits); /* time_increment */
+ skip_bits(&s->gb, ctx->time_increment_bits); /* time_increment */
check_marker(&s->gb, "before vop_coding_type in video packed header");
skip_bits(&s->gb, 2); /* vop coding type */
return -1;
}
- s->time_increment_bits = av_log2(s->avctx->time_base.den - 1) + 1;
- if (s->time_increment_bits < 1)
- s->time_increment_bits = 1;
+ ctx->time_increment_bits = av_log2(s->avctx->time_base.den - 1) + 1;
+ if (ctx->time_increment_bits < 1)
+ ctx->time_increment_bits = 1;
check_marker(gb, "before fixed_vop_rate");
if (get_bits1(gb) != 0) /* fixed_vop_rate */
- s->avctx->time_base.num = get_bits(gb, s->time_increment_bits);
+ s->avctx->time_base.num = get_bits(gb, ctx->time_increment_bits);
else
s->avctx->time_base.num = 1;
check_marker(gb, "before time_increment");
- if (s->time_increment_bits == 0 ||
- !(show_bits(gb, s->time_increment_bits + 1) & 1)) {
+ if (ctx->time_increment_bits == 0 ||
+ !(show_bits(gb, ctx->time_increment_bits + 1) & 1)) {
av_log(s->avctx, AV_LOG_ERROR,
"hmm, seems the headers are not complete, trying to guess time_increment_bits\n");
- for (s->time_increment_bits = 1;
- s->time_increment_bits < 16;
- s->time_increment_bits++) {
+ for (ctx->time_increment_bits = 1;
+ ctx->time_increment_bits < 16;
+ ctx->time_increment_bits++) {
if (s->pict_type == AV_PICTURE_TYPE_P ||
(s->pict_type == AV_PICTURE_TYPE_S &&
s->vol_sprite_usage == GMC_SPRITE)) {
- if ((show_bits(gb, s->time_increment_bits + 6) & 0x37) == 0x30)
+ if ((show_bits(gb, ctx->time_increment_bits + 6) & 0x37) == 0x30)
break;
- } else if ((show_bits(gb, s->time_increment_bits + 5) & 0x1F) == 0x18)
+ } else if ((show_bits(gb, ctx->time_increment_bits + 5) & 0x1F) == 0x18)
break;
}
av_log(s->avctx, AV_LOG_ERROR,
- "my guess is %d bits ;)\n", s->time_increment_bits);
+ "my guess is %d bits ;)\n", ctx->time_increment_bits);
}
if (IS_3IV1)
time_increment = get_bits1(gb); // FIXME investigate further
else
- time_increment = get_bits(gb, s->time_increment_bits);
+ time_increment = get_bits(gb, ctx->time_increment_bits);
if (s->pict_type != AV_PICTURE_TYPE_B) {
s->last_time_base = s->time_base;
if (ret < 0)
return ret;
- s->shape = s1->shape;
+ s->shape = s1->shape;
+ s->time_increment_bits = s1->time_increment_bits;
return 0;
}
s->h263_pred = 1;
s->low_delay = 0; /* default, might be overriden in the vol header during header parsing */
s->decode_mb = mpeg4_decode_mb;
- s->time_increment_bits = 4; /* default value for broken headers */
+ ctx->time_increment_bits = 4; /* default value for broken headers */
avctx->chroma_sample_location = AVCHROMA_LOC_LEFT;
avctx->internal->allocate_progress = 1;