From 7764f8af3e806f5c8046ed118a5e83866a0b7f7b Mon Sep 17 00:00:00 2001 From: Alex Converse Date: Tue, 10 May 2016 18:02:20 -0700 Subject: [PATCH 1/2] mcomp: Remove an obsolete comment. This was copied over from VP8. VP9 doesn't seem to do this buffer copy. Change-Id: I28a8bbf0503a7f99b2cb60620ab3674adde863bb --- vp10/encoder/mcomp.c | 10 ---------- vp9/encoder/vp9_mcomp.c | 10 ---------- 2 files changed, 20 deletions(-) diff --git a/vp10/encoder/mcomp.c b/vp10/encoder/mcomp.c index 2c1c591c5..007fe0cd4 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 ? \ diff --git a/vp9/encoder/vp9_mcomp.c b/vp9/encoder/vp9_mcomp.c index 466914518..bbc2e08d9 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) \ From 6dd5ec7efb1d6db123f53f49c84e070b9ac0d03f Mon Sep 17 00:00:00 2001 From: Alex Converse Date: Tue, 10 May 2016 18:03:15 -0700 Subject: [PATCH 2/2] mcomp: Remove an obsolete undef. The macro was removed in 6724676. Change-Id: I412c24aac49bd1ff60a331a30933e0d8ae3f2dd5 --- vp10/encoder/mcomp.c | 1 - vp9/encoder/vp9_mcomp.c | 1 - 2 files changed, 2 deletions(-) diff --git a/vp10/encoder/mcomp.c b/vp10/encoder/mcomp.c index 007fe0cd4..1ba2e2f2f 100644 --- a/vp10/encoder/mcomp.c +++ b/vp10/encoder/mcomp.c @@ -780,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 bbc2e08d9..f3ffe35ae 100644 --- a/vp9/encoder/vp9_mcomp.c +++ b/vp9/encoder/vp9_mcomp.c @@ -825,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,