Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Camera: Add default camera provider 2.4

Browse Source 
Supports legacy camera HAL modules; also exports ICameraDevice
instances.

Test: compile
Bug: 30985004
Change-Id: I2b9624a412de95dd43979a5e6650b170010c577a
This commit is contained in:
Yin-Chia Yeh
2016-12-14 19:13:15 -08:00
parent faef8f92c9
commit f906b3bbbb
8 changed files with 603 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
camera/common/1.0/default/CameraModule.cpp
View File

@@ -344,7 +344,7 @@ int CameraModule::open(const char* id, struct hw_device_t** device) {
return res;
}
bool CameraModule::isOpenLegacyDefined() {
bool CameraModule::isOpenLegacyDefined() const {
if (getModuleApiVersion() < CAMERA_MODULE_API_VERSION_2_3) {
return false;
}
@@ -376,7 +376,7 @@ int CameraModule::setCallbacks(const camera_module_callbacks_t *callbacks) {
return res;
}
bool CameraModule::isVendorTagDefined() {
bool CameraModule::isVendorTagDefined() const {
return mModule->get_vendor_tag_ops != NULL;
}
@@ -388,11 +388,25 @@ void CameraModule::getVendorTagOps(vendor_tag_ops_t* ops) {
}
}
bool CameraModule::isSetTorchModeSupported() const {
if (getModuleApiVersion() >= CAMERA_MODULE_API_VERSION_2_4) {
if (mModule->set_torch_mode == NULL) {
ALOGE("%s: Module 2.4 device must support set torch API!",
__FUNCTION__);
return false;
}
return true;
}
return false;
}
int CameraModule::setTorchMode(const char* camera_id, bool enable) {
int res;
ATRACE_BEGIN("camera_module->set_torch_mode");
res = mModule->set_torch_mode(camera_id, enable);
ATRACE_END();
int res = INVALID_OPERATION;
if (mModule->set_torch_mode != NULL) {
ATRACE_BEGIN("camera_module->set_torch_mode");
res = mModule->set_torch_mode(camera_id, enable);
ATRACE_END();
}
return res;
}
@@ -409,19 +423,19 @@ status_t CameraModule::filterOpenErrorCode(status_t err) {
return -ENODEV;
}
uint16_t CameraModule::getModuleApiVersion() {
uint16_t CameraModule::getModuleApiVersion() const {
return mModule->common.module_api_version;
}
const char* CameraModule::getModuleName() {
const char* CameraModule::getModuleName() const {
return mModule->common.name;
}
uint16_t CameraModule::getHalApiVersion() {
uint16_t CameraModule::getHalApiVersion() const {
return mModule->common.hal_api_version;
}
const char* CameraModule::getModuleAuthor() {
const char* CameraModule::getModuleAuthor() const {
return mModule->common.author;
}