diff options
| author | Yin-Chia Yeh <yinchiayeh@google.com> | 2015-03-12 15:09:27 -0700 |
|---|---|---|
| committer | Yin-Chia Yeh <yinchiayeh@google.com> | 2015-03-16 13:11:11 -0700 |
| commit | 5407ef1ec28742c5c60b04aae6c68835bb8c75fe (patch) | |
| tree | 8241173d850a907fdbf64a5c7a466934d50f58bf | |
| parent | 240790d28637d85266d81cf1c334ae122dc84ff3 (diff) | |
| download | hardware_libhardware-5407ef1ec28742c5c60b04aae6c68835bb8c75fe.zip hardware_libhardware-5407ef1ec28742c5c60b04aae6c68835bb8c75fe.tar.gz hardware_libhardware-5407ef1ec28742c5c60b04aae6c68835bb8c75fe.tar.bz2 | |
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
| -rw-r--r-- | include/hardware/camera3.h | 4 | ||||
| -rw-r--r-- | tests/camera2/CameraMultiStreamTests.cpp | 2 | ||||
| -rw-r--r-- | tests/camera2/CameraStreamFixture.h | 1 |
3 files changed, 5 insertions, 2 deletions
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 @@ typedef struct camera3_stream { * 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 @@ public: 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 @@ protected: device->createStream(mNativeWindow, mWidth, mHeight, format, HAL_DATASPACE_UNKNOWN, + CAMERA3_STREAM_ROTATION_0, &mStreamId)); ASSERT_NE(-1, mStreamId); |