commit a175c5e8ced5a4796215ee66ffb8678c99dc401a
author Tom Rudick <tmr@google.com> Fri Nov 18 15:45:58 2016 -0500
committer Joshua Schwarz <joshuaschwarz@google.com> Mon Feb 06 13:22:47 2017 -0800
tree 9ea6525b1bb93758d5a158c2a6f4cf3c39b56303
parent bfa9d264754f00a23f91b636ce88bd1b796e62fe

Check that H.264 is available before checking max frame rate

Previously this test was checking for the max frame rate of H.264
before it would check if the H.264 codec actually existed on the
device. Devices that do not have this codec would fail the test
due to this ordering. This change reorders the checks so that
we only check the max frame rate if the code exists.

Bug: 32742421
Change-Id: I3a2e0806c1d6dd87095eadd7917d25273acfe190

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

diff --git a/tests/tests/media/src/android/media/cts/MediaRecorderTest.java b/tests/tests/media/src/android/media/cts/MediaRecorderTest.java
index 32d9eaa..3cbfdbf 100644
--- a/tests/tests/media/src/android/media/cts/MediaRecorderTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaRecorderTest.java
@@ -923,13 +923,14 @@
         boolean success = false;
         Surface surface = null;
         int noOfFailure = 0;
-        final float frameRate = getMaxFrameRateForCodec(MediaRecorder.VideoEncoder.H264);
 
         if (!hasH264()) {
             MediaUtils.skipTest("no codecs");
             return true;
         }
 
+        final float frameRate = getMaxFrameRateForCodec(MediaRecorder.VideoEncoder.H264);
+
         try {
             if (persistent) {
                 surface = MediaCodec.createPersistentInputSurface();