Camera: Fix tests per camera service interface change
Also clarify rotation field has no meaning and will always be 0
for a input stream.
Change-Id: I0f4343a0bfa7bf09ba887c78a1da1c08daa35333
diff --git a/include/hardware/camera3.h b/include/hardware/camera3.h
index 284c78b..fd3a45d 100644
--- a/include/hardware/camera3.h
+++ b/include/hardware/camera3.h
@@ -1540,7 +1540,9 @@
* with stream width and height. For example, if the rotation is 90 degree
* and the stream width and height is 720 and 1280 respectively, camera service
* will supply buffers of size 720x1280, and HAL should capture a 1280x720 image
- * and rotate the image by 90 degree counterclockwise.
+ * and rotate the image by 90 degree counterclockwise. The rotation field is
+ * no-op when the stream type is input. Camera HAL must ignore the rotation
+ * field for an input stream.
*
* <= CAMERA_DEVICE_API_VERSION_3_2:
*
diff --git a/tests/camera2/CameraMultiStreamTests.cpp b/tests/camera2/CameraMultiStreamTests.cpp
index 1edc28e..bfadfea 100644
--- a/tests/camera2/CameraMultiStreamTests.cpp
+++ b/tests/camera2/CameraMultiStreamTests.cpp
@@ -209,7 +209,7 @@
ASSERT_EQ(OK,
mDevice->createStream(mNativeWindow,
mWidth, mHeight, mFormat, HAL_DATASPACE_UNKNOWN,
- &mStreamId));
+ CAMERA3_STREAM_ROTATION_0, &mStreamId));
ASSERT_NE(-1, mStreamId);
}
diff --git a/tests/camera2/CameraStreamFixture.h b/tests/camera2/CameraStreamFixture.h
index ff110d8..8a8c27d 100644
--- a/tests/camera2/CameraStreamFixture.h
+++ b/tests/camera2/CameraStreamFixture.h
@@ -258,6 +258,7 @@
device->createStream(mNativeWindow,
mWidth, mHeight, format,
HAL_DATASPACE_UNKNOWN,
+ CAMERA3_STREAM_ROTATION_0,
&mStreamId));
ASSERT_NE(-1, mStreamId);