am 7adaeb6e: am d6046a44: EmulatedFakeCamera2: Add shim to work around FORMAT_ZSL.

* commit '7adaeb6ed479f667bceaae0af27fa997eb6afea6':
  EmulatedFakeCamera2: Add shim to work around FORMAT_ZSL.
This commit is contained in:
Eino-Ville Talvala
2012-09-17 11:09:05 -07:00
committed by Android Git Automerger

View File

@@ -266,6 +266,11 @@ int EmulatedFakeCamera2::allocateStream(
uint32_t *max_buffers) {
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) {
unsigned int numFormats = sizeof(kAvailableFormats) / sizeof(uint32_t);
unsigned int formatIdx = 0;