commit c310d7e7a09d604445012cf8ec90bd8ed239f279
author Andy McFadden <fadden@android.com> Wed Aug 21 16:22:19 2013 -0700
committer Andy McFadden <fadden@android.com> Wed Aug 21 16:22:19 2013 -0700
tree d9a251ee21ffd5f2fd39ff9d44f86826e4c284d7
parent c1e7f652fef7c6f5c9d5c92481485e047ce18083

Enable PresentationSyncTest

Throw an exception when reality does not meet expectations.

Bug 10429427

Change-Id: Iabbefddc5e1c85dd34975744c09e945e3685c05b

tests/tests/media/src/android/media/cts/PresentationSyncTest.java

diff --git a/tests/tests/media/src/android/media/cts/PresentationSyncTest.java b/tests/tests/media/src/android/media/cts/PresentationSyncTest.java
index b2ad98b..75775856 100644
--- a/tests/tests/media/src/android/media/cts/PresentationSyncTest.java
+++ b/tests/tests/media/src/android/media/cts/PresentationSyncTest.java
@@ -36,7 +36,7 @@
  */
 public class PresentationSyncTest extends ActivityInstrumentationTestCase2<MediaStubActivity>
         implements SurfaceHolder.Callback {
-    private static final String TAG = "RenderSyncTest";
+    private static final String TAG = "PresentationSyncTest";
     private static final boolean VERBOSE = false;           // lots of logging
     private static final int FRAME_COUNT = 128;             // ~2 sec @ 60fps
 
@@ -135,11 +135,9 @@
         for (int frameNum = 0; frameNum < FRAME_COUNT; frameNum++) {
             if (mult != -1.0f) {
                 showNsec = startNsec + (long) (frameNum * frameTimeNsec * mult);
-                //Log.d(TAG, "showNsec=" + showNsec);
             }
             drawFrame(frameNum, mult);
             output.setPresentationTime(showNsec);
-            //Log.d(TAG, "ZZZ des=" + showNsec + " now=" + System.nanoTime());
             Trace.beginSection("swapbuf " + frameNum);
             output.swapBuffers();
             Trace.endSection();
@@ -153,10 +151,12 @@
             long expectedNsec = (long) (frameTimeNsec * FRAME_COUNT * mult);
             long deltaNsec = Math.abs(expectedNsec - actualNsec);
             double delta = (double) deltaNsec / expectedNsec;
-            if (delta > 0.1) {
-                Log.e(TAG, "mult=" + mult + ": expected=" + expectedNsec +
+            final double MAX_DELTA = 0.05;
+            if (delta > MAX_DELTA) {
+                throw new RuntimeException("Time delta exceeds tolerance (" + MAX_DELTA +
+                        "): mult=" + mult + ": expected=" + expectedNsec +
                         " actual=" + actualNsec + " p=" + delta);
-                // TODO: fail() instead of Log()
+
             } else {
                 Log.d(TAG, "mult=" + mult + ": expected=" + expectedNsec +
                         " actual=" + actualNsec + " p=" + delta);