Merge changes I412c24aa,I28a8bbf0

* changes:
  mcomp: Remove an obsolete undef.
  mcomp: Remove an obsolete comment.
This commit is contained in:
Alex Converse 2016-05-11 20:03:21 +00:00 committed by Gerrit Code Review
commit ccf4f47b99
2 changed files with 0 additions and 22 deletions

View File

@ -145,16 +145,6 @@ void vp10_init3smotion_compensation(search_site_config *cfg, int stride) {
cfg->searches_per_step = 8;
}
/*
* To avoid the penalty for crossing cache-line read, preload the reference
* area in a small buffer, which is aligned to make sure there won't be crossing
* cache-line read while reading from this buffer. This reduced the cpu
* cycles spent on reading ref data in sub-pixel filter functions.
* TODO: Currently, since sub-pixel search range here is -3 ~ 3, copy 22 rows x
* 32 cols area that is enough for 16x16 macroblock. Later, for SPLITMV, we
* could reduce the area.
*/
/* estimated cost of a motion vector (r,c) */
#define MVC(r, c) \
(mvcost ? \
@ -790,7 +780,6 @@ int vp10_find_best_sub_pixel_tree(const MACROBLOCK *x,
}
#undef MVC
#undef PRE
#undef CHECK_BETTER
static INLINE int check_bounds(const MACROBLOCK *x, int row, int col,

View File

@ -144,16 +144,6 @@ void vp9_init3smotion_compensation(search_site_config *cfg, int stride) {
cfg->total_steps = ss_count / cfg->searches_per_step;
}
/*
* To avoid the penalty for crossing cache-line read, preload the reference
* area in a small buffer, which is aligned to make sure there won't be crossing
* cache-line read while reading from this buffer. This reduced the cpu
* cycles spent on reading ref data in sub-pixel filter functions.
* TODO: Currently, since sub-pixel search range here is -3 ~ 3, copy 22 rows x
* 32 cols area that is enough for 16x16 macroblock. Later, for SPLITMV, we
* could reduce the area.
*/
/* Estimated (square) error cost of a motion vector (r,c). The 14 scale comes
* from the same math as in mv_err_cost(). */
#define MVC(r, c) \
@ -835,7 +825,6 @@ int vp9_find_best_sub_pixel_tree(const MACROBLOCK *x,
}
#undef MVC
#undef PRE
#undef CHECK_BETTER
static INLINE int check_bounds(const MACROBLOCK *x, int row, int col,