LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EmulatedFakeCamera2: Add shim to work around FORMAT_ZSL.

Browse Source 
Emulator does not need FORMAT_ZSL, so treat it as
IMPLEMENTATION_DEFINED.

Bug: 6243944
Change-Id: I9eeb48f6197ff9979f7823b8dc912346158fd6f1
This commit is contained in:
Eino-Ville Talvala
2012-09-13 16:33:26 -07:00
parent 91615e7f5a
commit d6046a445f
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/emulator/system/camera/EmulatedFakeCamera2.cpp
View File

@@ -266,6 +266,11 @@ int EmulatedFakeCamera2::allocateStream(
uint32_t *max_buffers) { uint32_t *max_buffers) {
Mutex::Autolock l(mMutex); Mutex::Autolock l(mMutex);
// Temporary shim until FORMAT_ZSL is removed
if (format == CAMERA2_HAL_PIXEL_FORMAT_ZSL) {
format = HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED;
}
if (format != HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED) { if (format != HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED) {
unsigned int numFormats = sizeof(kAvailableFormats) / sizeof(uint32_t); unsigned int numFormats = sizeof(kAvailableFormats) / sizeof(uint32_t);
unsigned int formatIdx = 0; unsigned int formatIdx = 0;