Reland of Bump up scaling limit for MediaCodec.

webrtc/video/vie_encoder_unittest.cc

Index: webrtc/video/vie_encoder_unittest.cc
diff --git a/webrtc/video/vie_encoder_unittest.cc b/webrtc/video/vie_encoder_unittest.cc
index da925e5224db403b29c4a7b4d53ddc49f01556e9..9b201d170ebb0db5202493600f9d12ea40359233 100644
--- a/webrtc/video/vie_encoder_unittest.cc
+++ b/webrtc/video/vie_encoder_unittest.cc
@@ -19,6 +19,16 @@
 #include "webrtc/test/gtest.h"
 #include "webrtc/video/send_statistics_proxy.h"
 #include "webrtc/video/vie_encoder.h"
+
+namespace {
+#if defined(WEBRTC_ANDROID)
+// TODO(kthelgason): Lower this limit when better testing
+// on MediaCodec and fallback implementations are in place.
+const int kMinPixelsPerFrame = 320 * 180;
+#else
+const int kMinPixelsPerFrame = 120 * 90;
+#endif
+}
 
 namespace webrtc {
 
@@ -1021,8 +1031,6 @@
   const int kTargetBitrateBps = 100000;
   int frame_width = 1280;
   int frame_height = 720;
-  // from vie_encoder.cc
-  const int kMinPixelsPerFrame = 120 * 90;
   vie_encoder_->OnBitrateUpdated(kTargetBitrateBps, 0, 0);
 
   for (size_t i = 1; i <= 10; i++) {