diff options
Diffstat (limited to 'third_party/aom/av1/encoder/encodemb.h')
| -rw-r--r-- | third_party/aom/av1/encoder/encodemb.h | 55 |
1 files changed, 22 insertions, 33 deletions
diff --git a/third_party/aom/av1/encoder/encodemb.h b/third_party/aom/av1/encoder/encodemb.h index c817a94f0..673f87ea7 100644 --- a/third_party/aom/av1/encoder/encodemb.h +++ b/third_party/aom/av1/encoder/encodemb.h @@ -12,21 +12,23 @@ #ifndef AV1_ENCODER_ENCODEMB_H_ #define AV1_ENCODER_ENCODEMB_H_ -#include "./aom_config.h" +#include "config/aom_config.h" + #include "av1/common/onyxc_int.h" +#include "av1/common/txb_common.h" #include "av1/encoder/block.h" - +#include "av1/encoder/tokenize.h" #ifdef __cplusplus extern "C" { #endif struct optimize_ctx { - ENTROPY_CONTEXT ta[MAX_MB_PLANE][2 * MAX_MIB_SIZE]; - ENTROPY_CONTEXT tl[MAX_MB_PLANE][2 * MAX_MIB_SIZE]; + ENTROPY_CONTEXT ta[MAX_MB_PLANE][MAX_MIB_SIZE]; + ENTROPY_CONTEXT tl[MAX_MB_PLANE][MAX_MIB_SIZE]; }; struct encode_b_args { - AV1_COMMON *cm; + const struct AV1_COMP *cpi; MACROBLOCK *x; struct optimize_ctx *ctx; int8_t *skip; @@ -43,52 +45,39 @@ typedef enum AV1_XFORM_QUANT { AV1_XFORM_QUANT_TYPES, } AV1_XFORM_QUANT; -void av1_encode_sb(AV1_COMMON *cm, MACROBLOCK *x, BLOCK_SIZE bsize, int mi_row, - int mi_col); -#if CONFIG_SUPERTX -void av1_encode_sb_supertx(AV1_COMMON *cm, MACROBLOCK *x, BLOCK_SIZE bsize); -#endif // CONFIG_SUPERTX +void av1_encode_sb(const struct AV1_COMP *cpi, MACROBLOCK *x, BLOCK_SIZE bsize, + int mi_row, int mi_col, RUN_TYPE dry_run); void av1_encode_sby_pass1(AV1_COMMON *cm, MACROBLOCK *x, BLOCK_SIZE bsize); void av1_xform_quant(const AV1_COMMON *cm, MACROBLOCK *x, int plane, int block, int blk_row, int blk_col, BLOCK_SIZE plane_bsize, - TX_SIZE tx_size, int ctx, AV1_XFORM_QUANT xform_quant_idx); + TX_SIZE tx_size, TX_TYPE tx_type, + AV1_XFORM_QUANT xform_quant_idx); -int av1_optimize_b(const AV1_COMMON *cm, MACROBLOCK *mb, int plane, int blk_row, - int blk_col, int block, BLOCK_SIZE plane_bsize, - TX_SIZE tx_size, const ENTROPY_CONTEXT *a, - const ENTROPY_CONTEXT *l, int fast_mode); +int av1_optimize_b(const struct AV1_COMP *cpi, MACROBLOCK *mb, int plane, + int block, TX_SIZE tx_size, TX_TYPE tx_type, + const TXB_CTX *const txb_ctx, int fast_mode, int *rate_cost); void av1_subtract_txb(MACROBLOCK *x, int plane, BLOCK_SIZE plane_bsize, int blk_col, int blk_row, TX_SIZE tx_size); void av1_subtract_plane(MACROBLOCK *x, BLOCK_SIZE bsize, int plane); -#if !CONFIG_PVQ -void av1_set_txb_context(MACROBLOCK *x, int plane, int block, TX_SIZE tx_size, - ENTROPY_CONTEXT *a, ENTROPY_CONTEXT *l); -#endif +static INLINE void av1_set_txb_context(MACROBLOCK *x, int plane, int block, + TX_SIZE tx_size, ENTROPY_CONTEXT *a, + ENTROPY_CONTEXT *l) { + const uint8_t ctx = x->plane[plane].txb_entropy_ctx[block]; + memset(a, ctx, tx_size_wide_unit[tx_size] * sizeof(*a)); + memset(l, ctx, tx_size_high_unit[tx_size] * sizeof(*l)); +} void av1_encode_block_intra(int plane, int block, int blk_row, int blk_col, BLOCK_SIZE plane_bsize, TX_SIZE tx_size, void *arg); -void av1_encode_intra_block_plane(AV1_COMMON *cm, MACROBLOCK *x, +void av1_encode_intra_block_plane(const struct AV1_COMP *cpi, MACROBLOCK *x, BLOCK_SIZE bsize, int plane, int enable_optimize_b, int mi_row, int mi_col); -#if CONFIG_PVQ -PVQ_SKIP_TYPE av1_pvq_encode_helper(MACROBLOCK *x, tran_low_t *const coeff, - tran_low_t *ref_coeff, - tran_low_t *const dqcoeff, uint16_t *eob, - const int16_t *quant, int plane, - TX_SIZE tx_size, TX_TYPE tx_type, int *rate, - int speed, PVQ_INFO *pvq_info); - -void av1_store_pvq_enc_info(PVQ_INFO *pvq_info, int *qg, int *theta, int *k, - od_coeff *y, int nb_bands, const int *off, - int *size, int skip_rest, int skip_dir, int bs); -#endif - #ifdef __cplusplus } // extern "C" #endif |