tequilaOS/platform_hardware_libhardware
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Camera: Fix tests per camera service interface change"

Browse source
This commit is contained in:
Yin-Chia Yeh 2015-03-19 17:27:27 +00:00 committed by Android (Google) Code Review
commit 147814cd4c
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/hardware/camera3.h
View file

@ -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:
*

2
tests/camera2/CameraMultiStreamTests.cpp
View file

@ -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);
}

1
tests/camera2/CameraStreamFixture.h
View file

@ -258,6 +258,7 @@ protected:
device->createStream(mNativeWindow,
mWidth, mHeight, format,
HAL_DATASPACE_UNKNOWN,
CAMERA3_STREAM_ROTATION_0,
&mStreamId));
ASSERT_NE(-1, mStreamId);