summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2019-01-04 19:58:29 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-01-04 19:58:29 +0000
commit8066d615918530df2cac61538fa66bf459298f92 (patch)
tree25828f0a8505fd2868ff0f87b096925248bb1927
parentcd0a2487942bc9a616c47cd5c5e923de44213c68 (diff)
parentee208f95c6c84f8fe62f9608e53d06c5b5f632c3 (diff)
downloadcts-8066d615918530df2cac61538fa66bf459298f92.tar.gz
Merge "CtsVerifier: fix maximum YUV resolution selection" into nougat-mr1-cts-dev
-rw-r--r--apps/CtsVerifier/src/com/android/cts/verifier/camera/its/ItsService.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/camera/its/ItsService.java b/apps/CtsVerifier/src/com/android/cts/verifier/camera/its/ItsService.java
index 87100967796..2d2121adaee 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/camera/its/ItsService.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/camera/its/ItsService.java
@@ -331,7 +331,8 @@ public class ItsService extends Service implements SensorEventListener {
mCameraListener, mCameraHandler);
mCameraCharacteristics = mCameraManager.getCameraCharacteristics(
devices[cameraId]);
- Size maxYuvSize = ItsUtils.getYuvOutputSizes(mCameraCharacteristics)[0];
+ Size maxYuvSize = ItsUtils.getMaxOutputSize(
+ mCameraCharacteristics, ImageFormat.YUV_420_888);
// 2 bytes per pixel for RGBA Bitmap and at least 3 Bitmaps per CDD
int quota = maxYuvSize.getWidth() * maxYuvSize.getHeight() * 2 * 3;
mSocketQueueQuota = new Semaphore(quota, true);