commit e6ad305e8da121f44680a67e0e3dc7cb76f9d2b5
author Jason Parks <jparks@google.com> Fri Nov 21 15:22:38 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 21 15:22:39 2014 +0000
tree 5946404cdf893d50c9268cd6b135f55da65b0d32
parent 9e50e10f532f2fa44f9968d0f4f6923866bcd4f7
parent a808efe57297b3d0b6c6f06582f6e98442bf4674

Merge "Skip ImageReaderDecoderTest if h.264 is not found." into lmp-sprout-dev

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

diff --git a/tests/tests/media/src/android/media/cts/ImageReaderDecoderTest.java b/tests/tests/media/src/android/media/cts/ImageReaderDecoderTest.java
index d620995..9528db9 100644
--- a/tests/tests/media/src/android/media/cts/ImageReaderDecoderTest.java
+++ b/tests/tests/media/src/android/media/cts/ImageReaderDecoderTest.java
@@ -100,6 +100,10 @@
      * to be supported by hw decoder.
      */
     public void testHwAVCDecode360pForFlexibleYuv() throws Exception {
+        if (!MediaPlayerTestBase.hasH264(false)) {
+            Log.i(TAG, "SKIPPING testSwAVCDecode360pForFlexibleYuv(): no codec found.");
+            return;
+        }
         try {
             int format = ImageFormat.YUV_420_888;
             videoDecodeToSurface(
@@ -115,6 +119,10 @@
      * to be supported by sw decoder.
      */
     public void testSwAVCDecode360pForFlexibleYuv() throws Exception {
+        if (!MediaPlayerTestBase.hasH264(false)) {
+            Log.i(TAG, "SKIPPING testSwAVCDecode360pForFlexibleYuv(): no codec found.");
+            return;
+        }
         try {
             int format = ImageFormat.YUV_420_888;
             videoDecodeToSurface(