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

Camera: update test per interface change

Browse source 
CameraModule does not allow for accessing raw module pointer
anymore. Also cleanup some warnings.

Bug: 19897963

Change-Id: I111cc093f09f5fb3c4b13693d5d0687e1f441058
This commit is contained in:
Yin-Chia Yeh 2015-03-24 10:48:08 -07:00
parent 889dd06032
commit c253765481
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/camera2/CameraModuleFixture.h
View file

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

3
tests/camera2/CameraMultiStreamTests.cpp
View file

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

2
tests/camera2/CameraStreamFixture.h
View file

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

7
tests/camera2/camera2_utils.cpp
View file

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

2
tests/camera2/camera2_utils.h
View file

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