diff options
| author | Alex Converse <aconverse@google.com> | 2016-05-11 20:03:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-05-11 20:03:21 +0000 |
| commit | ccf4f47b994d4e6ea8e7a3a8f1279d6f03b5b570 (patch) | |
| tree | 6c5997b9ef0a8073afb7223df9ef4688467ec100 | |
| parent | a45596cff7bce21db776dbae8df88844db46c0e8 (diff) | |
| parent | 6dd5ec7efb1d6db123f53f49c84e070b9ac0d03f (diff) | |
| download | libvpx-ccf4f47b994d4e6ea8e7a3a8f1279d6f03b5b570.tar libvpx-ccf4f47b994d4e6ea8e7a3a8f1279d6f03b5b570.tar.gz libvpx-ccf4f47b994d4e6ea8e7a3a8f1279d6f03b5b570.tar.bz2 libvpx-ccf4f47b994d4e6ea8e7a3a8f1279d6f03b5b570.zip | |
Merge changes I412c24aa,I28a8bbf0
* changes:
mcomp: Remove an obsolete undef.
mcomp: Remove an obsolete comment.
| -rw-r--r-- | vp10/encoder/mcomp.c | 11 | ||||
| -rw-r--r-- | vp9/encoder/vp9_mcomp.c | 11 |
2 files changed, 0 insertions, 22 deletions
diff --git a/vp10/encoder/mcomp.c b/vp10/encoder/mcomp.c index 2c1c591c5..1ba2e2f2f 100644 --- a/vp10/encoder/mcomp.c +++ b/vp10/encoder/mcomp.c @@ -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, diff --git a/vp9/encoder/vp9_mcomp.c b/vp9/encoder/vp9_mcomp.c index 466914518..f3ffe35ae 100644 --- a/vp9/encoder/vp9_mcomp.c +++ b/vp9/encoder/vp9_mcomp.c @@ -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, |