X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fcavs.h;h=9afa96e42cbc8daca621f7cb13571afdaaaf5ccb;hb=e23e4de3aeaef701fbfa1cf6c9b4d76a01f015ff;hp=6610574536964fb0ede6feff4863f9cf3ae5d0f6;hpb=b8524fd13fd940d18abb63fd8b5770ea92e2c7fa;p=ffmpeg diff --git a/libavcodec/cavs.h b/libavcodec/cavs.h index 66105745369..9afa96e42cb 100644 --- a/libavcodec/cavs.h +++ b/libavcodec/cavs.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef CAVS_H -#define CAVS_H +#ifndef FFMPEG_CAVS_H +#define FFMPEG_CAVS_H #include "dsputil.h" #include "mpegvideo.h" @@ -144,13 +144,13 @@ DECLARE_ALIGNED_8(typedef, struct) { int16_t ref; } vector_t; -typedef struct residual_vlc_t { +typedef struct dec_2dvlc_t { int8_t rltab[59][3]; int8_t level_add[27]; int8_t golomb_order; int inc_limit; int8_t max_run; -} residual_vlc_t; +} dec_2dvlc_t; typedef struct { MpegEncContext s; @@ -224,57 +224,21 @@ typedef struct { DCTELEM *block; } AVSContext; +extern const uint8_t ff_cavs_dequant_shift[64]; +extern const uint16_t ff_cavs_dequant_mul[64]; +extern const dec_2dvlc_t ff_cavs_intra_dec[7]; +extern const dec_2dvlc_t ff_cavs_inter_dec[7]; +extern const dec_2dvlc_t ff_cavs_chroma_dec[5]; +extern const uint8_t ff_cavs_chroma_qp[64]; +extern const uint8_t ff_cavs_scan3x3[4]; +extern const uint8_t ff_cavs_partition_flags[30]; +extern const int_fast8_t ff_left_modifier_l[8]; +extern const int_fast8_t ff_top_modifier_l[8]; +extern const int_fast8_t ff_left_modifier_c[7]; +extern const int_fast8_t ff_top_modifier_c[7]; +extern const vector_t ff_cavs_intra_mv; extern const vector_t ff_cavs_un_mv; - -static inline void load_intra_pred_luma(AVSContext *h, uint8_t *top, - uint8_t **left, int block) { - int i; - - switch(block) { - case 0: - *left = h->left_border_y; - h->left_border_y[0] = h->left_border_y[1]; - memset(&h->left_border_y[17],h->left_border_y[16],9); - memcpy(&top[1],&h->top_border_y[h->mbx*16],16); - top[17] = top[16]; - top[0] = top[1]; - if((h->flags & A_AVAIL) && (h->flags & B_AVAIL)) - h->left_border_y[0] = top[0] = h->topleft_border_y; - break; - case 1: - *left = h->intern_border_y; - for(i=0;i<8;i++) - h->intern_border_y[i+1] = *(h->cy + 7 + i*h->l_stride); - memset(&h->intern_border_y[9],h->intern_border_y[8],9); - h->intern_border_y[0] = h->intern_border_y[1]; - memcpy(&top[1],&h->top_border_y[h->mbx*16+8],8); - if(h->flags & C_AVAIL) - memcpy(&top[9],&h->top_border_y[(h->mbx + 1)*16],8); - else - memset(&top[9],top[8],9); - top[17] = top[16]; - top[0] = top[1]; - if(h->flags & B_AVAIL) - h->intern_border_y[0] = top[0] = h->top_border_y[h->mbx*16+7]; - break; - case 2: - *left = &h->left_border_y[8]; - memcpy(&top[1],h->cy + 7*h->l_stride,16); - top[17] = top[16]; - top[0] = top[1]; - if(h->flags & A_AVAIL) - top[0] = h->left_border_y[8]; - break; - case 3: - *left = &h->intern_border_y[8]; - for(i=0;i<8;i++) - h->intern_border_y[i+9] = *(h->cy + 7 + (i+8)*h->l_stride); - memset(&h->intern_border_y[17],h->intern_border_y[16],9); - memcpy(&top[0],h->cy + 7 + 7*h->l_stride,9); - memset(&top[9],top[8],9); - break; - } -} +extern const vector_t ff_cavs_dir_mv; static inline void modify_pred(const int_fast8_t *mod_table, int *mode) { *mode = mod_table[*mode]; @@ -284,6 +248,11 @@ static inline void modify_pred(const int_fast8_t *mod_table, int *mode) { } } +static inline void set_intra_mode_default(AVSContext *h) { + h->pred_mode_Y[3] = h->pred_mode_Y[6] = INTRA_L_LP; + h->top_pred_Y[h->mbx*2+0] = h->top_pred_Y[h->mbx*2+1] = INTRA_L_LP; +} + static inline void set_mvs(vector_t *mv, enum block_t size) { switch(size) { case BLK_16X16: @@ -298,90 +267,48 @@ static inline void set_mvs(vector_t *mv, enum block_t size) { } } -/** - * initialise predictors for motion vectors and intra prediction - */ -static inline void init_mb(AVSContext *h) { - int i; - - /* copy predictors from top line (MB B and C) into cache */ - for(i=0;i<3;i++) { - h->mv[MV_FWD_B2+i] = h->top_mv[0][h->mbx*2+i]; - h->mv[MV_BWD_B2+i] = h->top_mv[1][h->mbx*2+i]; - } - h->pred_mode_Y[1] = h->top_pred_Y[h->mbx*2+0]; - h->pred_mode_Y[2] = h->top_pred_Y[h->mbx*2+1]; - /* clear top predictors if MB B is not available */ - if(!(h->flags & B_AVAIL)) { - h->mv[MV_FWD_B2] = ff_cavs_un_mv; - h->mv[MV_FWD_B3] = ff_cavs_un_mv; - h->mv[MV_BWD_B2] = ff_cavs_un_mv; - h->mv[MV_BWD_B3] = ff_cavs_un_mv; - h->pred_mode_Y[1] = h->pred_mode_Y[2] = NOT_AVAIL; - h->flags &= ~(C_AVAIL|D_AVAIL); - } else if(h->mbx) { - h->flags |= D_AVAIL; - } - if(h->mbx == h->mb_width-1) //MB C not available - h->flags &= ~C_AVAIL; - /* clear top-right predictors if MB C is not available */ - if(!(h->flags & C_AVAIL)) { - h->mv[MV_FWD_C2] = ff_cavs_un_mv; - h->mv[MV_BWD_C2] = ff_cavs_un_mv; - } - /* clear top-left predictors if MB D is not available */ - if(!(h->flags & D_AVAIL)) { - h->mv[MV_FWD_D3] = ff_cavs_un_mv; - h->mv[MV_BWD_D3] = ff_cavs_un_mv; - } - /* set pointer for co-located macroblock type */ - h->col_type = &h->col_type_base[h->mby*h->mb_width + h->mbx]; +static inline void set_mv_intra(AVSContext *h) { + h->mv[MV_FWD_X0] = ff_cavs_intra_mv; + 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 != FF_B_TYPE) + *h->col_type = I_8X8; } -static inline void check_for_slice(AVSContext *h); - -/** - * save predictors for later macroblocks and increase - * macroblock address - * @returns 0 if end of frame is reached, 1 otherwise - */ -static inline int next_mb(AVSContext *h) { - int i; - - h->flags |= A_AVAIL; - h->cy += 16; - h->cu += 8; - h->cv += 8; - /* copy mvs as predictors to the left */ - for(i=0;i<=20;i+=4) - h->mv[i] = h->mv[i+2]; - /* copy bottom mvs from cache to top line */ - h->top_mv[0][h->mbx*2+0] = h->mv[MV_FWD_X2]; - h->top_mv[0][h->mbx*2+1] = h->mv[MV_FWD_X3]; - h->top_mv[1][h->mbx*2+0] = h->mv[MV_BWD_X2]; - h->top_mv[1][h->mbx*2+1] = h->mv[MV_BWD_X3]; - /* next MB address */ - h->mbx++; - if(h->mbx == h->mb_width) { //new mb line - h->flags = B_AVAIL|C_AVAIL; - /* clear left pred_modes */ - h->pred_mode_Y[3] = h->pred_mode_Y[6] = NOT_AVAIL; - /* clear left mv predictors */ - for(i=0;i<=20;i+=4) - h->mv[i] = ff_cavs_un_mv; - h->mbx = 0; - h->mby++; - /* re-calculate sample pointers */ - h->cy = h->picture.data[0] + h->mby*16*h->l_stride; - h->cu = h->picture.data[1] + h->mby*8*h->c_stride; - h->cv = h->picture.data[2] + h->mby*8*h->c_stride; - if(h->mby == h->mb_height) { //frame end - return 0; - } else { - //check_for_slice(h); +static inline int dequant(AVSContext *h, DCTELEM *level_buf, uint8_t *run_buf, + DCTELEM *dst, int mul, int shift, int coeff_num) { + int round = 1 << (shift - 1); + int pos = -1; + const uint8_t *scantab = h->scantable.permutated; + + /* inverse scan and dequantization */ + while(--coeff_num >= 0){ + pos += run_buf[coeff_num]; + if(pos > 63) { + av_log(h->s.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; } + dst[scantab[pos]] = (level_buf[coeff_num]*mul + round) >> shift; } - return 1; + return 0; } -#endif /* CAVS_H */ +void ff_cavs_filter(AVSContext *h, enum mb_t mb_type); +void ff_cavs_load_intra_pred_luma(AVSContext *h, uint8_t *top, uint8_t **left, + int block); +void ff_cavs_load_intra_pred_chroma(AVSContext *h); +void ff_cavs_modify_mb_i(AVSContext *h, int *pred_mode_uv); +void ff_cavs_inter(AVSContext *h, enum mb_t mb_type); +void ff_cavs_mv(AVSContext *h, enum mv_loc_t nP, enum mv_loc_t nC, + enum mv_pred_t mode, enum block_t size, int ref); +void ff_cavs_init_mb(AVSContext *h); +int ff_cavs_next_mb(AVSContext *h); +void ff_cavs_init_pic(AVSContext *h); +void ff_cavs_init_top_lines(AVSContext *h); +int ff_cavs_init(AVCodecContext *avctx); +int ff_cavs_end (AVCodecContext *avctx); + +#endif /* FFMPEG_CAVS_H */