*/
#include "avcodec.h"
-#include "get_bits.h"
-#include "golomb.h"
+#include "bitstream.h"
#include "cavs.h"
+#include "golomb.h"
#include "internal.h"
+#include "mpeg12data.h"
static const uint8_t mv_scan[4] = {
MV_FWD_X0, MV_FWD_X1,
{
cavs_vector *pmv_bw = pmv_fw + MV_BWD_OFFS;
int den = h->direct_den[col_mv->ref];
- int m = col_mv->x >> 31;
+ int m = FF_SIGNBIT(col_mv->x);
pmv_fw->dist = h->dist[1];
pmv_bw->dist = h->dist[0];
/* scale the co-located motion vector according to its temporal span */
pmv_fw->x = (((den + (den * col_mv->x * pmv_fw->dist ^ m) - m - 1) >> 14) ^ m) - m;
pmv_bw->x = m - (((den + (den * col_mv->x * pmv_bw->dist ^ m) - m - 1) >> 14) ^ m);
- m = col_mv->y >> 31;
+ m = FF_SIGNBIT(col_mv->y);
pmv_fw->y = (((den + (den * col_mv->y * pmv_fw->dist ^ m) - m - 1) >> 14) ^ m) - m;
pmv_bw->y = m - (((den + (den * col_mv->y * pmv_bw->dist ^ m) - m - 1) >> 14) ^ m);
}
****************************************************************************/
/** kth-order exponential golomb code */
-static inline int get_ue_code(GetBitContext *gb, int order)
+static inline int get_ue_code(BitstreamContext *bc, int order)
{
if (order) {
- int ret = get_ue_golomb(gb) << order;
- return ret + get_bits(gb, order);
+ int ret = get_ue_golomb(bc) << order;
+ return ret + bitstream_read(bc, order);
}
- return get_ue_golomb(gb);
+ return get_ue_golomb(bc);
}
-static inline int dequant(AVSContext *h, DCTELEM *level_buf, uint8_t *run_buf,
- DCTELEM *dst, int mul, int shift, int coeff_num)
+static inline int dequant(AVSContext *h, int16_t *level_buf, uint8_t *run_buf,
+ int16_t *dst, int mul, int shift, int coeff_num)
{
int round = 1 << (shift - 1);
int pos = -1;
while (--coeff_num >= 0) {
pos += run_buf[coeff_num];
if (pos > 63) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
"position out of block bounds at pic %d MB(%d,%d)\n",
- h->picture.poc, h->mbx, h->mby);
- return -1;
+ h->cur.poc, h->mbx, h->mby);
+ return AVERROR_INVALIDDATA;
}
dst[scantab[pos]] = (level_buf[coeff_num] * mul + round) >> shift;
}
* @param dst location of sample block
* @param stride line stride in frame buffer
*/
-static int decode_residual_block(AVSContext *h, GetBitContext *gb,
+static int decode_residual_block(AVSContext *h, BitstreamContext *bc,
const struct dec_2dvlc *r, int esc_golomb_order,
- int qp, uint8_t *dst, int stride)
+ int qp, uint8_t *dst, ptrdiff_t stride)
{
- int i, level_code, esc_code, level, run, mask;
- DCTELEM level_buf[65];
+ int i, level_code, esc_code, level, run, mask, ret;
+ int16_t level_buf[65];
uint8_t run_buf[65];
- DCTELEM *block = h->block;
+ int16_t *block = h->block;
for (i = 0;i < 65; i++) {
- level_code = get_ue_code(gb, r->golomb_order);
+ level_code = get_ue_code(bc, r->golomb_order);
if (level_code >= ESCAPE_CODE) {
run = ((level_code - ESCAPE_CODE) >> 1) + 1;
- esc_code = get_ue_code(gb, esc_golomb_order);
+ esc_code = get_ue_code(bc, esc_golomb_order);
level = esc_code + (run > r->max_run ? 1 : r->level_add[run]);
while (level > r->inc_limit)
r++;
level_buf[i] = level;
run_buf[i] = run;
}
- if (dequant(h, level_buf, run_buf, block, dequant_mul[qp],
- dequant_shift[qp], i))
- return -1;
+ if ((ret = dequant(h, level_buf, run_buf, block, dequant_mul[qp],
+ dequant_shift[qp], i)) < 0)
+ return ret;
h->cdsp.cavs_idct8_add(dst, block, stride);
- h->s.dsp.clear_block(block);
+ h->bdsp.clear_block(block);
return 0;
}
static inline void decode_residual_chroma(AVSContext *h)
{
if (h->cbp & (1 << 4))
- decode_residual_block(h, &h->s.gb, chroma_dec, 0,
+ decode_residual_block(h, &h->bc, chroma_dec, 0,
cavs_chroma_qp[h->qp], h->cu, h->c_stride);
if (h->cbp & (1 << 5))
- decode_residual_block(h, &h->s.gb, chroma_dec, 0,
+ decode_residual_block(h, &h->bc, chroma_dec, 0,
cavs_chroma_qp[h->qp], h->cv, h->c_stride);
}
int block;
/* get coded block pattern */
- int cbp = get_ue_golomb(&h->s.gb);
- if (cbp > 63) {
- av_log(h->s.avctx, AV_LOG_ERROR, "illegal inter cbp\n");
- return -1;
+ int cbp = get_ue_golomb(&h->bc);
+ if (cbp > 63 || cbp < 0) {
+ av_log(h->avctx, AV_LOG_ERROR, "illegal inter cbp %d\n", cbp);
+ return AVERROR_INVALIDDATA;
}
h->cbp = cbp_tab[cbp][1];
/* get quantizer */
if (h->cbp && !h->qp_fixed)
- h->qp = (h->qp + get_se_golomb(&h->s.gb)) & 63;
+ h->qp = (h->qp + get_se_golomb(&h->bc)) & 63;
for (block = 0; block < 4; block++)
if (h->cbp & (1 << block))
- decode_residual_block(h, &h->s.gb, inter_dec, 0, h->qp,
+ decode_residual_block(h, &h->bc, inter_dec, 0, h->qp,
h->cy + h->luma_scan[block], h->l_stride);
decode_residual_chroma(h);
set_mvs(&h->mv[MV_FWD_X0], BLK_16X16);
h->mv[MV_BWD_X0] = ff_cavs_intra_mv;
set_mvs(&h->mv[MV_BWD_X0], BLK_16X16);
- if (h->pic_type != AV_PICTURE_TYPE_B)
+ if (h->cur.f->pict_type != AV_PICTURE_TYPE_B)
h->col_type_base[h->mbidx] = I_8X8;
}
static int decode_mb_i(AVSContext *h, int cbp_code)
{
- GetBitContext *gb = &h->s.gb;
+ BitstreamContext *bc = &h->bc;
unsigned pred_mode_uv;
int block;
uint8_t top[18];
predpred = FFMIN(nA, nB);
if (predpred == NOT_AVAIL) // if either is not available
predpred = INTRA_L_LP;
- if (!get_bits1(gb)) {
- int rem_mode = get_bits(gb, 2);
+ if (!bitstream_read_bit(bc)) {
+ int rem_mode = bitstream_read(bc, 2);
predpred = rem_mode + (rem_mode >= predpred);
}
h->pred_mode_Y[pos] = predpred;
}
- pred_mode_uv = get_ue_golomb(gb);
+ pred_mode_uv = get_ue_golomb(bc);
if (pred_mode_uv > 6) {
- av_log(h->s.avctx, AV_LOG_ERROR, "illegal intra chroma pred mode\n");
- return -1;
+ av_log(h->avctx, AV_LOG_ERROR, "illegal intra chroma pred mode\n");
+ return AVERROR_INVALIDDATA;
}
ff_cavs_modify_mb_i(h, &pred_mode_uv);
/* get coded block pattern */
- if (h->pic_type == AV_PICTURE_TYPE_I)
- cbp_code = get_ue_golomb(gb);
- if (cbp_code > 63) {
- av_log(h->s.avctx, AV_LOG_ERROR, "illegal intra cbp\n");
- return -1;
+ if (h->cur.f->pict_type == AV_PICTURE_TYPE_I)
+ cbp_code = get_ue_golomb(bc);
+ if (cbp_code > 63 || cbp_code < 0) {
+ av_log(h->avctx, AV_LOG_ERROR, "illegal intra cbp\n");
+ return AVERROR_INVALIDDATA;
}
h->cbp = cbp_tab[cbp_code][0];
if (h->cbp && !h->qp_fixed)
- h->qp = (h->qp + get_se_golomb(gb)) & 63; //qp_delta
+ h->qp = (h->qp + get_se_golomb(bc)) & 63; // qp_delta
/* luma intra prediction interleaved with residual decode/transform/add */
for (block = 0; block < 4; block++) {
h->intra_pred_l[h->pred_mode_Y[scan3x3[block]]]
(d, top, left, h->l_stride);
if (h->cbp & (1<<block))
- decode_residual_block(h, gb, intra_dec, 1, h->qp, d, h->l_stride);
+ decode_residual_block(h, bc, intra_dec, 1, h->qp, d, h->l_stride);
}
/* chroma intra prediction */
static void decode_mb_p(AVSContext *h, enum cavs_mb mb_type)
{
- GetBitContext *gb = &h->s.gb;
+ BitstreamContext *bc = &h->bc;
int ref[4];
ff_cavs_init_mb(h);
ff_cavs_mv(h, MV_FWD_X0, MV_FWD_C2, MV_PRED_PSKIP, BLK_16X16, 0);
break;
case P_16X16:
- ref[0] = h->ref_flag ? 0 : get_bits1(gb);
+ ref[0] = h->ref_flag ? 0 : bitstream_read_bit(bc);
ff_cavs_mv(h, MV_FWD_X0, MV_FWD_C2, MV_PRED_MEDIAN, BLK_16X16, ref[0]);
break;
case P_16X8:
- ref[0] = h->ref_flag ? 0 : get_bits1(gb);
- ref[2] = h->ref_flag ? 0 : get_bits1(gb);
+ ref[0] = h->ref_flag ? 0 : bitstream_read_bit(bc);
+ ref[2] = h->ref_flag ? 0 : bitstream_read_bit(bc);
ff_cavs_mv(h, MV_FWD_X0, MV_FWD_C2, MV_PRED_TOP, BLK_16X8, ref[0]);
ff_cavs_mv(h, MV_FWD_X2, MV_FWD_A1, MV_PRED_LEFT, BLK_16X8, ref[2]);
break;
case P_8X16:
- ref[0] = h->ref_flag ? 0 : get_bits1(gb);
- ref[1] = h->ref_flag ? 0 : get_bits1(gb);
+ ref[0] = h->ref_flag ? 0 : bitstream_read_bit(bc);
+ ref[1] = h->ref_flag ? 0 : bitstream_read_bit(bc);
ff_cavs_mv(h, MV_FWD_X0, MV_FWD_B3, MV_PRED_LEFT, BLK_8X16, ref[0]);
ff_cavs_mv(h, MV_FWD_X1, MV_FWD_C2, MV_PRED_TOPRIGHT, BLK_8X16, ref[1]);
break;
case P_8X8:
- ref[0] = h->ref_flag ? 0 : get_bits1(gb);
- ref[1] = h->ref_flag ? 0 : get_bits1(gb);
- ref[2] = h->ref_flag ? 0 : get_bits1(gb);
- ref[3] = h->ref_flag ? 0 : get_bits1(gb);
+ ref[0] = h->ref_flag ? 0 : bitstream_read_bit(bc);
+ ref[1] = h->ref_flag ? 0 : bitstream_read_bit(bc);
+ ref[2] = h->ref_flag ? 0 : bitstream_read_bit(bc);
+ ref[3] = h->ref_flag ? 0 : bitstream_read_bit(bc);
ff_cavs_mv(h, MV_FWD_X0, MV_FWD_B3, MV_PRED_MEDIAN, BLK_8X8, ref[0]);
ff_cavs_mv(h, MV_FWD_X1, MV_FWD_C2, MV_PRED_MEDIAN, BLK_8X8, ref[1]);
ff_cavs_mv(h, MV_FWD_X2, MV_FWD_X1, MV_PRED_MEDIAN, BLK_8X8, ref[2]);
break;
case B_8X8:
for (block = 0; block < 4; block++)
- sub_type[block] = get_bits(&h->s.gb, 2);
+ sub_type[block] = bitstream_read(&h->bc, 2);
for (block = 0; block < 4; block++) {
switch (sub_type[block]) {
case B_SUB_DIRECT:
*
****************************************************************************/
-static inline int decode_slice_header(AVSContext *h, GetBitContext *gb)
+static inline int decode_slice_header(AVSContext *h, BitstreamContext *bc)
{
if (h->stc > 0xAF)
- av_log(h->s.avctx, AV_LOG_ERROR, "unexpected start code 0x%02x\n", h->stc);
+ av_log(h->avctx, AV_LOG_ERROR, "unexpected start code 0x%02x\n", h->stc);
h->mby = h->stc;
h->mbidx = h->mby * h->mb_width;
/* mark top macroblocks as unavailable */
h->flags &= ~(B_AVAIL | C_AVAIL);
if ((h->mby == 0) && (!h->qp_fixed)) {
- h->qp_fixed = get_bits1(gb);
- h->qp = get_bits(gb, 6);
+ h->qp_fixed = bitstream_read_bit(bc);
+ h->qp = bitstream_read(bc, 6);
}
/* inter frame or second slice can have weighting params */
- if ((h->pic_type != AV_PICTURE_TYPE_I) ||
+ if ((h->cur.f->pict_type != AV_PICTURE_TYPE_I) ||
(!h->pic_structure && h->mby >= h->mb_width / 2))
- if (get_bits1(gb)) { //slice_weighting_flag
- av_log(h->s.avctx, AV_LOG_ERROR,
+ if (bitstream_read_bit(bc)) { // slice_weighting_flag
+ av_log(h->avctx, AV_LOG_ERROR,
"weighted prediction not yet supported\n");
}
return 0;
static inline int check_for_slice(AVSContext *h)
{
- GetBitContext *gb = &h->s.gb;
+ BitstreamContext *bc = &h->bc;
int align;
if (h->mbx)
return 0;
- align = (-get_bits_count(gb)) & 7;
+ align = (-bitstream_tell(bc)) & 7;
/* check for stuffing byte */
- if (!align && (show_bits(gb, 8) == 0x80))
+ if (!align && (bitstream_peek(bc, 8) == 0x80))
align = 8;
- if ((show_bits_long(gb, 24 + align) & 0xFFFFFF) == 0x000001) {
- skip_bits_long(gb, 24 + align);
- h->stc = get_bits(gb, 8);
+ if ((bitstream_peek(bc, 24 + align) & 0xFFFFFF) == 0x000001) {
+ bitstream_skip(bc, 24 + align);
+ h->stc = bitstream_read(bc, 8);
if (h->stc >= h->mb_height)
return 0;
- decode_slice_header(h, gb);
+ decode_slice_header(h, bc);
return 1;
}
return 0;
static int decode_pic(AVSContext *h)
{
- MpegEncContext *s = &h->s;
+ int ret;
int skip_count = -1;
enum cavs_mb mb_type;
- if (!s->context_initialized) {
- if (ff_MPV_common_init(s) < 0)
- return -1;
- ff_init_scantable_permutation(s->dsp.idct_permutation,
- h->cdsp.idct_perm);
- ff_init_scantable(s->dsp.idct_permutation, &h->scantable, ff_zigzag_direct);
+ if (!h->top_qp) {
+ av_log(h->avctx, AV_LOG_ERROR, "No sequence header decoded yet\n");
+ return AVERROR_INVALIDDATA;
}
- skip_bits(&s->gb, 16);//bbv_dwlay
+
+ av_frame_unref(h->cur.f);
+
+ bitstream_skip(&h->bc, 16); // bbv_dwlay
if (h->stc == PIC_PB_START_CODE) {
- h->pic_type = get_bits(&s->gb, 2) + AV_PICTURE_TYPE_I;
- if (h->pic_type > AV_PICTURE_TYPE_B) {
- av_log(s->avctx, AV_LOG_ERROR, "illegal picture type\n");
- return -1;
+ h->cur.f->pict_type = bitstream_read(&h->bc, 2) + AV_PICTURE_TYPE_I;
+ if (h->cur.f->pict_type > AV_PICTURE_TYPE_B) {
+ av_log(h->avctx, AV_LOG_ERROR, "illegal picture type\n");
+ return AVERROR_INVALIDDATA;
}
/* make sure we have the reference frames we need */
- if (!h->DPB[0].f.data[0] ||
- (!h->DPB[1].f.data[0] && h->pic_type == AV_PICTURE_TYPE_B))
- return -1;
+ if (!h->DPB[0].f->data[0] ||
+ (!h->DPB[1].f->data[0] && h->cur.f->pict_type == AV_PICTURE_TYPE_B))
+ return AVERROR_INVALIDDATA;
} else {
- h->pic_type = AV_PICTURE_TYPE_I;
- if (get_bits1(&s->gb))
- skip_bits(&s->gb, 24);//time_code
+ h->cur.f->pict_type = AV_PICTURE_TYPE_I;
+ if (bitstream_read_bit(&h->bc))
+ bitstream_skip(&h->bc, 24); // time_code
/* old sample clips were all progressive and no low_delay,
bump stream revision if detected otherwise */
- if (s->low_delay || !(show_bits(&s->gb, 9) & 1))
+ if (h->low_delay || !(bitstream_peek(&h->bc, 9) & 1))
h->stream_revision = 1;
/* similarly test top_field_first and repeat_first_field */
- else if (show_bits(&s->gb, 11) & 3)
+ else if (bitstream_peek(&h->bc, 11) & 3)
h->stream_revision = 1;
if (h->stream_revision > 0)
- skip_bits(&s->gb, 1); //marker_bit
+ bitstream_skip(&h->bc, 1); // marker_bit
+ }
+
+ ret = ff_get_buffer(h->avctx, h->cur.f, h->cur.f->pict_type == AV_PICTURE_TYPE_B ?
+ 0 : AV_GET_BUFFER_FLAG_REF);
+ if (ret < 0)
+ return ret;
+
+ if (!h->edge_emu_buffer) {
+ int alloc_size = FFALIGN(FFABS(h->cur.f->linesize[0]) + 32, 32);
+ h->edge_emu_buffer = av_mallocz(alloc_size * 2 * 24);
+ if (!h->edge_emu_buffer)
+ return AVERROR(ENOMEM);
}
- /* release last B frame */
- if (h->picture.f.data[0])
- s->avctx->release_buffer(s->avctx, &h->picture.f);
- ff_get_buffer(s->avctx, &h->picture.f);
ff_cavs_init_pic(h);
- h->picture.poc = get_bits(&s->gb, 8) * 2;
+ h->cur.poc = bitstream_read(&h->bc, 8) * 2;
/* get temporal distances and MV scaling factors */
- if (h->pic_type != AV_PICTURE_TYPE_B) {
- h->dist[0] = (h->picture.poc - h->DPB[0].poc + 512) % 512;
+ if (h->cur.f->pict_type != AV_PICTURE_TYPE_B) {
+ h->dist[0] = (h->cur.poc - h->DPB[0].poc + 512) % 512;
} else {
- h->dist[0] = (h->DPB[0].poc - h->picture.poc + 512) % 512;
+ h->dist[0] = (h->DPB[0].poc - h->cur.poc + 512) % 512;
}
- h->dist[1] = (h->picture.poc - h->DPB[1].poc + 512) % 512;
+ h->dist[1] = (h->cur.poc - h->DPB[1].poc + 512) % 512;
h->scale_den[0] = h->dist[0] ? 512/h->dist[0] : 0;
h->scale_den[1] = h->dist[1] ? 512/h->dist[1] : 0;
- if (h->pic_type == AV_PICTURE_TYPE_B) {
+ if (h->cur.f->pict_type == AV_PICTURE_TYPE_B) {
h->sym_factor = h->dist[0] * h->scale_den[1];
} else {
h->direct_den[0] = h->dist[0] ? 16384 / h->dist[0] : 0;
h->direct_den[1] = h->dist[1] ? 16384 / h->dist[1] : 0;
}
- if (s->low_delay)
- get_ue_golomb(&s->gb); //bbv_check_times
- h->progressive = get_bits1(&s->gb);
+ if (h->low_delay)
+ get_ue_golomb(&h->bc); // bbv_check_times
+ h->progressive = bitstream_read_bit(&h->bc);
h->pic_structure = 1;
if (!h->progressive)
- h->pic_structure = get_bits1(&s->gb);
+ h->pic_structure = bitstream_read_bit(&h->bc);
if (!h->pic_structure && h->stc == PIC_PB_START_CODE)
- skip_bits1(&s->gb); //advanced_pred_mode_disable
- skip_bits1(&s->gb); //top_field_first
- skip_bits1(&s->gb); //repeat_first_field
- h->qp_fixed = get_bits1(&s->gb);
- h->qp = get_bits(&s->gb, 6);
- if (h->pic_type == AV_PICTURE_TYPE_I) {
+ bitstream_skip(&h->bc, 1); // advanced_pred_mode_disable
+ bitstream_skip(&h->bc, 1); // top_field_first
+ bitstream_skip(&h->bc, 1); // repeat_first_field
+ h->qp_fixed = bitstream_read_bit(&h->bc);
+ h->qp = bitstream_read(&h->bc, 6);
+ if (h->cur.f->pict_type == AV_PICTURE_TYPE_I) {
if (!h->progressive && !h->pic_structure)
- skip_bits1(&s->gb);//what is this?
- skip_bits(&s->gb, 4); //reserved bits
+ bitstream_skip(&h->bc, 1); // what is this?
+ bitstream_skip(&h->bc, 4); // reserved bits
} else {
- if (!(h->pic_type == AV_PICTURE_TYPE_B && h->pic_structure == 1))
- h->ref_flag = get_bits1(&s->gb);
- skip_bits(&s->gb, 4); //reserved bits
- h->skip_mode_flag = get_bits1(&s->gb);
+ if (!(h->cur.f->pict_type == AV_PICTURE_TYPE_B && h->pic_structure == 1))
+ h->ref_flag = bitstream_read_bit(&h->bc);
+ bitstream_skip(&h->bc, 4); // reserved bits
+ h->skip_mode_flag = bitstream_read_bit(&h->bc);
}
- h->loop_filter_disable = get_bits1(&s->gb);
- if (!h->loop_filter_disable && get_bits1(&s->gb)) {
- h->alpha_offset = get_se_golomb(&s->gb);
- h->beta_offset = get_se_golomb(&s->gb);
+ h->loop_filter_disable = bitstream_read_bit(&h->bc);
+ if (!h->loop_filter_disable && bitstream_read_bit(&h->bc)) {
+ h->alpha_offset = get_se_golomb(&h->bc);
+ h->beta_offset = get_se_golomb(&h->bc);
} else {
h->alpha_offset = h->beta_offset = 0;
}
- if (h->pic_type == AV_PICTURE_TYPE_I) {
+ if (h->cur.f->pict_type == AV_PICTURE_TYPE_I) {
do {
check_for_slice(h);
decode_mb_i(h, 0);
} while (ff_cavs_next_mb(h));
- } else if (h->pic_type == AV_PICTURE_TYPE_P) {
+ } else if (h->cur.f->pict_type == AV_PICTURE_TYPE_P) {
do {
if (check_for_slice(h))
skip_count = -1;
if (h->skip_mode_flag && (skip_count < 0))
- skip_count = get_ue_golomb(&s->gb);
+ skip_count = get_ue_golomb(&h->bc);
if (h->skip_mode_flag && skip_count--) {
decode_mb_p(h, P_SKIP);
} else {
- mb_type = get_ue_golomb(&s->gb) + P_SKIP + h->skip_mode_flag;
+ mb_type = get_ue_golomb(&h->bc) + P_SKIP + h->skip_mode_flag;
if (mb_type > P_8X8)
decode_mb_i(h, mb_type - P_8X8 - 1);
else
if (check_for_slice(h))
skip_count = -1;
if (h->skip_mode_flag && (skip_count < 0))
- skip_count = get_ue_golomb(&s->gb);
+ skip_count = get_ue_golomb(&h->bc);
if (h->skip_mode_flag && skip_count--) {
decode_mb_b(h, B_SKIP);
} else {
- mb_type = get_ue_golomb(&s->gb) + B_SKIP + h->skip_mode_flag;
+ mb_type = get_ue_golomb(&h->bc) + B_SKIP + h->skip_mode_flag;
if (mb_type > B_8X8)
decode_mb_i(h, mb_type - B_8X8 - 1);
else
}
} while (ff_cavs_next_mb(h));
}
- if (h->pic_type != AV_PICTURE_TYPE_B) {
- if (h->DPB[1].f.data[0])
- s->avctx->release_buffer(s->avctx, &h->DPB[1].f);
- h->DPB[1] = h->DPB[0];
- h->DPB[0] = h->picture;
- memset(&h->picture, 0, sizeof(Picture));
+ if (h->cur.f->pict_type != AV_PICTURE_TYPE_B) {
+ av_frame_unref(h->DPB[1].f);
+ FFSWAP(AVSFrame, h->cur, h->DPB[1]);
+ FFSWAP(AVSFrame, h->DPB[0], h->DPB[1]);
}
return 0;
}
static int decode_seq_header(AVSContext *h)
{
- MpegEncContext *s = &h->s;
int frame_rate_code;
int width, height;
- h->profile = get_bits(&s->gb, 8);
- h->level = get_bits(&s->gb, 8);
- skip_bits1(&s->gb); //progressive sequence
+ h->profile = bitstream_read(&h->bc, 8);
+ h->level = bitstream_read(&h->bc, 8);
+ bitstream_skip(&h->bc, 1); // progressive sequence
- width = get_bits(&s->gb, 14);
- height = get_bits(&s->gb, 14);
- if ((s->width || s->height) && (s->width != width || s->height != height)) {
- av_log_missing_feature(s, "Width/height changing in CAVS", 0);
+ width = bitstream_read(&h->bc, 14);
+ height = bitstream_read(&h->bc, 14);
+ if ((h->width || h->height) && (h->width != width || h->height != height)) {
+ avpriv_report_missing_feature(h->avctx,
+ "Width/height changing in CAVS");
return AVERROR_PATCHWELCOME;
}
- s->width = width;
- s->height = height;
-
- skip_bits(&s->gb, 2); //chroma format
- skip_bits(&s->gb, 3); //sample_precision
- h->aspect_ratio = get_bits(&s->gb, 4);
- frame_rate_code = get_bits(&s->gb, 4);
- skip_bits(&s->gb, 18); //bit_rate_lower
- skip_bits1(&s->gb); //marker_bit
- skip_bits(&s->gb, 12); //bit_rate_upper
- s->low_delay = get_bits1(&s->gb);
- h->mb_width = (s->width + 15) >> 4;
- h->mb_height = (s->height + 15) >> 4;
- h->s.avctx->time_base.den = ff_mpeg12_frame_rate_tab[frame_rate_code].num;
- h->s.avctx->time_base.num = ff_mpeg12_frame_rate_tab[frame_rate_code].den;
- h->s.avctx->width = s->width;
- h->s.avctx->height = s->height;
+ h->width = width;
+ h->height = height;
+
+ bitstream_skip(&h->bc, 2); // chroma format
+ bitstream_skip(&h->bc, 3); // sample_precision
+ h->aspect_ratio = bitstream_read(&h->bc, 4);
+ frame_rate_code = bitstream_read(&h->bc, 4);
+ bitstream_skip(&h->bc, 18); // bit_rate_lower
+ bitstream_skip(&h->bc, 1); // marker_bit
+ bitstream_skip(&h->bc, 12); // bit_rate_upper
+ h->low_delay = bitstream_read_bit(&h->bc);
+ h->mb_width = (h->width + 15) >> 4;
+ h->mb_height = (h->height + 15) >> 4;
+ h->avctx->framerate = ff_mpeg12_frame_rate_tab[frame_rate_code];
+ h->avctx->width = h->width;
+ h->avctx->height = h->height;
if (!h->top_qp)
ff_cavs_init_top_lines(h);
return 0;
AVPacket *avpkt)
{
AVSContext *h = avctx->priv_data;
- MpegEncContext *s = &h->s;
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
- AVFrame *picture = data;
uint32_t stc = -1;
- int input_size;
+ int input_size, ret;
const uint8_t *buf_end;
const uint8_t *buf_ptr;
- s->avctx = avctx;
-
if (buf_size == 0) {
- if (!s->low_delay && h->DPB[0].f.data[0]) {
+ if (!h->low_delay && h->DPB[0].f->data[0]) {
*got_frame = 1;
- *picture = h->DPB[0].f;
- memset(&h->DPB[0], 0, sizeof(h->DPB[0]));
+ av_frame_move_ref(data, h->DPB[0].f);
}
return 0;
}
buf_ptr = buf;
buf_end = buf + buf_size;
for(;;) {
- buf_ptr = avpriv_mpv_find_start_code(buf_ptr, buf_end, &stc);
+ buf_ptr = avpriv_find_start_code(buf_ptr, buf_end, &stc);
if ((stc & 0xFFFFFE00) || buf_ptr == buf_end)
- return FFMAX(0, buf_ptr - buf - s->parse_context.last_index);
+ return FFMAX(0, buf_ptr - buf);
input_size = (buf_end - buf_ptr) * 8;
switch (stc) {
case CAVS_START_CODE:
- init_get_bits(&s->gb, buf_ptr, input_size);
+ bitstream_init(&h->bc, buf_ptr, input_size);
decode_seq_header(h);
break;
case PIC_I_START_CODE:
if (!h->got_keyframe) {
- if(h->DPB[0].f.data[0])
- avctx->release_buffer(avctx, &h->DPB[0].f);
- if(h->DPB[1].f.data[0])
- avctx->release_buffer(avctx, &h->DPB[1].f);
+ av_frame_unref(h->DPB[0].f);
+ av_frame_unref(h->DPB[1].f);
h->got_keyframe = 1;
}
case PIC_PB_START_CODE:
*got_frame = 0;
if (!h->got_keyframe)
break;
- init_get_bits(&s->gb, buf_ptr, input_size);
+ bitstream_init(&h->bc, buf_ptr, input_size);
h->stc = stc;
if (decode_pic(h))
break;
*got_frame = 1;
- if (h->pic_type != AV_PICTURE_TYPE_B) {
- if (h->DPB[1].f.data[0]) {
- *picture = h->DPB[1].f;
+ if (h->cur.f->pict_type != AV_PICTURE_TYPE_B) {
+ if (h->DPB[1].f->data[0]) {
+ if ((ret = av_frame_ref(data, h->DPB[1].f)) < 0)
+ return ret;
} else {
*got_frame = 0;
}
- } else
- *picture = h->picture.f;
+ } else {
+ av_frame_move_ref(data, h->cur.f);
+ }
break;
case EXT_START_CODE:
//mpeg_decode_extension(avctx, buf_ptr, input_size);
break;
default:
if (stc <= SLICE_MAX_START_CODE) {
- init_get_bits(&s->gb, buf_ptr, input_size);
- decode_slice_header(h, &s->gb);
+ bitstream_init(&h->bc, buf_ptr, input_size);
+ decode_slice_header(h, &h->bc);
}
break;
}
AVCodec ff_cavs_decoder = {
.name = "cavs",
+ .long_name = NULL_IF_CONFIG_SMALL("Chinese AVS (Audio Video Standard) (AVS1-P2, JiZhun profile)"),
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_CAVS,
.priv_data_size = sizeof(AVSContext),
.init = ff_cavs_init,
.close = ff_cavs_end,
.decode = cavs_decode_frame,
- .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY,
+ .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY,
.flush = cavs_flush,
- .long_name = NULL_IF_CONFIG_SMALL("Chinese AVS (Audio Video Standard) (AVS1-P2, JiZhun profile)"),
};
projects / ffmpeg / blobdiff