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

modules: camera: Metadata refactor

Browse Source 
Add* functions const to protect data being added.
Initiailze metadata object from a camera_metadata_t.
Remove template-specific constructor.
Add convenience "add1" method to abvoid stack-allocated data.
Construct templates manually (in ExampleCamera) from base.

Change-Id: I3201f61e9d32841ea7a769d69242b40d8727c02e
This commit is contained in:
Alex Ray
2013-10-21 12:55:24 -07:00
parent 69f1f9166a
commit 62735086ed
6 changed files with 200 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
modules/camera/ExampleCamera.cpp
View File

@@ -174,31 +174,84 @@ camera_metadata_t *ExampleCamera::initStaticInfo()
/* End of static camera characteristics */
return clone_camera_metadata(m.generate());
return clone_camera_metadata(m.get());
}
int ExampleCamera::initDevice()
{
// Create standard settings templates
Metadata preview = Metadata(ANDROID_CONTROL_MODE_OFF,
ANDROID_CONTROL_CAPTURE_INTENT_PREVIEW);
setTemplate(CAMERA3_TEMPLATE_PREVIEW, preview.generate());
Metadata capture = Metadata(ANDROID_CONTROL_MODE_OFF,
ANDROID_CONTROL_CAPTURE_INTENT_STILL_CAPTURE);
setTemplate(CAMERA3_TEMPLATE_STILL_CAPTURE, capture.generate());
Metadata record = Metadata(ANDROID_CONTROL_MODE_OFF,
ANDROID_CONTROL_CAPTURE_INTENT_VIDEO_RECORD);
setTemplate(CAMERA3_TEMPLATE_VIDEO_RECORD, record.generate());
Metadata snapshot = Metadata(ANDROID_CONTROL_MODE_OFF,
ANDROID_CONTROL_CAPTURE_INTENT_VIDEO_SNAPSHOT);
setTemplate(CAMERA3_TEMPLATE_VIDEO_SNAPSHOT, snapshot.generate());
Metadata zsl = Metadata(ANDROID_CONTROL_MODE_OFF,
ANDROID_CONTROL_CAPTURE_INTENT_ZERO_SHUTTER_LAG);
setTemplate(CAMERA3_TEMPLATE_ZERO_SHUTTER_LAG, zsl.generate());
int res;
Metadata base;
// Create standard settings templates from copies of base metadata
// TODO: use vendor tags in base metadata
if (res = base.add1UInt8(ANDROID_CONTROL_MODE, ANDROID_CONTROL_MODE_OFF))
return res;
// Use base settings to create all other templates and set them
if (res = setPreviewTemplate(base)) return res;
if (res = setStillTemplate(base)) return res;
if (res = setRecordTemplate(base)) return res;
if (res = setSnapshotTemplate(base)) return res;
if (res = setZslTemplate(base)) return res;
return 0;
}
int ExampleCamera::setPreviewTemplate(Metadata m)
{
int res;
// Setup default preview controls
if (res = m.add1UInt8(ANDROID_CONTROL_CAPTURE_INTENT,
ANDROID_CONTROL_CAPTURE_INTENT_PREVIEW))
return res;
// TODO: set fast auto-focus, auto-whitebalance, auto-exposure, auto flash
return setTemplate(CAMERA3_TEMPLATE_PREVIEW, m.get());
}
int ExampleCamera::setStillTemplate(Metadata m)
{
int res;
// Setup default still capture controls
if (res = m.add1UInt8(ANDROID_CONTROL_CAPTURE_INTENT,
ANDROID_CONTROL_CAPTURE_INTENT_STILL_CAPTURE))
return res;
// TODO: set fast auto-focus, auto-whitebalance, auto-exposure, auto flash
return setTemplate(CAMERA3_TEMPLATE_STILL_CAPTURE, m.get());
}
int ExampleCamera::setRecordTemplate(Metadata m)
{
int res;
// Setup default video record controls
if (res = m.add1UInt8(ANDROID_CONTROL_CAPTURE_INTENT,
ANDROID_CONTROL_CAPTURE_INTENT_VIDEO_RECORD))
return res;
// TODO: set slow auto-focus, auto-whitebalance, auto-exposure, flash off
return setTemplate(CAMERA3_TEMPLATE_VIDEO_RECORD, m.get());
}
int ExampleCamera::setSnapshotTemplate(Metadata m)
{
int res;
// Setup default video snapshot controls
if (res = m.add1UInt8(ANDROID_CONTROL_CAPTURE_INTENT,
ANDROID_CONTROL_CAPTURE_INTENT_VIDEO_SNAPSHOT))
return res;
// TODO: set slow auto-focus, auto-whitebalance, auto-exposure, flash off
return setTemplate(CAMERA3_TEMPLATE_VIDEO_SNAPSHOT, m.get());
}
int ExampleCamera::setZslTemplate(Metadata m)
{
int res;
// Setup default zero shutter lag controls
if (res = m.add1UInt8(ANDROID_CONTROL_CAPTURE_INTENT,
ANDROID_CONTROL_CAPTURE_INTENT_ZERO_SHUTTER_LAG))
return res;
// TODO: set reprocessing parameters for zsl input queue
return setTemplate(CAMERA3_TEMPLATE_ZERO_SHUTTER_LAG, m.get());
}
bool ExampleCamera::isValidCaptureSettings(const camera_metadata_t* settings)
{
// TODO: reject settings that cannot be captured