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

Merge "Camera: synchronize access to mMemoryMap" into oc-mr1-dev

Browse source
This commit is contained in:
TreeHugger Robot 2017-09-14 21:50:21 +00:00 committed by Android (Google) Code Review
commit e79124c62b
2 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
camera/device/1.0/default/CameraDevice.cpp
View file

@ -377,10 +377,14 @@ camera_memory_t* CameraDevice::sGetMemory(int fd, size_t buf_size, uint_t num_bu
hidl_handle hidlHandle = mem->mHidlHandle; hidl_handle hidlHandle = mem->mHidlHandle;
MemoryId id = object->mDeviceCallback->registerMemory(hidlHandle, buf_size, num_bufs); MemoryId id = object->mDeviceCallback->registerMemory(hidlHandle, buf_size, num_bufs);
mem->handle.mId = id; mem->handle.mId = id;
if (object->mMemoryMap.count(id) != 0) {
ALOGE("%s: duplicate MemoryId %d returned by client!", __FUNCTION__, id); {
Mutex::Autolock _l(object->mMemoryMapLock);
if (object->mMemoryMap.count(id) != 0) {
ALOGE("%s: duplicate MemoryId %d returned by client!", __FUNCTION__, id);
}
object->mMemoryMap[id] = mem;
} }
object->mMemoryMap[id] = mem;
mem->handle.mDevice = object; mem->handle.mDevice = object;
return &mem->handle; return &mem->handle;
} }
@ -398,7 +402,10 @@ void CameraDevice::sPutMemory(camera_memory_t *data) {
ALOGE("%s: camera HAL return memory while camera is not opened!", __FUNCTION__); ALOGE("%s: camera HAL return memory while camera is not opened!", __FUNCTION__);
} }
device->mDeviceCallback->unregisterMemory(mem->handle.mId); device->mDeviceCallback->unregisterMemory(mem->handle.mId);
device->mMemoryMap.erase(mem->handle.mId); {
Mutex::Autolock _l(device->mMemoryMapLock);
device->mMemoryMap.erase(mem->handle.mId);
}
mem->decStrong(mem); mem->decStrong(mem);
} }
@ -826,7 +833,16 @@ void CameraDevice::releaseRecordingFrameLocked(
return; return;
} }
if (mDevice->ops->release_recording_frame) { if (mDevice->ops->release_recording_frame) {
CameraHeapMemory* camMemory = mMemoryMap.at(memId); CameraHeapMemory* camMemory;
{
Mutex::Autolock _l(mMemoryMapLock);
auto it = mMemoryMap.find(memId);
if (it == mMemoryMap.end() || it->second == nullptr) {
ALOGE("%s unknown memoryId %d", __FUNCTION__, memId);
return;
}
camMemory = it->second;
}
if (bufferIndex >= camMemory->mNumBufs) { if (bufferIndex >= camMemory->mNumBufs) {
ALOGE("%s: bufferIndex %d exceeds number of buffers %d", ALOGE("%s: bufferIndex %d exceeds number of buffers %d",
__FUNCTION__, bufferIndex, camMemory->mNumBufs); __FUNCTION__, bufferIndex, camMemory->mNumBufs);

2
camera/device/1.0/default/CameraDevice_1_0.h
View file

@ -165,6 +165,8 @@ private:
sp<ICameraDeviceCallback> mDeviceCallback = nullptr; sp<ICameraDeviceCallback> mDeviceCallback = nullptr;
mutable Mutex mMemoryMapLock; // gating access to mMemoryMap
// must not hold mLock after this lock is acquired
std::unordered_map<MemoryId, CameraHeapMemory*> mMemoryMap; std::unordered_map<MemoryId, CameraHeapMemory*> mMemoryMap;
bool mMetadataMode = false; bool mMetadataMode = false;