commit ab33034269950c1bfd121f4d3855b5b3f9bd4f8a
author huans <huans@google.com> Wed Nov 08 12:18:30 2017 -0800
committer huans <huans@google.com> Tue Jan 30 16:00:40 2018 -0800
tree 7d09a179bb5d729996015a17fe972c79ae5ea63a
parent a0c2d35904b979205e1a47131a2bc2528d1e9894

Add check for width, height and rotation in stream configuration.

Bug: 69002477, 69002512, 69002554, 69002570
Test: run vts -m VtsHalCameraProviderV2_4Target -t
CameraHidlTest.configureStreamsInvalidOutputs_32bit

Change-Id: Ifa384832433e37ab4f39c607257f85fc51e4d443

camera/EmulatedFakeCamera3.cpp

diff --git a/camera/EmulatedFakeCamera3.cpp b/camera/EmulatedFakeCamera3.cpp
index 99268eb..942de93 100644
--- a/camera/EmulatedFakeCamera3.cpp
+++ b/camera/EmulatedFakeCamera3.cpp
@@ -279,6 +279,22 @@
             inputStream = newStream;
         }
 
+        if (newStream->stream_type != CAMERA3_STREAM_INPUT) {
+            if (newStream->rotation < CAMERA3_STREAM_ROTATION_0 ||
+                newStream->rotation > CAMERA3_STREAM_ROTATION_270) {
+                ALOGE("%s: Unsupported stream rotation 0x%x requested",
+                      __FUNCTION__, newStream->rotation);
+                return BAD_VALUE;
+            }
+        }
+
+        if (newStream->width <= 0 || newStream->width > mSensorWidth ||
+            newStream->height <= 0 || newStream->height > mSensorHeight) {
+            ALOGE("%s: Unsupported stream width 0x%x height 0x%x",
+                  __FUNCTION__, newStream->width, newStream->height);
+            return BAD_VALUE;
+        }
+
         bool validFormat = false;
         for (size_t f = 0;
              f < sizeof(kAvailableFormats)/sizeof(kAvailableFormats[0]);