commit f6a97614729517761c93d87f54a9f724b36d764c
author Marco Nelissen <marcone@google.com> Thu Jan 14 09:12:16 2016 -0800
committer Marco Nelissen <marcone@google.com> Thu Jan 14 17:14:08 2016 +0000
tree cba7069d3a0775b60c572a36c79ff4f41e7bd767
parent 5ebdc03db7d3704faba32594344c69dfc67472b8

Test for mpeg2 decoder bugfix

Also add a timeout on the MediaCodec-based test.

Bug: 25812590
Change-Id: I888fb444dda5d4d7cc825b20a8a04e5eadcf3d3d

tests/tests/security/res/raw/bug_25812590.mp2

diff --git a/tests/tests/security/res/raw/bug_25812590.mp2 b/tests/tests/security/res/raw/bug_25812590.mp2
new file mode 100644
index 0000000..dbde03e
--- /dev/null
+++ b/tests/tests/security/res/raw/bug_25812590.mp2
Binary files differ

tests/tests/security/src/android/security/cts/StagefrightTest.java

diff --git a/tests/tests/security/src/android/security/cts/StagefrightTest.java b/tests/tests/security/src/android/security/cts/StagefrightTest.java
index b0cd091..17a4c75 100644
--- a/tests/tests/security/src/android/security/cts/StagefrightTest.java
+++ b/tests/tests/security/src/android/security/cts/StagefrightTest.java
@@ -116,6 +116,10 @@
         doStagefrightTest(R.raw.bug_25765591);
     }
 
+    public void testStagefright_bug_25812590() throws Exception {
+        doStagefrightTest(R.raw.bug_25812590);
+    }
+
     private void doStagefrightTest(final int rid) throws Exception {
         doStagefrightTestMediaPlayer(rid);
         doStagefrightTestMediaCodec(rid);
@@ -302,6 +306,10 @@
                         if ((info.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0) {
                             break;
                         }
+                        if (info.presentationTimeUs > TIMEOUT_NS / 1000) {
+                            Log.d(TAG, "stopping after 10 seconds worth of data");
+                            break;
+                        }
                         codec.releaseOutputBuffer(status, true);
                     }
                 }