Revert "rtc-screen: Increase horiz search in estimate_scroll_motion"
This reverts commit f74eae54f3beb6850c0a468091f4d0291b2d563c.
Reason for revert: Culprit CL for issue b:387021199, revert for now until issue is fixed.
Bug: b:387021199, b:383306740
Change-Id: Ia44eabe764a4430c168995c465322beb85f9ba30
diff --git a/av1/encoder/ratectrl.c b/av1/encoder/ratectrl.c
index aadc0ec..102f596 100644
--- a/av1/encoder/ratectrl.c
+++ b/av1/encoder/ratectrl.c
@@ -3088,9 +3088,13 @@
const int full_search = 1;
// Keep border a multiple of 16.
const int border = (cpi->oxcf.border_in_pixels >> 4) << 4;
+ // Make search_size_height larger to capture more common vertical scroll.
+ // Increase the search if last two frames were dropped.
// Values set based on screen test set.
- int search_size_height = (cpi->rc.frame_source_sad > 20000) ? 512 : 192;
- int search_size_width = (cpi->rc.frame_source_sad > 20000) ? 512 : 160;
+ int search_size_width = 160;
+ int search_size_height = (cpi->rc.drop_count_consec > 1)
+ ? (cpi->rc.frame_source_sad > 20000) ? 512 : 224
+ : 192;
// Adjust based on boundary.
if ((pos_col - search_size_width < -border) ||
(pos_col + search_size_width > cm->width + border))
