commit 18f77adf550ae1ebed74a86b6e07ca9a2dcc07bd
author Thomas Daede <tdaede@mozilla.com> Fri Feb 10 13:13:58 2017 -0800
committer Thomas Daede <tdaede@mozilla.com> Sat Mar 18 00:55:31 2017 +0000
tree 01eae4b2e1037804941c5eb5893b02a551cf2f75
parent 19234cc2b358e6af2ca5af17857447813f0f9451

Additionally limit upscaled references to <= 720 for profile!=0.

The previous limit was <=1080p, which was sufficient to keep RAM
usage below 3GB for the 8 bit path, but turns out to be insufficient
for the 10 bit path.

Change-Id: I7a19261928a4e1a71f5f297125651113a2465d3d

av1/encoder/speed_features.c

diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index 69076a8..a44a733 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -457,6 +457,9 @@
   if (AOMMIN(cm->width, cm->height) > 1080) {
     sf->use_upsampled_references = 0;
   }
+  if ((AOMMIN(cm->width, cm->height) > 720) && (oxcf->profile != PROFILE_0)) {
+    sf->use_upsampled_references = 0;
+  }
 
   if (oxcf->mode == REALTIME) {
     set_rt_speed_feature_framesize_dependent(cpi, sf, oxcf->speed);