diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2013-06-25 18:12:19 -0700 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2013-06-27 18:02:24 -0700 |
| commit | 4c543a1456cd34a94e2c3a09879aa65ed8cd2f3a (patch) | |
| tree | 15bf4a8edf1aecdf2bf59b3f88c5ba3e07a923b6 /tests/camera2/CameraFrameTests.cpp | |
| parent | 1a70c0fd39eed070c2c28fc0731fa689d15931c4 (diff) | |
| download | hardware_libhardware-4c543a1456cd34a94e2c3a09879aa65ed8cd2f3a.zip hardware_libhardware-4c543a1456cd34a94e2c3a09879aa65ed8cd2f3a.tar.gz hardware_libhardware-4c543a1456cd34a94e2c3a09879aa65ed8cd2f3a.tar.bz2 | |
Enable native HAL tests to work for camera3 devices
Change-Id: Ie11270cc8cf301ec94795b595f0517ee3bad2817
Diffstat (limited to 'tests/camera2/CameraFrameTests.cpp')
| -rw-r--r-- | tests/camera2/CameraFrameTests.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/camera2/CameraFrameTests.cpp b/tests/camera2/CameraFrameTests.cpp index 2b5b546..8445098 100644 --- a/tests/camera2/CameraFrameTests.cpp +++ b/tests/camera2/CameraFrameTests.cpp @@ -23,7 +23,7 @@ #include "hardware/hardware.h" #include "hardware/camera2.h" -#include "Camera2Device.h" +#include "CameraDeviceBase.h" #include "utils/StrongPointer.h" #include <gui/CpuConsumer.h> @@ -46,7 +46,7 @@ namespace camera2 { namespace tests { static CameraStreamParams STREAM_PARAMETERS = { - /*mFormat*/ HAL_PIXEL_FORMAT_YCrCb_420_SP, + /*mFormat*/ CAMERA_STREAM_AUTO_CPU_FORMAT, /*mHeapCount*/ CAMERA_HEAP_COUNT }; @@ -139,4 +139,3 @@ INSTANTIATE_TEST_CASE_P(FrameParameterCombinations, CameraFrameTest, } } } - |