commit e4388207474b31b06961e43b353feec73bc46e46
author Ronghua Wu <ronghuawu@google.com> Thu Jul 09 09:48:02 2015 -0700
committer The Android Automerger <android-build@google.com> Thu Jul 09 18:36:41 2015 -0700
tree a64042f4433d9e2605f6146742dad2157e51e729
parent 571f2b69401fdc7766bc2f81a018623eac96e0bd

media: VideoDecoderPerfTest test fixes

Also reduce the test frame number to avoid test timeout.

Bug: 22377021
Change-Id: Icb83764d781c0a292506cc10fba3b40a574f9391

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

diff --git a/tests/tests/media/src/android/media/cts/VideoDecoderPerfTest.java b/tests/tests/media/src/android/media/cts/VideoDecoderPerfTest.java
index 54024f7..45fdb13 100644
--- a/tests/tests/media/src/android/media/cts/VideoDecoderPerfTest.java
+++ b/tests/tests/media/src/android/media/cts/VideoDecoderPerfTest.java
@@ -42,7 +42,7 @@
 
 public class VideoDecoderPerfTest extends MediaPlayerTestBase {
     private static final String TAG = "VideoDecoderPerfTest";
-    private static final int TOTAL_FRAMES = 3000;
+    private static final int TOTAL_FRAMES = 1000;
     private static final int NUMBER_OF_REPEAT = 2;
     private static final String VIDEO_AVC = MediaFormat.MIMETYPE_VIDEO_AVC;
     private static final String VIDEO_VP8 = MediaFormat.MIMETYPE_VIDEO_VP8;
@@ -156,6 +156,7 @@
                     assert sampleSize >= 0:
                         "extractor.readSampleData returns negative.";
                     long presentationTimeUs = extractor.getSampleTime();
+                    extractor.advance();
                     if (++inputNum == stopAtSample) {
                         Log.d(TAG, "saw input EOS (stop at sample).");
                         sawInputEOS = true; // tag this sample as EOS
@@ -335,13 +336,13 @@
     }
 
     public void testH263176x144() throws Exception {
-        decode(VIDEO_HEVC,
+        decode(VIDEO_H263,
                R.raw.video_176x144_3gp_h263_300kbps_12fps_aac_stereo_128kbps_22050hz,
                176, 144);
     }
 
     public void testH263352x288() throws Exception {
-        decode(VIDEO_HEVC,
+        decode(VIDEO_H263,
                R.raw.video_352x288_3gp_h263_300kbps_12fps_aac_stereo_128kbps_22050hz,
                352, 288);
     }