diff options
author | Igor Murashkin <iam@google.com> | 2012-12-04 16:54:52 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-12-04 16:54:52 -0800 |
commit | bb39e1769e972e5f2405f05274ac2170b4e3c83f (patch) | |
tree | aec1609f4dfe084ea549e84dbcc54a2b8301fe13 /tests/camera2 | |
parent | 9c78f43b7a3e0cd9d0ae46e058ec48e5d68bb9e5 (diff) | |
parent | 09ad0a3edb84404f56137963d78eccbf378fb48b (diff) | |
download | hardware_libhardware-bb39e1769e972e5f2405f05274ac2170b4e3c83f.zip hardware_libhardware-bb39e1769e972e5f2405f05274ac2170b4e3c83f.tar.gz hardware_libhardware-bb39e1769e972e5f2405f05274ac2170b4e3c83f.tar.bz2 |
Merge "Camera2: Fix metadata symbols"
Diffstat (limited to 'tests/camera2')
-rw-r--r-- | tests/camera2/camera2.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/camera2/camera2.cpp b/tests/camera2/camera2.cpp index fbb0503..a15c5e6 100644 --- a/tests/camera2/camera2.cpp +++ b/tests/camera2/camera2.cpp @@ -387,7 +387,7 @@ TEST_F(Camera2Test, Capture1Raw) { camera_metadata_t *request; request = allocate_camera_metadata(20, 2000); - uint8_t metadataMode = ANDROID_REQUEST_METADATA_FULL; + uint8_t metadataMode = ANDROID_REQUEST_METADATA_MODE_FULL; add_camera_metadata_entry(request, ANDROID_REQUEST_METADATA_MODE, (void**)&metadataMode, 1); @@ -504,7 +504,7 @@ TEST_F(Camera2Test, CaptureBurstRaw) { camera_metadata_t *request; request = allocate_camera_metadata(20, 2000); - uint8_t metadataMode = ANDROID_REQUEST_METADATA_FULL; + uint8_t metadataMode = ANDROID_REQUEST_METADATA_MODE_FULL; add_camera_metadata_entry(request, ANDROID_REQUEST_METADATA_MODE, (void**)&metadataMode, 1); @@ -669,7 +669,7 @@ TEST_F(Camera2Test, Capture1Jpeg) { camera_metadata_t *request; request = allocate_camera_metadata(20, 2000); - uint8_t metadataMode = ANDROID_REQUEST_METADATA_FULL; + uint8_t metadataMode = ANDROID_REQUEST_METADATA_MODE_FULL; add_camera_metadata_entry(request, ANDROID_REQUEST_METADATA_MODE, (void**)&metadataMode, 1); |