diff options
Diffstat (limited to 'vp9/encoder/vp9_encodemb.h')
| -rw-r--r-- | vp9/encoder/vp9_encodemb.h | 56 |
1 files changed, 46 insertions, 10 deletions
diff --git a/vp9/encoder/vp9_encodemb.h b/vp9/encoder/vp9_encodemb.h index f3c679227..242afbeae 100644 --- a/vp9/encoder/vp9_encodemb.h +++ b/vp9/encoder/vp9_encodemb.h @@ -13,6 +13,8 @@ #include "./vpx_config.h" #include "vp9/encoder/vp9_block.h" +#include "vp9/encoder/vp9_onyx_int.h" +#include "vp9/common/vp9_onyxc_int.h" typedef struct { MB_PREDICTION_MODE mode; @@ -21,32 +23,60 @@ typedef struct { } MODE_DEFINITION; -#include "vp9/encoder/vp9_onyx_int.h" struct VP9_ENCODER_RTCD; -void vp9_encode_inter16x16(MACROBLOCK *x); +void vp9_encode_inter16x16(VP9_COMMON *const cm, MACROBLOCK *x, + int mb_row, int mb_col); void vp9_transform_mbuv_4x4(MACROBLOCK *x); void vp9_transform_mby_4x4(MACROBLOCK *x); -void vp9_optimize_mby_4x4(MACROBLOCK *x); -void vp9_optimize_mbuv_4x4(MACROBLOCK *x); -void vp9_encode_inter16x16y(MACROBLOCK *x); +void vp9_optimize_mby_4x4(VP9_COMMON *const cm, MACROBLOCK *x); +void vp9_optimize_mbuv_4x4(VP9_COMMON *const cm, MACROBLOCK *x); +void vp9_encode_inter16x16y(MACROBLOCK *x, int mb_row, int mb_col); void vp9_transform_mb_8x8(MACROBLOCK *mb); void vp9_transform_mby_8x8(MACROBLOCK *x); void vp9_transform_mbuv_8x8(MACROBLOCK *x); -void vp9_build_dcblock_8x8(MACROBLOCK *b); -void vp9_optimize_mby_8x8(MACROBLOCK *x); -void vp9_optimize_mbuv_8x8(MACROBLOCK *x); +void vp9_optimize_mby_8x8(VP9_COMMON *const cm, MACROBLOCK *x); +void vp9_optimize_mbuv_8x8(VP9_COMMON *const cm, MACROBLOCK *x); void vp9_transform_mb_16x16(MACROBLOCK *mb); void vp9_transform_mby_16x16(MACROBLOCK *x); -void vp9_optimize_mby_16x16(MACROBLOCK *x); +void vp9_optimize_mby_16x16(VP9_COMMON *const cm, MACROBLOCK *x); void vp9_transform_sby_32x32(MACROBLOCK *x); +void vp9_optimize_sby_32x32(VP9_COMMON *const cm, MACROBLOCK *x); +void vp9_transform_sby_16x16(MACROBLOCK *x); +void vp9_optimize_sby_16x16(VP9_COMMON *const cm, MACROBLOCK *x); +void vp9_transform_sby_8x8(MACROBLOCK *x); +void vp9_optimize_sby_8x8(VP9_COMMON *const cm, MACROBLOCK *x); +void vp9_transform_sby_4x4(MACROBLOCK *x); +void vp9_optimize_sby_4x4(VP9_COMMON *const cm, MACROBLOCK *x); void vp9_transform_sbuv_16x16(MACROBLOCK *x); +void vp9_optimize_sbuv_16x16(VP9_COMMON *const cm, MACROBLOCK *x); +void vp9_transform_sbuv_8x8(MACROBLOCK *x); +void vp9_optimize_sbuv_8x8(VP9_COMMON *const cm, MACROBLOCK *x); +void vp9_transform_sbuv_4x4(MACROBLOCK *x); +void vp9_optimize_sbuv_4x4(VP9_COMMON *const cm, MACROBLOCK *x); + +void vp9_transform_sb64y_32x32(MACROBLOCK *x); +void vp9_optimize_sb64y_32x32(VP9_COMMON *const cm, MACROBLOCK *x); +void vp9_transform_sb64y_16x16(MACROBLOCK *x); +void vp9_optimize_sb64y_16x16(VP9_COMMON *const cm, MACROBLOCK *x); +void vp9_transform_sb64y_8x8(MACROBLOCK *x); +void vp9_optimize_sb64y_8x8(VP9_COMMON *const cm, MACROBLOCK *x); +void vp9_transform_sb64y_4x4(MACROBLOCK *x); +void vp9_optimize_sb64y_4x4(VP9_COMMON *const cm, MACROBLOCK *x); +void vp9_transform_sb64uv_32x32(MACROBLOCK *x); +void vp9_optimize_sb64uv_32x32(VP9_COMMON *const cm, MACROBLOCK *x); +void vp9_transform_sb64uv_16x16(MACROBLOCK *x); +void vp9_optimize_sb64uv_16x16(VP9_COMMON *const cm, MACROBLOCK *x); +void vp9_transform_sb64uv_8x8(MACROBLOCK *x); +void vp9_optimize_sb64uv_8x8(VP9_COMMON *const cm, MACROBLOCK *x); +void vp9_transform_sb64uv_4x4(MACROBLOCK *x); +void vp9_optimize_sb64uv_4x4(VP9_COMMON *const cm, MACROBLOCK *x); -void vp9_fidct_mb(MACROBLOCK *x); +void vp9_fidct_mb(VP9_COMMON *const cm, MACROBLOCK *x); void vp9_subtract_4b_c(BLOCK *be, BLOCKD *bd, int pitch); @@ -63,5 +93,11 @@ void vp9_subtract_sbuv_s_c(int16_t *diff, const uint8_t *usrc, const uint8_t *vsrc, int src_stride, const uint8_t *upred, const uint8_t *vpred, int dst_stride); +void vp9_subtract_sb64y_s_c(int16_t *diff, const uint8_t *src, int src_stride, + const uint8_t *pred, int dst_stride); +void vp9_subtract_sb64uv_s_c(int16_t *diff, const uint8_t *usrc, + const uint8_t *vsrc, int src_stride, + const uint8_t *upred, + const uint8_t *vpred, int dst_stride); #endif // VP9_ENCODER_VP9_ENCODEMB_H_ |