diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/camera2/CameraModuleFixture.h | 4 | ||||
-rw-r--r-- | tests/camera2/CameraMultiStreamTests.cpp | 3 | ||||
-rw-r--r-- | tests/camera2/CameraStreamFixture.h | 2 | ||||
-rw-r--r-- | tests/camera2/camera2_utils.cpp | 7 | ||||
-rw-r--r-- | tests/camera2/camera2_utils.h | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/tests/camera2/CameraModuleFixture.h b/tests/camera2/CameraModuleFixture.h index bf82a97..3a2df69 100644 --- a/tests/camera2/CameraModuleFixture.h +++ b/tests/camera2/CameraModuleFixture.h @@ -65,7 +65,7 @@ struct CameraModuleFixture { ASSERT_LE(0, mNumberOfCameras); ASSERT_LE( - CAMERA_MODULE_API_VERSION_2_0, mModule->getRawModule()->module_api_version) + CAMERA_MODULE_API_VERSION_2_0, mModule->getModuleApiVersion()) << "Wrong module API version"; /* For using this fixture in other tests only */ @@ -83,7 +83,7 @@ struct CameraModuleFixture { mDevice.clear(); if (!TEST_EXTENSION_FORKING_ENABLED) { - ASSERT_EQ(0, HWModuleHelpers::closeModule(mModule->getRawModule())) + ASSERT_EQ(0, HWModuleHelpers::closeModule(mModule->getDso())) << "Failed to close camera HAL module"; } } diff --git a/tests/camera2/CameraMultiStreamTests.cpp b/tests/camera2/CameraMultiStreamTests.cpp index bfadfea..0f8d578 100644 --- a/tests/camera2/CameraMultiStreamTests.cpp +++ b/tests/camera2/CameraMultiStreamTests.cpp @@ -528,7 +528,8 @@ TEST_F(CameraMultiStreamTest, DISABLED_MultiBurst) { // Find the right sizes for preview, metering, and capture streams int64_t minFrameDuration = DEFAULT_FRAME_DURATION; - Size processedMinSize, processedMaxSize, jpegMaxSize; + Size processedMinSize = {0, 0}, processedMaxSize = {0, 0}; + Size jpegMaxSize = {0, 0}; int32_t minIdx, maxIdx; GetMinSize(implDefData, implDefCount, &processedMinSize, &minIdx); diff --git a/tests/camera2/CameraStreamFixture.h b/tests/camera2/CameraStreamFixture.h index 8a8c27d..e234f7e 100644 --- a/tests/camera2/CameraStreamFixture.h +++ b/tests/camera2/CameraStreamFixture.h @@ -111,7 +111,7 @@ private: mHeight = entry.data.i32[1]; } else { buildOutputResolutions(); - const int32_t *implDefResolutions; + const int32_t *implDefResolutions = NULL; size_t implDefResolutionsCount; int format = HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED; diff --git a/tests/camera2/camera2_utils.cpp b/tests/camera2/camera2_utils.cpp index 930b909..d962939 100644 --- a/tests/camera2/camera2_utils.cpp +++ b/tests/camera2/camera2_utils.cpp @@ -580,14 +580,13 @@ void FrameWaiter::onFrameAvailable(const BufferItem& /* item */) { mCondition.signal(); } -int HWModuleHelpers::closeModule(const hw_module_t* module) { +int HWModuleHelpers::closeModule(void *dso) { int status; - - if (!module) { + if (!dso) { return -EINVAL; } - status = dlclose(module->dso); + status = dlclose(dso); if (status != 0) { char const *err_str = dlerror(); ALOGE("%s dlclose failed, error: %s", __func__, err_str ?: "unknown"); diff --git a/tests/camera2/camera2_utils.h b/tests/camera2/camera2_utils.h index 2072eb6..ab1fcfb 100644 --- a/tests/camera2/camera2_utils.h +++ b/tests/camera2/camera2_utils.h @@ -240,7 +240,7 @@ class FrameWaiter : public CpuConsumer::FrameAvailableListener { struct HWModuleHelpers { /* attempt to unload the library with dlclose */ - static int closeModule(const hw_module_t* module); + static int closeModule(void* dso); }; } |