diff options
Diffstat (limited to 'libavcodec/cavsdec.c')
| -rw-r--r-- | libavcodec/cavsdec.c | 375 |
1 files changed, 234 insertions, 141 deletions
diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c index 7f584ac1c0..5f3b354518 100644 --- a/libavcodec/cavsdec.c +++ b/libavcodec/cavsdec.c @@ -2,20 +2,20 @@ * Chinese AVS video (AVS1-P2, JiZhun profile) decoder. * Copyright (c) 2006 Stefan Gehrer <stefan.gehrer@gmx.de> * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -25,10 +25,11 @@ * @author Stefan Gehrer <stefan.gehrer@gmx.de> */ +#include "libavutil/avassert.h" #include "avcodec.h" -#include "bitstream.h" -#include "cavs.h" +#include "get_bits.h" #include "golomb.h" +#include "cavs.h" #include "internal.h" #include "mpeg12data.h" @@ -50,13 +51,6 @@ static const uint8_t cbp_tab[64][2] = { static const uint8_t scan3x3[4] = { 4, 5, 7, 8 }; -static const uint8_t cavs_chroma_qp[64] = { - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, - 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 42, 43, 43, 44, 44, - 45, 45, 46, 46, 47, 47, 48, 48, 48, 49, 49, 49, 50, 50, 50, 51 -}; - static const uint8_t dequant_shift[64] = { 14, 14, 14, 14, 14, 14, 14, 14, 13, 13, 13, 13, 13, 13, 13, 13, @@ -471,7 +465,7 @@ static inline void mv_pred_direct(AVSContext *h, cavs_vector *pmv_fw, cavs_vector *col_mv) { cavs_vector *pmv_bw = pmv_fw + MV_BWD_OFFS; - int den = h->direct_den[col_mv->ref]; + unsigned den = h->direct_den[col_mv->ref]; int m = FF_SIGNBIT(col_mv->x); pmv_fw->dist = h->dist[1]; @@ -506,13 +500,17 @@ static inline void mv_pred_sym(AVSContext *h, cavs_vector *src, ****************************************************************************/ /** kth-order exponential golomb code */ -static inline int get_ue_code(BitstreamContext *bc, int order) +static inline int get_ue_code(GetBitContext *gb, int order) { + unsigned ret = get_ue_golomb(gb); + if (ret >= ((1U<<31)>>order)) { + av_log(NULL, AV_LOG_ERROR, "get_ue_code: value too larger\n"); + return AVERROR_INVALIDDATA; + } if (order) { - int ret = get_ue_golomb(bc) << order; - return ret + bitstream_read(bc, order); + return (ret<<order) + get_bits(gb, order); } - return get_ue_golomb(bc); + return ret; } static inline int dequant(AVSContext *h, int16_t *level_buf, uint8_t *run_buf, @@ -545,33 +543,41 @@ static inline int dequant(AVSContext *h, int16_t *level_buf, uint8_t *run_buf, * @param dst location of sample block * @param stride line stride in frame buffer */ -static int decode_residual_block(AVSContext *h, BitstreamContext *bc, +static int decode_residual_block(AVSContext *h, GetBitContext *gb, const struct dec_2dvlc *r, int esc_golomb_order, int qp, uint8_t *dst, ptrdiff_t stride) { - int i, level_code, esc_code, level, run, mask, ret; + int i, esc_code, level, mask, ret; + unsigned int level_code, run; int16_t level_buf[65]; uint8_t run_buf[65]; int16_t *block = h->block; - for (i = 0;i < 65; i++) { - level_code = get_ue_code(bc, r->golomb_order); + for (i = 0; i < 65; i++) { + level_code = get_ue_code(gb, r->golomb_order); if (level_code >= ESCAPE_CODE) { run = ((level_code - ESCAPE_CODE) >> 1) + 1; - esc_code = get_ue_code(bc, esc_golomb_order); + if(run > 64) { + av_log(h->avctx, AV_LOG_ERROR, "run %d is too large\n", run); + return AVERROR_INVALIDDATA; + } + esc_code = get_ue_code(gb, esc_golomb_order); + if (esc_code < 0 || esc_code > 32767) { + av_log(h->avctx, AV_LOG_ERROR, "esc_code invalid\n"); + return AVERROR_INVALIDDATA; + } + level = esc_code + (run > r->max_run ? 1 : r->level_add[run]); while (level > r->inc_limit) r++; mask = -(level_code & 1); level = (level ^ mask) - mask; - } else if (level_code >= 0) { + } else { level = r->rltab[level_code][0]; if (!level) //end of block signal break; run = r->rltab[level_code][1]; r += r->rltab[level_code][2]; - } else { - break; } level_buf[i] = level; run_buf[i] = run; @@ -585,14 +591,21 @@ static int decode_residual_block(AVSContext *h, BitstreamContext *bc, } -static inline void decode_residual_chroma(AVSContext *h) +static inline int decode_residual_chroma(AVSContext *h) { - if (h->cbp & (1 << 4)) - 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->bc, chroma_dec, 0, - cavs_chroma_qp[h->qp], h->cv, h->c_stride); + if (h->cbp & (1 << 4)) { + int ret = decode_residual_block(h, &h->gb, chroma_dec, 0, + ff_cavs_chroma_qp[h->qp], h->cu, h->c_stride); + if (ret < 0) + return ret; + } + if (h->cbp & (1 << 5)) { + int ret = decode_residual_block(h, &h->gb, chroma_dec, 0, + ff_cavs_chroma_qp[h->qp], h->cv, h->c_stride); + if (ret < 0) + return ret; + } + return 0; } static inline int decode_residual_inter(AVSContext *h) @@ -600,8 +613,8 @@ static inline int decode_residual_inter(AVSContext *h) int block; /* get coded block pattern */ - int cbp = get_ue_golomb(&h->bc); - if (cbp > 63 || cbp < 0) { + int cbp = get_ue_golomb(&h->gb); + if (cbp > 63U) { av_log(h->avctx, AV_LOG_ERROR, "illegal inter cbp %d\n", cbp); return AVERROR_INVALIDDATA; } @@ -609,10 +622,10 @@ static inline int decode_residual_inter(AVSContext *h) /* get quantizer */ if (h->cbp && !h->qp_fixed) - h->qp = (h->qp + get_se_golomb(&h->bc)) & 63; + h->qp = (h->qp + (unsigned)get_se_golomb(&h->gb)) & 63; for (block = 0; block < 4; block++) if (h->cbp & (1 << block)) - decode_residual_block(h, &h->bc, inter_dec, 0, h->qp, + decode_residual_block(h, &h->gb, inter_dec, 0, h->qp, h->cy + h->luma_scan[block], h->l_stride); decode_residual_chroma(h); @@ -637,12 +650,13 @@ static inline void set_mv_intra(AVSContext *h) static int decode_mb_i(AVSContext *h, int cbp_code) { - BitstreamContext *bc = &h->bc; + GetBitContext *gb = &h->gb; unsigned pred_mode_uv; int block; uint8_t top[18]; uint8_t *left = NULL; uint8_t *d; + int ret; ff_cavs_init_mb(h); @@ -656,13 +670,13 @@ static int decode_mb_i(AVSContext *h, int cbp_code) predpred = FFMIN(nA, nB); if (predpred == NOT_AVAIL) // if either is not available predpred = INTRA_L_LP; - if (!bitstream_read_bit(bc)) { - int rem_mode = bitstream_read(bc, 2); + if (!get_bits1(gb)) { + int rem_mode = get_bits(gb, 2); predpred = rem_mode + (rem_mode >= predpred); } h->pred_mode_Y[pos] = predpred; } - pred_mode_uv = get_ue_golomb(bc); + pred_mode_uv = get_ue_golomb(gb); if (pred_mode_uv > 6) { av_log(h->avctx, AV_LOG_ERROR, "illegal intra chroma pred mode\n"); return AVERROR_INVALIDDATA; @@ -671,14 +685,14 @@ static int decode_mb_i(AVSContext *h, int cbp_code) /* get coded block pattern */ if (h->cur.f->pict_type == AV_PICTURE_TYPE_I) - cbp_code = get_ue_golomb(bc); - if (cbp_code > 63 || cbp_code < 0) { + cbp_code = get_ue_golomb(gb); + if (cbp_code > 63U) { 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(bc)) & 63; // qp_delta + h->qp = (h->qp + (unsigned)get_se_golomb(gb)) & 63; //qp_delta /* luma intra prediction interleaved with residual decode/transform/add */ for (block = 0; block < 4; block++) { @@ -686,8 +700,11 @@ static int decode_mb_i(AVSContext *h, int cbp_code) ff_cavs_load_intra_pred_luma(h, top, &left, 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, bc, intra_dec, 1, h->qp, d, h->l_stride); + if (h->cbp & (1<<block)) { + ret = decode_residual_block(h, gb, intra_dec, 1, h->qp, d, h->l_stride); + if (ret < 0) + return ret; + } } /* chroma intra prediction */ @@ -697,7 +714,9 @@ static int decode_mb_i(AVSContext *h, int cbp_code) h->intra_pred_c[pred_mode_uv](h->cv, &h->top_border_v[h->mbx * 10], h->left_border_v, h->c_stride); - decode_residual_chroma(h); + ret = decode_residual_chroma(h); + if (ret < 0) + return ret; ff_cavs_filter(h, I_8X8); set_mv_intra(h); return 0; @@ -716,7 +735,7 @@ static inline void set_intra_mode_default(AVSContext *h) static void decode_mb_p(AVSContext *h, enum cavs_mb mb_type) { - BitstreamContext *bc = &h->bc; + GetBitContext *gb = &h->gb; int ref[4]; ff_cavs_init_mb(h); @@ -725,26 +744,26 @@ static void decode_mb_p(AVSContext *h, enum cavs_mb mb_type) 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 : bitstream_read_bit(bc); + ref[0] = h->ref_flag ? 0 : get_bits1(gb); 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 : bitstream_read_bit(bc); - ref[2] = h->ref_flag ? 0 : bitstream_read_bit(bc); + ref[0] = h->ref_flag ? 0 : get_bits1(gb); + ref[2] = h->ref_flag ? 0 : get_bits1(gb); 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 : bitstream_read_bit(bc); - ref[1] = h->ref_flag ? 0 : bitstream_read_bit(bc); + ref[0] = h->ref_flag ? 0 : get_bits1(gb); + ref[1] = h->ref_flag ? 0 : get_bits1(gb); 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 : 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); + 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); 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]); @@ -759,7 +778,7 @@ static void decode_mb_p(AVSContext *h, enum cavs_mb mb_type) h->col_type_base[h->mbidx] = mb_type; } -static void decode_mb_b(AVSContext *h, enum cavs_mb mb_type) +static int decode_mb_b(AVSContext *h, enum cavs_mb mb_type) { int block; enum cavs_sub_mb sub_type[4]; @@ -796,18 +815,39 @@ static void decode_mb_b(AVSContext *h, enum cavs_mb mb_type) ff_cavs_mv(h, MV_BWD_X0, MV_BWD_C2, MV_PRED_MEDIAN, BLK_16X16, 0); break; case B_8X8: +#define TMP_UNUSED_INX 7 + flags = 0; for (block = 0; block < 4; block++) - sub_type[block] = bitstream_read(&h->bc, 2); + sub_type[block] = get_bits(&h->gb, 2); for (block = 0; block < 4; block++) { switch (sub_type[block]) { case B_SUB_DIRECT: if (!h->col_type_base[h->mbidx]) { /* intra MB at co-location, do in-plane prediction */ - ff_cavs_mv(h, mv_scan[block], mv_scan[block] - 3, - MV_PRED_BSKIP, BLK_8X8, 1); - ff_cavs_mv(h, mv_scan[block] + MV_BWD_OFFS, - mv_scan[block] - 3 + MV_BWD_OFFS, - MV_PRED_BSKIP, BLK_8X8, 0); + if(flags==0) { + // if col-MB is a Intra MB, current Block size is 16x16. + // AVS standard section 9.9.1 + if(block>0){ + h->mv[TMP_UNUSED_INX ] = h->mv[MV_FWD_X0 ]; + h->mv[TMP_UNUSED_INX + MV_BWD_OFFS] = h->mv[MV_FWD_X0 + MV_BWD_OFFS]; + } + ff_cavs_mv(h, MV_FWD_X0, MV_FWD_C2, + MV_PRED_BSKIP, BLK_8X8, 1); + ff_cavs_mv(h, MV_FWD_X0+MV_BWD_OFFS, + MV_FWD_C2+MV_BWD_OFFS, + MV_PRED_BSKIP, BLK_8X8, 0); + if(block>0) { + flags = mv_scan[block]; + h->mv[flags ] = h->mv[MV_FWD_X0 ]; + h->mv[flags + MV_BWD_OFFS] = h->mv[MV_FWD_X0 + MV_BWD_OFFS]; + h->mv[MV_FWD_X0 ] = h->mv[TMP_UNUSED_INX ]; + h->mv[MV_FWD_X0 + MV_BWD_OFFS] = h->mv[TMP_UNUSED_INX + MV_BWD_OFFS]; + } else + flags = MV_FWD_X0; + } else { + h->mv[mv_scan[block] ] = h->mv[flags ]; + h->mv[mv_scan[block] + MV_BWD_OFFS] = h->mv[flags + MV_BWD_OFFS]; + } } else mv_pred_direct(h, &h->mv[mv_scan[block]], &h->col_mv[h->mbidx * 4 + block]); @@ -823,6 +863,7 @@ static void decode_mb_b(AVSContext *h, enum cavs_mb mb_type) break; } } +#undef TMP_UNUSED_INX for (block = 0; block < 4; block++) { if (sub_type[block] == B_SUB_BWD) ff_cavs_mv(h, mv_scan[block] + MV_BWD_OFFS, @@ -831,7 +872,11 @@ static void decode_mb_b(AVSContext *h, enum cavs_mb mb_type) } break; default: - assert((mb_type > B_SYM_16X16) && (mb_type < B_8X8)); + if (mb_type <= B_SYM_16X16) { + av_log(h->avctx, AV_LOG_ERROR, "Invalid mb_type %d in B frame\n", mb_type); + return AVERROR_INVALIDDATA; + } + av_assert2(mb_type < B_8X8); flags = ff_cavs_partition_flags[mb_type]; if (mb_type & 1) { /* 16x8 macroblock types */ if (flags & FWD0) @@ -866,6 +911,8 @@ static void decode_mb_b(AVSContext *h, enum cavs_mb mb_type) if (mb_type != B_SKIP) decode_residual_inter(h); ff_cavs_filter(h, mb_type); + + return 0; } /***************************************************************************** @@ -874,23 +921,29 @@ static void decode_mb_b(AVSContext *h, enum cavs_mb mb_type) * ****************************************************************************/ -static inline int decode_slice_header(AVSContext *h, BitstreamContext *bc) +static inline int decode_slice_header(AVSContext *h, GetBitContext *gb) { if (h->stc > 0xAF) av_log(h->avctx, AV_LOG_ERROR, "unexpected start code 0x%02x\n", h->stc); + + if (h->stc >= h->mb_height) { + av_log(h->avctx, AV_LOG_ERROR, "stc 0x%02x is too large\n", h->stc); + return AVERROR_INVALIDDATA; + } + 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 = bitstream_read_bit(bc); - h->qp = bitstream_read(bc, 6); + if (!h->pic_qp_fixed) { + h->qp_fixed = get_bits1(gb); + h->qp = get_bits(gb, 6); } /* inter frame or second slice can have weighting params */ if ((h->cur.f->pict_type != AV_PICTURE_TYPE_I) || (!h->pic_structure && h->mby >= h->mb_width / 2)) - if (bitstream_read_bit(bc)) { // slice_weighting_flag + if (get_bits1(gb)) { //slice_weighting_flag av_log(h->avctx, AV_LOG_ERROR, "weighted prediction not yet supported\n"); } @@ -899,21 +952,21 @@ static inline int decode_slice_header(AVSContext *h, BitstreamContext *bc) static inline int check_for_slice(AVSContext *h) { - BitstreamContext *bc = &h->bc; + GetBitContext *gb = &h->gb; int align; if (h->mbx) return 0; - align = (-bitstream_tell(bc)) & 7; + align = (-get_bits_count(gb)) & 7; /* check for stuffing byte */ - if (!align && (bitstream_peek(bc, 8) == 0x80)) + if (!align && (show_bits(gb, 8) == 0x80)) align = 8; - if ((bitstream_peek(bc, 24 + align) & 0xFFFFFF) == 0x000001) { - bitstream_skip(bc, 24 + align); - h->stc = bitstream_read(bc, 8); + if ((show_bits_long(gb, 24 + align) & 0xFFFFFF) == 0x000001) { + skip_bits_long(gb, 24 + align); + h->stc = get_bits(gb, 8); if (h->stc >= h->mb_height) return 0; - decode_slice_header(h, bc); + decode_slice_header(h, gb); return 1; } return 0; @@ -938,9 +991,9 @@ static int decode_pic(AVSContext *h) av_frame_unref(h->cur.f); - bitstream_skip(&h->bc, 16); // bbv_dwlay + skip_bits(&h->gb, 16);//bbv_dwlay if (h->stc == PIC_PB_START_CODE) { - h->cur.f->pict_type = bitstream_read(&h->bc, 2) + AV_PICTURE_TYPE_I; + h->cur.f->pict_type = get_bits(&h->gb, 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; @@ -951,17 +1004,17 @@ static int decode_pic(AVSContext *h) return AVERROR_INVALIDDATA; } else { h->cur.f->pict_type = AV_PICTURE_TYPE_I; - if (bitstream_read_bit(&h->bc)) - bitstream_skip(&h->bc, 24); // time_code + if (get_bits1(&h->gb)) + skip_bits(&h->gb, 24);//time_code /* old sample clips were all progressive and no low_delay, bump stream revision if detected otherwise */ - if (h->low_delay || !(bitstream_peek(&h->bc, 9) & 1)) + if (h->low_delay || !(show_bits(&h->gb, 9) & 1)) h->stream_revision = 1; /* similarly test top_field_first and repeat_first_field */ - else if (bitstream_peek(&h->bc, 11) & 3) + else if (show_bits(&h->gb, 11) & 3) h->stream_revision = 1; if (h->stream_revision > 0) - bitstream_skip(&h->bc, 1); // marker_bit + skip_bits(&h->gb, 1); //marker_bit } ret = ff_get_buffer(h->avctx, h->cur.f, h->cur.f->pict_type == AV_PICTURE_TYPE_B ? @@ -976,98 +1029,118 @@ static int decode_pic(AVSContext *h) return AVERROR(ENOMEM); } - ff_cavs_init_pic(h); - h->cur.poc = bitstream_read(&h->bc, 8) * 2; + if ((ret = ff_cavs_init_pic(h)) < 0) + return ret; + h->cur.poc = get_bits(&h->gb, 8) * 2; /* get temporal distances and MV scaling factors */ if (h->cur.f->pict_type != AV_PICTURE_TYPE_B) { - h->dist[0] = (h->cur.poc - h->DPB[0].poc + 512) % 512; + h->dist[0] = (h->cur.poc - h->DPB[0].poc) & 511; } else { - h->dist[0] = (h->DPB[0].poc - h->cur.poc + 512) % 512; + h->dist[0] = (h->DPB[0].poc - h->cur.poc) & 511; } - h->dist[1] = (h->cur.poc - h->DPB[1].poc + 512) % 512; + h->dist[1] = (h->cur.poc - h->DPB[1].poc) & 511; 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->cur.f->pict_type == AV_PICTURE_TYPE_B) { h->sym_factor = h->dist[0] * h->scale_den[1]; + if (FFABS(h->sym_factor) > 32768) { + av_log(h->avctx, AV_LOG_ERROR, "sym_factor %d too large\n", h->sym_factor); + return AVERROR_INVALIDDATA; + } } 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 (h->low_delay) - get_ue_golomb(&h->bc); // bbv_check_times - h->progressive = bitstream_read_bit(&h->bc); + get_ue_golomb(&h->gb); //bbv_check_times + h->progressive = get_bits1(&h->gb); h->pic_structure = 1; if (!h->progressive) - h->pic_structure = bitstream_read_bit(&h->bc); + h->pic_structure = get_bits1(&h->gb); if (!h->pic_structure && h->stc == PIC_PB_START_CODE) - 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); + skip_bits1(&h->gb); //advanced_pred_mode_disable + skip_bits1(&h->gb); //top_field_first + skip_bits1(&h->gb); //repeat_first_field + h->pic_qp_fixed = + h->qp_fixed = get_bits1(&h->gb); + h->qp = get_bits(&h->gb, 6); if (h->cur.f->pict_type == AV_PICTURE_TYPE_I) { if (!h->progressive && !h->pic_structure) - bitstream_skip(&h->bc, 1); // what is this? - bitstream_skip(&h->bc, 4); // reserved bits + skip_bits1(&h->gb);//what is this? + skip_bits(&h->gb, 4); //reserved bits } else { 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->ref_flag = get_bits1(&h->gb); + skip_bits(&h->gb, 4); //reserved bits + h->skip_mode_flag = get_bits1(&h->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); + h->loop_filter_disable = get_bits1(&h->gb); + if (!h->loop_filter_disable && get_bits1(&h->gb)) { + h->alpha_offset = get_se_golomb(&h->gb); + h->beta_offset = get_se_golomb(&h->gb); + if ( h->alpha_offset < -64 || h->alpha_offset > 64 + || h-> beta_offset < -64 || h-> beta_offset > 64) { + h->alpha_offset = h->beta_offset = 0; + return AVERROR_INVALIDDATA; + } } else { h->alpha_offset = h->beta_offset = 0; } + + ret = 0; if (h->cur.f->pict_type == AV_PICTURE_TYPE_I) { do { check_for_slice(h); - decode_mb_i(h, 0); + ret = decode_mb_i(h, 0); + if (ret < 0) + break; } while (ff_cavs_next_mb(h)); } 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(&h->bc); + skip_count = get_ue_golomb(&h->gb); if (h->skip_mode_flag && skip_count--) { decode_mb_p(h, P_SKIP); } else { - mb_type = get_ue_golomb(&h->bc) + P_SKIP + h->skip_mode_flag; + mb_type = get_ue_golomb(&h->gb) + P_SKIP + h->skip_mode_flag; if (mb_type > P_8X8) - decode_mb_i(h, mb_type - P_8X8 - 1); + ret = decode_mb_i(h, mb_type - P_8X8 - 1); else decode_mb_p(h, mb_type); } + if (ret < 0) + break; } while (ff_cavs_next_mb(h)); } else { /* AV_PICTURE_TYPE_B */ do { if (check_for_slice(h)) skip_count = -1; if (h->skip_mode_flag && (skip_count < 0)) - skip_count = get_ue_golomb(&h->bc); + skip_count = get_ue_golomb(&h->gb); if (h->skip_mode_flag && skip_count--) { - decode_mb_b(h, B_SKIP); + ret = decode_mb_b(h, B_SKIP); } else { - mb_type = get_ue_golomb(&h->bc) + B_SKIP + h->skip_mode_flag; + mb_type = get_ue_golomb(&h->gb) + B_SKIP + h->skip_mode_flag; if (mb_type > B_8X8) - decode_mb_i(h, mb_type - B_8X8 - 1); + ret = decode_mb_i(h, mb_type - B_8X8 - 1); else - decode_mb_b(h, mb_type); + ret = decode_mb_b(h, mb_type); } + if (ret < 0) + break; } while (ff_cavs_next_mb(h)); } - if (h->cur.f->pict_type != AV_PICTURE_TYPE_B) { + emms_c(); + if (ret >= 0 && 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; + return ret; } /***************************************************************************** @@ -1080,36 +1153,49 @@ static int decode_seq_header(AVSContext *h) { int frame_rate_code; int width, height; + int ret; - h->profile = bitstream_read(&h->bc, 8); - h->level = bitstream_read(&h->bc, 8); - bitstream_skip(&h->bc, 1); // progressive sequence + h->profile = get_bits(&h->gb, 8); + h->level = get_bits(&h->gb, 8); + skip_bits1(&h->gb); //progressive sequence - width = bitstream_read(&h->bc, 14); - height = bitstream_read(&h->bc, 14); + width = get_bits(&h->gb, 14); + height = get_bits(&h->gb, 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; } + if (width <= 0 || height <= 0) { + av_log(h->avctx, AV_LOG_ERROR, "Dimensions invalid\n"); + return AVERROR_INVALIDDATA; + } + skip_bits(&h->gb, 2); //chroma format + skip_bits(&h->gb, 3); //sample_precision + h->aspect_ratio = get_bits(&h->gb, 4); + frame_rate_code = get_bits(&h->gb, 4); + if (frame_rate_code == 0 || frame_rate_code > 13) { + av_log(h->avctx, AV_LOG_WARNING, + "frame_rate_code %d is invalid\n", frame_rate_code); + frame_rate_code = 1; + } + + skip_bits(&h->gb, 18); //bit_rate_lower + skip_bits1(&h->gb); //marker_bit + skip_bits(&h->gb, 12); //bit_rate_upper + h->low_delay = get_bits1(&h->gb); + + ret = ff_set_dimensions(h->avctx, width, height); + if (ret < 0) + return ret; + 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 ff_cavs_init_top_lines(h); return 0; } @@ -1138,16 +1224,21 @@ static int cavs_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, return 0; } + h->stc = 0; + buf_ptr = buf; buf_end = buf + buf_size; for(;;) { buf_ptr = avpriv_find_start_code(buf_ptr, buf_end, &stc); - if ((stc & 0xFFFFFE00) || buf_ptr == buf_end) + if ((stc & 0xFFFFFE00) || buf_ptr == buf_end) { + if (!h->stc) + av_log(h->avctx, AV_LOG_WARNING, "no frame decoded\n"); return FFMAX(0, buf_ptr - buf); + } input_size = (buf_end - buf_ptr) * 8; switch (stc) { case CAVS_START_CODE: - bitstream_init(&h->bc, buf_ptr, input_size); + init_get_bits(&h->gb, buf_ptr, input_size); decode_seq_header(h); break; case PIC_I_START_CODE: @@ -1157,17 +1248,19 @@ static int cavs_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, h->got_keyframe = 1; } case PIC_PB_START_CODE: + if (*got_frame) + av_frame_unref(data); *got_frame = 0; if (!h->got_keyframe) break; - bitstream_init(&h->bc, buf_ptr, input_size); + init_get_bits(&h->gb, buf_ptr, input_size); h->stc = stc; if (decode_pic(h)) break; *got_frame = 1; 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) + if (h->DPB[!h->low_delay].f->data[0]) { + if ((ret = av_frame_ref(data, h->DPB[!h->low_delay].f)) < 0) return ret; } else { *got_frame = 0; @@ -1184,8 +1277,8 @@ static int cavs_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, break; default: if (stc <= SLICE_MAX_START_CODE) { - bitstream_init(&h->bc, buf_ptr, input_size); - decode_slice_header(h, &h->bc); + init_get_bits(&h->gb, buf_ptr, input_size); + decode_slice_header(h, &h->gb); } break; } |