Merge cherrypicks of [2481491, 2481800, 2481782, 2481665, 2481547, 2481358, 2481802, 2481613, 2481668, 2481614, 2481594, 2481595, 2481548, 2481744, 2481493, 2481494, 2481709] into oc-release
Change-Id: I885f5f290d2e60f2df0c6c777139915c42541607
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/MediaPerfUtils.java b/common/device-side/util/src/com/android/compatibility/common/util/MediaPerfUtils.java
index 23d7e96..469e99a 100644
--- a/common/device-side/util/src/com/android/compatibility/common/util/MediaPerfUtils.java
+++ b/common/device-side/util/src/com/android/compatibility/common/util/MediaPerfUtils.java
@@ -31,10 +31,10 @@
private static final int MOVING_AVERAGE_NUM_FRAMES = 10;
private static final int MOVING_AVERAGE_WINDOW_MS = 1000;
- // allow a variance of 2.5x for measured frame rates (e.g. 40% of lower-limit to 2.5x of
- // upper-limit of the published values). Also allow an extra 20% margin. This also acts as
+ // allow a variance of 2x for measured frame rates (e.g. half of lower-limit to double of
+ // upper-limit of the published values). Also allow an extra 10% margin. This also acts as
// a limit for the size of the published rates (e.g. upper-limit / lower-limit <= tolerance).
- private static final double FRAMERATE_TOLERANCE = 2.5 * 1.2;
+ private static final double FRAMERATE_TOLERANCE = 2.0 * 1.1;
/*
* ------------------ HELPER METHODS FOR ACHIEVABLE FRAME RATES ------------------
