diff options
| author | trav90 <travawine@palemoon.org> | 2018-10-18 21:53:44 -0500 |
|---|---|---|
| committer | trav90 <travawine@palemoon.org> | 2018-10-18 21:53:44 -0500 |
| commit | ec910d81405c736a4490383a250299a7837c2e64 (patch) | |
| tree | 4f27cc226f93a863121aef6c56313e4153a69b3e /third_party/aom/av1/encoder/rdopt.h | |
| parent | 01eb57073ba97b2d6cbf20f745dfcc508197adc3 (diff) | |
| download | UXP-ec910d81405c736a4490383a250299a7837c2e64.tar UXP-ec910d81405c736a4490383a250299a7837c2e64.tar.gz UXP-ec910d81405c736a4490383a250299a7837c2e64.tar.lz UXP-ec910d81405c736a4490383a250299a7837c2e64.tar.xz UXP-ec910d81405c736a4490383a250299a7837c2e64.zip | |
Update aom to commit id e87fb2378f01103d5d6e477a4ef6892dc714e614
Diffstat (limited to 'third_party/aom/av1/encoder/rdopt.h')
| -rw-r--r-- | third_party/aom/av1/encoder/rdopt.h | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/third_party/aom/av1/encoder/rdopt.h b/third_party/aom/av1/encoder/rdopt.h index 43a6a3794..dbc7527fb 100644 --- a/third_party/aom/av1/encoder/rdopt.h +++ b/third_party/aom/av1/encoder/rdopt.h @@ -57,7 +57,6 @@ typedef enum OUTPUT_STATUS { OUTPUT_HAS_DECODED_PIXELS } OUTPUT_STATUS; -#if CONFIG_PALETTE || CONFIG_INTRABC // Returns the number of colors in 'src'. int av1_count_colors(const uint8_t *src, int stride, int rows, int cols); #if CONFIG_HIGHBITDEPTH @@ -65,7 +64,6 @@ int av1_count_colors(const uint8_t *src, int stride, int rows, int cols); int av1_count_colors_highbd(const uint8_t *src8, int stride, int rows, int cols, int bit_depth); #endif // CONFIG_HIGHBITDEPTH -#endif // CONFIG_PALETTE || CONFIG_INTRABC void av1_dist_block(const AV1_COMP *cpi, MACROBLOCK *x, int plane, BLOCK_SIZE plane_bsize, int block, int blk_row, int blk_col, @@ -73,7 +71,7 @@ void av1_dist_block(const AV1_COMP *cpi, MACROBLOCK *x, int plane, OUTPUT_STATUS output_status); #if CONFIG_DIST_8X8 -int64_t av1_dist_8x8(const AV1_COMP *const cpi, const MACROBLOCKD *xd, +int64_t av1_dist_8x8(const AV1_COMP *const cpi, const MACROBLOCK *x, const uint8_t *src, int src_stride, const uint8_t *dst, int dst_stride, const BLOCK_SIZE tx_bsize, int bsw, int bsh, int visible_w, int visible_h, int qindex); @@ -142,8 +140,21 @@ void av1_txfm_rd_in_plane_supertx(MACROBLOCK *x, const AV1_COMP *cpi, int *rate, } // extern "C" #endif -int av1_tx_type_cost(const AV1_COMP *cpi, const MACROBLOCKD *xd, - BLOCK_SIZE bsize, int plane, TX_SIZE tx_size, - TX_TYPE tx_type); +int av1_tx_type_cost(const AV1_COMMON *cm, const MACROBLOCK *x, + const MACROBLOCKD *xd, BLOCK_SIZE bsize, int plane, + TX_SIZE tx_size, TX_TYPE tx_type); + +int64_t get_prediction_rd_cost(const struct AV1_COMP *cpi, struct macroblock *x, + int mi_row, int mi_col, int *skip_blk, + MB_MODE_INFO *backup_mbmi); + +#if CONFIG_NCOBMC_ADAPT_WEIGHT +void av1_check_ncobmc_adapt_weight_rd(const struct AV1_COMP *cpi, + struct macroblock *x, int mi_row, + int mi_col); +int get_ncobmc_mode(const AV1_COMP *const cpi, MACROBLOCK *const x, + MACROBLOCKD *xd, int mi_row, int mi_col, int bsize); + +#endif #endif // AV1_ENCODER_RDOPT_H_ |