diff options
| author | James Zern <jzern@google.com> | 2015-06-19 03:31:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-06-19 03:31:38 +0000 |
| commit | c5d779d266ba254d60b56afe813b681684613b24 (patch) | |
| tree | 7d21490c2330d9b113561e59aa8f8b39362bc7e7 /vp9/encoder/vp9_mcomp.c | |
| parent | a2c69af50ed31a3f56c46ef825098f9acb740a9b (diff) | |
| parent | aaa49f04854737a5f7c18ea844da1ca89694e5de (diff) | |
| download | libvpx-c5d779d266ba254d60b56afe813b681684613b24.tar libvpx-c5d779d266ba254d60b56afe813b681684613b24.tar.gz libvpx-c5d779d266ba254d60b56afe813b681684613b24.tar.bz2 libvpx-c5d779d266ba254d60b56afe813b681684613b24.zip | |
Merge changes I2552d810,I51952c0a,Ib82e4247,I9c8d16cb
* changes:
vp9_mcomp: make search_step_table static
vp9_encodeframe: delete auto_partition_range()
vp9_mcomp: don't mark setup_center_error() inline
vp9_encoder: hide adjust_image_stat()
Diffstat (limited to 'vp9/encoder/vp9_mcomp.c')
| -rw-r--r-- | vp9/encoder/vp9_mcomp.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/vp9/encoder/vp9_mcomp.c b/vp9/encoder/vp9_mcomp.c index 234272697..081b99f9f 100644 --- a/vp9/encoder/vp9_mcomp.c +++ b/vp9/encoder/vp9_mcomp.c @@ -286,20 +286,20 @@ static INLINE const uint8_t *pre(const uint8_t *buf, int stride, int r, int c) { bestmv->row *= 8; \ bestmv->col *= 8; -static INLINE unsigned int setup_center_error(const MACROBLOCKD *xd, - const MV *bestmv, - const MV *ref_mv, - int error_per_bit, - const vp9_variance_fn_ptr_t *vfp, - const uint8_t *const src, - const int src_stride, - const uint8_t *const y, - int y_stride, - const uint8_t *second_pred, - int w, int h, int offset, - int *mvjcost, int *mvcost[2], - unsigned int *sse1, - int *distortion) { +static unsigned int setup_center_error(const MACROBLOCKD *xd, + const MV *bestmv, + const MV *ref_mv, + int error_per_bit, + const vp9_variance_fn_ptr_t *vfp, + const uint8_t *const src, + const int src_stride, + const uint8_t *const y, + int y_stride, + const uint8_t *second_pred, + int w, int h, int offset, + int *mvjcost, int *mvcost[2], + unsigned int *sse1, + int *distortion) { unsigned int besterr; #if CONFIG_VP9_HIGHBITDEPTH if (second_pred != NULL) { @@ -610,7 +610,7 @@ int vp9_find_best_sub_pixel_tree_pruned(const MACROBLOCK *x, return besterr; } -const MV search_step_table[12] = { +static const MV search_step_table[12] = { // left, right, up, down {0, -4}, {0, 4}, {-4, 0}, {4, 0}, {0, -2}, {0, 2}, {-2, 0}, {2, 0}, |