commit 0a717c0f5c7651a4058aadbcd4defde7dfe0c2ac
author Hakan Lindh <hlindh@google.com> Thu Jun 22 22:10:13 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 22 22:10:13 2017 +0000
tree 29339252a9a5677ae52dd73496a880a45c4ffa17
parent 6b47bb089efe7a9e31d75451fe5b8d58c7dda018
parent 97ddd4608cef90bf2c76d3324680f89f7fe4a93c

Merge "Adding test for 'adb screenrecord'"

src/com/android/media/tests/VideoMultimeterRunner.java

diff --git a/src/com/android/media/tests/VideoMultimeterRunner.java b/src/com/android/media/tests/VideoMultimeterRunner.java
index 4ed903d..13fd4d1 100644
--- a/src/com/android/media/tests/VideoMultimeterRunner.java
+++ b/src/com/android/media/tests/VideoMultimeterRunner.java
@@ -78,7 +78,8 @@
 
             String calibrationValue = (mCalibrationMap.containsKey(deviceSerial) ?
                     mCalibrationMap.get(deviceSerial) : null);
-            if (moveArm(deviceSerial) && setupTestEnv(calibrationValue)) {
+            if (mDebugWithoutHardware
+                    || (moveArm(deviceSerial) && setupTestEnv(calibrationValue))) {
                 runMultimeterTest(listener, metrics);
             } else {
                 listener.testFailed(testId, "Failed to set up environment");

src/com/android/media/tests/VideoMultimeterTest.java

diff --git a/src/com/android/media/tests/VideoMultimeterTest.java b/src/com/android/media/tests/VideoMultimeterTest.java
index c287bed..038803f 100644
--- a/src/com/android/media/tests/VideoMultimeterTest.java
+++ b/src/com/android/media/tests/VideoMultimeterTest.java
@@ -79,6 +79,14 @@
         "filename of calibration video")
     private String mCaliVideoDevicePath = "video_cali.mp4";
 
+    @Option(
+        name = "debug-without-hardware",
+        description = "Use option to debug test without having specialized hardware",
+        importance = Importance.NEVER,
+        mandatory = false
+    )
+    protected boolean mDebugWithoutHardware = false;
+
     static final String ROTATE_LANDSCAPE = "content insert --uri content://settings/system"
             + " --bind name:s:user_rotation --bind value:i:1";
 
@@ -105,8 +113,12 @@
     static final String VIDEO_FRAME_DATA_PATTERN = "OK\\s+\\d+;\\s*(-?\\d+);\\s*[a-z]+;\\s*(\\d+)";
 
     // Regex for: "OK (time); (frame duration); (marker color); (total dropped frames); (lipsync)"
+    // results in: $1 == ts, $2 == lipsync
     static final String LIPSYNC_DATA_PATTERN =
-        "OK\\s+\\d+;\\s*\\d+;\\s*[a-z]+;\\s*\\d+;\\s*(-?\\d+)";
+            "OK\\s+(\\d+);\\s*\\d+;\\s*[a-z]+;\\s*\\d+;\\s*(-?\\d+)";
+    //          ts        dur     color      missed       latency
+    static final int LIPSYNC_SIGNAL = 2000000; // every 2 seconds
+    static final int LIPSYNC_SIGNAL_MIN = 1500000; // must be at least 1.5 seconds after prev
 
     ITestDevice mDevice;
 
@@ -207,16 +219,15 @@
         cr = getRunUtil().runTimedCmd(COMMAND_TIMEOUT_MS, mMeterUtilPath, CMD_STOP_MEASUREMENT);
         getRunUtil().sleep(3 * 1000);
         CLog.i("Stopping measurement: " + cr.getStdout());
-        getDevice().unlockDevice();
-        getRunUtil().sleep(3 * 1000);
 
         if (caliValues == null) {
             return doCalibration();
         } else {
             CLog.i("Setting calibration values: " + caliValues);
-            cr = getRunUtil().runTimedCmd(COMMAND_TIMEOUT_MS, mMeterUtilPath,
-                    CMD_SET_CALIBRATION_VALS + " " +  caliValues);
-            if (cr.getStdout().contains("OK")) {
+            final String calibrationValues = CMD_SET_CALIBRATION_VALS + " " + caliValues;
+            cr = getRunUtil().runTimedCmd(COMMAND_TIMEOUT_MS, mMeterUtilPath, calibrationValues);
+            final String response = mDebugWithoutHardware ? "OK" : cr.getStdout();
+            if (response != null && response.startsWith("OK")) {
                 CLog.i("Calibration values are set to: " + caliValues);
                 return true;
             } else {
@@ -230,7 +241,6 @@
             throws DeviceNotAvailableException {
         CommandResult cr;
         getDevice().clearErrorDialogs();
-        getDevice().unlockDevice();
         getRunUtil().sleep(mWaitTimeBetweenRuns);
 
         // play test video
@@ -425,15 +435,25 @@
 
         // parse lipsync results (the audio and video synchronization offset)
         // format: "OK (time); (frame duration); (marker color); (total dropped frames); (lipsync)"
-        p = Pattern.compile(LIPSYNC_DATA_PATTERN);
         if (lipsync) {
             ArrayList<Integer> lipsyncVals = new ArrayList<>();
             StringBuilder lipsyncValsStr = new StringBuilder("[");
             long lipsyncSum = 0;
+            int lipSyncLastTime = -1;
+
+            Pattern pLip = Pattern.compile(LIPSYNC_DATA_PATTERN);
             for (int i = 0; i < lines.length; i++) {
-                m = p.matcher(lines[i].trim());
+                m = pLip.matcher(lines[i].trim());
                 if (m.matches()) {
-                    int lipSyncVal = Integer.parseInt(m.group(1));
+                    int lipSyncTime = Integer.parseInt(m.group(1));
+                    int lipSyncVal = Integer.parseInt(m.group(2));
+                    if (lipSyncLastTime != -1) {
+                        if ((lipSyncTime - lipSyncLastTime) < LIPSYNC_SIGNAL_MIN) {
+                            continue; // ignore the early/spurious one
+                        }
+                    }
+                    lipSyncLastTime = lipSyncTime;
+
                     lipsyncVals.add(lipSyncVal);
                     lipsyncValsStr.append(lipSyncVal);
                     lipsyncValsStr.append(", ");