X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fcavsdec.c;h=fa12bc9992ac3052b8637a3b3ad17e1ad302ad64;hb=3fd3632ffeb18aeca6c0ab3fbe1034c3da75d983;hp=6f0b1cef2fd4f3d9b179a6fb2e25f0412fba59fb;hpb=e685e8eadae23d4f6790c03072f001d9c0e19833;p=ffmpeg diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c index 6f0b1cef2fd..fa12bc9992a 100644 --- a/libavcodec/cavsdec.c +++ b/libavcodec/cavsdec.c @@ -2,31 +2,31 @@ * Chinese AVS video (AVS1-P2, JiZhun profile) decoder. * Copyright (c) 2006 Stefan Gehrer * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav 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. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav 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 FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /** - * @file cavs.c + * @file * Chinese AVS video (AVS1-P2, JiZhun profile) decoder * @author Stefan Gehrer */ #include "avcodec.h" -#include "bitstream.h" +#include "get_bits.h" #include "golomb.h" #include "cavs.h" @@ -53,10 +53,10 @@ static const uint8_t cbp_tab[64][2] = { ****************************************************************************/ static inline void store_mvs(AVSContext *h) { - h->col_mv[(h->mby*h->mb_width + h->mbx)*4 + 0] = h->mv[MV_FWD_X0]; - h->col_mv[(h->mby*h->mb_width + h->mbx)*4 + 1] = h->mv[MV_FWD_X1]; - h->col_mv[(h->mby*h->mb_width + h->mbx)*4 + 2] = h->mv[MV_FWD_X2]; - h->col_mv[(h->mby*h->mb_width + h->mbx)*4 + 3] = h->mv[MV_FWD_X3]; + h->col_mv[h->mbidx*4 + 0] = h->mv[MV_FWD_X0]; + h->col_mv[h->mbidx*4 + 1] = h->mv[MV_FWD_X1]; + h->col_mv[h->mbidx*4 + 2] = h->mv[MV_FWD_X2]; + h->col_mv[h->mbidx*4 + 3] = h->mv[MV_FWD_X3]; } static inline void mv_pred_direct(AVSContext *h, cavs_vector *pmv_fw, @@ -77,7 +77,7 @@ static inline void mv_pred_direct(AVSContext *h, cavs_vector *pmv_fw, pmv_bw->y = m-(((den+(den*col_mv->y*pmv_bw->dist^m)-m-1)>>14)^m); } -static inline void mv_pred_sym(AVSContext *h, cavs_vector *src, enum block_t size) { +static inline void mv_pred_sym(AVSContext *h, cavs_vector *src, enum cavs_block size) { cavs_vector *dst = src + MV_BWD_OFFS; /* backward mv is the scaled and negated forward mv */ @@ -143,7 +143,8 @@ static int decode_residual_block(AVSContext *h, GetBitContext *gb, if(dequant(h,level_buf, run_buf, block, ff_cavs_dequant_mul[qp], ff_cavs_dequant_shift[qp], i)) return -1; - h->s.dsp.cavs_idct8_add(dst,block,stride); + h->cdsp.cavs_idct8_add(dst,block,stride); + h->s.dsp.clear_block(block); return 0; } @@ -252,7 +253,7 @@ static int decode_mb_i(AVSContext *h, int cbp_code) { return 0; } -static void decode_mb_p(AVSContext *h, enum mb_t mb_type) { +static void decode_mb_p(AVSContext *h, enum cavs_mb mb_type) { GetBitContext *gb = &h->s.gb; int ref[4]; @@ -293,12 +294,12 @@ static void decode_mb_p(AVSContext *h, enum mb_t mb_type) { if(mb_type != P_SKIP) decode_residual_inter(h); ff_cavs_filter(h,mb_type); - *h->col_type = mb_type; + h->col_type_base[h->mbidx] = mb_type; } -static void decode_mb_b(AVSContext *h, enum mb_t mb_type) { +static void decode_mb_b(AVSContext *h, enum cavs_mb mb_type) { int block; - enum sub_mb_t sub_type[4]; + enum cavs_sub_mb sub_type[4]; int flags; ff_cavs_init_mb(h); @@ -311,7 +312,7 @@ static void decode_mb_b(AVSContext *h, enum mb_t mb_type) { switch(mb_type) { case B_SKIP: case B_DIRECT: - if(!(*h->col_type)) { + if(!h->col_type_base[h->mbidx]) { /* intra MB at co-location, do in-plane prediction */ ff_cavs_mv(h, MV_FWD_X0, MV_FWD_C2, MV_PRED_BSKIP, BLK_16X16, 1); ff_cavs_mv(h, MV_BWD_X0, MV_BWD_C2, MV_PRED_BSKIP, BLK_16X16, 0); @@ -319,7 +320,7 @@ static void decode_mb_b(AVSContext *h, enum mb_t mb_type) { /* direct prediction from co-located P MB, block-wise */ for(block=0;block<4;block++) mv_pred_direct(h,&h->mv[mv_scan[block]], - &h->col_mv[(h->mby*h->mb_width+h->mbx)*4 + block]); + &h->col_mv[h->mbidx*4 + block]); break; case B_FWD_16X16: ff_cavs_mv(h, MV_FWD_X0, MV_FWD_C2, MV_PRED_MEDIAN, BLK_16X16, 1); @@ -337,7 +338,7 @@ static void decode_mb_b(AVSContext *h, enum mb_t mb_type) { for(block=0;block<4;block++) { switch(sub_type[block]) { case B_SUB_DIRECT: - if(!(*h->col_type)) { + 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); @@ -346,7 +347,7 @@ static void decode_mb_b(AVSContext *h, enum mb_t mb_type) { MV_PRED_BSKIP, BLK_8X8, 0); } else mv_pred_direct(h,&h->mv[mv_scan[block]], - &h->col_mv[(h->mby*h->mb_width + h->mbx)*4 + block]); + &h->col_mv[h->mbidx*4 + block]); break; case B_SUB_FWD: ff_cavs_mv(h, mv_scan[block], mv_scan[block]-3, @@ -414,6 +415,10 @@ static inline int decode_slice_header(AVSContext *h, GetBitContext *gb) { if(h->stc > 0xAF) av_log(h->s.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); @@ -427,15 +432,23 @@ static inline int decode_slice_header(AVSContext *h, GetBitContext *gb) { return 0; } -static inline void check_for_slice(AVSContext *h) { +static inline int check_for_slice(AVSContext *h) { GetBitContext *gb = &h->s.gb; int align; + + if(h->mbx) + return 0; align = (-get_bits_count(gb)) & 7; + /* check for stuffing byte */ + if(!align && (show_bits(gb,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); decode_slice_header(h,gb); + return 1; } + return 0; } /***************************************************************************** @@ -446,8 +459,8 @@ static inline void check_for_slice(AVSContext *h) { static int decode_pic(AVSContext *h) { MpegEncContext *s = &h->s; - int skip_count; - enum mb_t mb_type; + int skip_count = -1; + enum cavs_mb mb_type; if (!s->context_initialized) { s->avctx->idct_algo = FF_IDCT_CAVS; @@ -469,7 +482,16 @@ static int decode_pic(AVSContext *h) { } else { h->pic_type = FF_I_TYPE; if(get_bits1(&s->gb)) - skip_bits(&s->gb,16);//time_code + skip_bits(&s->gb,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)) + h->stream_revision = 1; + /* similarly test top_field_first and repeat_first_field */ + else if(show_bits(&s->gb,11) & 3) + h->stream_revision = 1; + if(h->stream_revision > 0) + skip_bits(&s->gb,1); //marker_bit } /* release last B frame */ if(h->picture.data[0]) @@ -498,9 +520,10 @@ static int decode_pic(AVSContext *h) { if(s->low_delay) get_ue_golomb(&s->gb); //bbv_check_times h->progressive = get_bits1(&s->gb); - if(h->progressive) - h->pic_structure = 1; - else if(!(h->pic_structure = get_bits1(&s->gb) && (h->stc == PIC_PB_START_CODE)) ) + h->pic_structure = 1; + if(!h->progressive) + h->pic_structure = get_bits1(&s->gb); + 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 @@ -523,52 +546,49 @@ static int decode_pic(AVSContext *h) { } else { h->alpha_offset = h->beta_offset = 0; } - check_for_slice(h); if(h->pic_type == FF_I_TYPE) { do { + check_for_slice(h); decode_mb_i(h, 0); } while(ff_cavs_next_mb(h)); } else if(h->pic_type == FF_P_TYPE) { do { - if(h->skip_mode_flag) { + if(check_for_slice(h)) + skip_count = -1; + if(h->skip_mode_flag && (skip_count < 0)) skip_count = get_ue_golomb(&s->gb); - while(skip_count--) { - decode_mb_p(h,P_SKIP); - if(!ff_cavs_next_mb(h)) - goto done; - } - mb_type = get_ue_golomb(&s->gb) + P_16X16; - } else - mb_type = get_ue_golomb(&s->gb) + P_SKIP; - if(mb_type > P_8X8) { - decode_mb_i(h, mb_type - P_8X8 - 1); - } else - decode_mb_p(h,mb_type); + 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; + if(mb_type > P_8X8) + decode_mb_i(h, mb_type - P_8X8 - 1); + else + decode_mb_p(h,mb_type); + } } while(ff_cavs_next_mb(h)); } else { /* FF_B_TYPE */ do { - if(h->skip_mode_flag) { + if(check_for_slice(h)) + skip_count = -1; + if(h->skip_mode_flag && (skip_count < 0)) skip_count = get_ue_golomb(&s->gb); - while(skip_count--) { - decode_mb_b(h,B_SKIP); - if(!ff_cavs_next_mb(h)) - goto done; - } - mb_type = get_ue_golomb(&s->gb) + B_DIRECT; - } else - mb_type = get_ue_golomb(&s->gb) + B_SKIP; - if(mb_type > B_8X8) { - decode_mb_i(h, mb_type - B_8X8 - 1); - } else - decode_mb_b(h,mb_type); + 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; + if(mb_type > B_8X8) + decode_mb_i(h, mb_type - B_8X8 - 1); + else + decode_mb_b(h,mb_type); + } } while(ff_cavs_next_mb(h)); } - done: if(h->pic_type != FF_B_TYPE) { if(h->DPB[1].data[0]) s->avctx->release_buffer(s->avctx, (AVFrame *)&h->DPB[1]); - memcpy(&h->DPB[1], &h->DPB[0], sizeof(Picture)); - memcpy(&h->DPB[0], &h->picture, sizeof(Picture)); + h->DPB[1] = h->DPB[0]; + h->DPB[0] = h->picture; memset(&h->picture,0,sizeof(Picture)); } return 0; @@ -614,7 +634,9 @@ static void cavs_flush(AVCodecContext * avctx) { } static int cavs_decode_frame(AVCodecContext * avctx,void *data, int *data_size, - const uint8_t * buf, int buf_size) { + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; AVSContext *h = avctx->priv_data; MpegEncContext *s = &h->s; int input_size; @@ -678,8 +700,7 @@ static int cavs_decode_frame(AVCodecContext * avctx,void *data, int *data_size, //mpeg_decode_user_data(avctx,buf_ptr, input_size); break; default: - if (stc >= SLICE_MIN_START_CODE && - stc <= SLICE_MAX_START_CODE) { + if (stc <= SLICE_MAX_START_CODE) { init_get_bits(&s->gb, buf_ptr, input_size); decode_slice_header(h, &s->gb); } @@ -688,9 +709,9 @@ static int cavs_decode_frame(AVCodecContext * avctx,void *data, int *data_size, } } -AVCodec cavs_decoder = { +AVCodec ff_cavs_decoder = { "cavs", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_CAVS, sizeof(AVSContext), ff_cavs_init,