commit 561ecee6502d4fca660c7cc4170237a1906a071c
author Lajos Molnar <lajos@google.com> Thu Jan 29 00:08:15 2015 -0800
committer The Android Automerger <android-build@google.com> Thu Jan 29 12:26:19 2015 -0800
tree e1515d3084051dd228ceb2733d716ded40fc83a8
parent 4b52d4839abb8876bfd626049a920cdd28f40a9d

media: handle unsupported sizes in arbitrary VideoEncoderTests

Bug: 19013118
Change-Id: I60a090c1b2e23582d84bcb0a82e97ce7ec509649

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

diff --git a/tests/tests/media/src/android/media/cts/VideoEncoderTest.java b/tests/tests/media/src/android/media/cts/VideoEncoderTest.java
index b2752325..d3c03c2 100644
--- a/tests/tests/media/src/android/media/cts/VideoEncoderTest.java
+++ b/tests/tests/media/src/android/media/cts/VideoEncoderTest.java
@@ -779,14 +779,21 @@
             // initialize arbitrary sizes
             for (int i = 1; i <= 7; ++i) {
                 int j = ((7 * i) % 11) + 1;
-                int width = alignedPointInRange(i * 0.125, xAlign, mCaps.getSupportedWidths());
-                int height = alignedPointInRange(
-                        j * 0.077, yAlign, mCaps.getSupportedHeightsFor(width));
-                mArbitrary.add(new Size(width, height));
+                int width, height;
+                try {
+                    width = alignedPointInRange(i * 0.125, xAlign, mCaps.getSupportedWidths());
+                    height = alignedPointInRange(
+                            j * 0.077, yAlign, mCaps.getSupportedHeightsFor(width));
+                    mArbitrary.add(new Size(width, height));
+                } catch (IllegalArgumentException e) {
+                }
 
-                height = alignedPointInRange(i * 0.125, yAlign, mCaps.getSupportedHeights());
-                width = alignedPointInRange(j * 0.077, xAlign, mCaps.getSupportedWidthsFor(height));
-                mArbitrary.add(new Size(width, height));
+                try {
+                    height = alignedPointInRange(i * 0.125, yAlign, mCaps.getSupportedHeights());
+                    width = alignedPointInRange(j * 0.077, xAlign, mCaps.getSupportedWidthsFor(height));
+                    mArbitrary.add(new Size(width, height));
+                } catch (IllegalArgumentException e) {
+                }
             }
             mArbitrary.removeAll(mSizes);
             mSizes.addAll(mArbitrary);