Piteball
/
android_device_asus_flo
mirror of https://github.com/followmsi/android_device_asus_flo.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

QCamera3: Scene Mode Fix 

Map FACE_PRIORITY mode as Auto Scene Mode, so that
we don't have undefined behavior.

Bug: 11045793

Change-Id: Iaa7a30eef902c2ca0a700c498f88b7c77aa441fa
Signed-off-by: Daniel Jarai <jaraidaniel@gmail.com>
This commit is contained in:
Shuzhen Wang 2013-09-28 18:32:44 -07:00 committed by Artem Borisov
parent 20545401d3
commit 92a138f8ab
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
camera/QCamera2/HAL3/QCamera3HWI.cpp
View File

@ -79,6 +79,7 @@ const QCamera3HardwareInterface::QCameraMap QCamera3HardwareInterface::WHITE_BAL
};
const QCamera3HardwareInterface::QCameraMap QCamera3HardwareInterface::SCENE_MODES_MAP[] = {
{ ANDROID_CONTROL_SCENE_MODE_FACE_PRIORITY, CAM_SCENE_MODE_OFF },
{ ANDROID_CONTROL_SCENE_MODE_ACTION, CAM_SCENE_MODE_ACTION },
{ ANDROID_CONTROL_SCENE_MODE_PORTRAIT, CAM_SCENE_MODE_PORTRAIT },
{ ANDROID_CONTROL_SCENE_MODE_LANDSCAPE, CAM_SCENE_MODE_LANDSCAPE },
@ -3442,11 +3443,11 @@ int QCamera3HardwareInterface::translateMetadataToParameters(
rc = AddSetParmEntryToBatch(mParameters, CAM_INTF_PARM_BESTSHOT_MODE,
sizeof(sceneMode), &sceneMode);
} else if (metaMode == ANDROID_CONTROL_MODE_OFF) {
uint8_t sceneMode = 0;//CAMERA_BESTSHOT_OFF;
uint8_t sceneMode = CAM_SCENE_MODE_OFF;
rc = AddSetParmEntryToBatch(mParameters, CAM_INTF_PARM_BESTSHOT_MODE,
sizeof(sceneMode), &sceneMode);
} else if (metaMode == ANDROID_CONTROL_MODE_AUTO) {
uint8_t sceneMode = 0;//CAMERA_BESTSHOT_OFF;
uint8_t sceneMode = CAM_SCENE_MODE_OFF;
rc = AddSetParmEntryToBatch(mParameters, CAM_INTF_PARM_BESTSHOT_MODE,
sizeof(sceneMode), &sceneMode);
}