diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-10-24 17:58:31 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-10-24 17:58:31 +0000 |
| commit | 6b8ab5a46e74662b6c7c9af1f871b5bdbc826e54 (patch) | |
| tree | 6176b3ed50ad09965b19d46a8b1183872728aa59 /source/libvpx/vp9/encoder/vp9_rdopt.h | |
| parent | e1390eed7c73a2f175dad90608998401341f5d5f (diff) | |
| parent | 2e5ced5fd62a73f4f5687ab19520b3aad1c53f6f (diff) | |
| download | libvpx-6b8ab5a46e74662b6c7c9af1f871b5bdbc826e54.tar.gz | |
Merge third_party/libvpx from https://chromium.googlesource.com/chromium/deps/libvpx.git at 2e5ced5fd62a73f4f5687ab19520b3aad1c53f6f
This commit was generated by merge_from_chromium.py.
Change-Id: I2eabbbf96fbf159697438e99580e47c744772d3d
Diffstat (limited to 'source/libvpx/vp9/encoder/vp9_rdopt.h')
| -rw-r--r-- | source/libvpx/vp9/encoder/vp9_rdopt.h | 51 |
1 files changed, 23 insertions, 28 deletions
diff --git a/source/libvpx/vp9/encoder/vp9_rdopt.h b/source/libvpx/vp9/encoder/vp9_rdopt.h index 52c603f..ed38ce8 100644 --- a/source/libvpx/vp9/encoder/vp9_rdopt.h +++ b/source/libvpx/vp9/encoder/vp9_rdopt.h @@ -23,38 +23,33 @@ extern "C" { struct TileInfo; struct VP9_COMP; struct macroblock; +struct RD_COST; void vp9_rd_pick_intra_mode_sb(struct VP9_COMP *cpi, struct macroblock *x, - int *r, int64_t *d, BLOCK_SIZE bsize, + struct RD_COST *rd_cost, BLOCK_SIZE bsize, PICK_MODE_CONTEXT *ctx, int64_t best_rd); -int64_t vp9_rd_pick_inter_mode_sb(struct VP9_COMP *cpi, struct macroblock *x, - const struct TileInfo *const tile, - int mi_row, int mi_col, - int *returnrate, - int64_t *returndistortion, - BLOCK_SIZE bsize, - PICK_MODE_CONTEXT *ctx, - int64_t best_rd_so_far); - -int64_t vp9_rd_pick_inter_mode_sb_seg_skip(struct VP9_COMP *cpi, - struct macroblock *x, - int *returnrate, - int64_t *returndistortion, - BLOCK_SIZE bsize, - PICK_MODE_CONTEXT *ctx, - int64_t best_rd_so_far); - -int64_t vp9_rd_pick_inter_mode_sub8x8(struct VP9_COMP *cpi, - struct macroblock *x, - const struct TileInfo *const tile, - int mi_row, int mi_col, - int *returnrate, - int64_t *returndistortion, - BLOCK_SIZE bsize, - PICK_MODE_CONTEXT *ctx, - int64_t best_rd_so_far); - +void vp9_rd_pick_inter_mode_sb(struct VP9_COMP *cpi, struct macroblock *x, + const struct TileInfo *const tile, + int mi_row, int mi_col, + struct RD_COST *rd_cost, + BLOCK_SIZE bsize, PICK_MODE_CONTEXT *ctx, + int64_t best_rd_so_far); + +void vp9_rd_pick_inter_mode_sb_seg_skip(struct VP9_COMP *cpi, + struct macroblock *x, + struct RD_COST *rd_cost, + BLOCK_SIZE bsize, + PICK_MODE_CONTEXT *ctx, + int64_t best_rd_so_far); + +void vp9_rd_pick_inter_mode_sub8x8(struct VP9_COMP *cpi, + struct macroblock *x, + const struct TileInfo *const tile, + int mi_row, int mi_col, + struct RD_COST *rd_cost, + BLOCK_SIZE bsize, PICK_MODE_CONTEXT *ctx, + int64_t best_rd_so_far); #ifdef __cplusplus } // extern "C" #endif |