summaryrefslogtreecommitdiffstats
path: root/camera/src
diff options
context:
space:
mode:
authorZhijun He <zhijunhe@google.com>2014-06-12 10:43:32 -0700
committerZhijun He <zhijunhe@google.com>2014-06-13 14:16:28 -0700
commit91449c87365cc8f6495dd290cc08f0996a9c5129 (patch)
tree3ae33b1bb2bd1f4736857049e84eb7bc02065554 /camera/src
parentb432916043290beb246054a77f8978b3136f4315 (diff)
downloadandroid_system_media-91449c87365cc8f6495dd290cc08f0996a9c5129.tar.gz
android_system_media-91449c87365cc8f6495dd290cc08f0996a9c5129.tar.bz2
android_system_media-91449c87365cc8f6495dd290cc08f0996a9c5129.zip
camera_metadata: Add timestampCalibration tag
Also update the video/optical stabilization docs. Change-Id: I444cc8d46c0a460bc4311e58bf6166b5c6dbfd14
Diffstat (limited to 'camera/src')
-rw-r--r--camera/src/camera_metadata_tag_info.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/camera/src/camera_metadata_tag_info.c b/camera/src/camera_metadata_tag_info.c
index 5c20df17..383f8256 100644
--- a/camera/src/camera_metadata_tag_info.c
+++ b/camera/src/camera_metadata_tag_info.c
@@ -485,6 +485,8 @@ static tag_info_t android_sensor_info[ANDROID_SENSOR_INFO_END -
{ "pixelArraySize", TYPE_INT32 },
[ ANDROID_SENSOR_INFO_WHITE_LEVEL - ANDROID_SENSOR_INFO_START ] =
{ "whiteLevel", TYPE_INT32 },
+ [ ANDROID_SENSOR_INFO_TIMESTAMP_CALIBRATION - ANDROID_SENSOR_INFO_START ] =
+ { "timestampCalibration", TYPE_BYTE },
};
static tag_info_t android_shading[ANDROID_SHADING_END -
@@ -1952,6 +1954,21 @@ int camera_metadata_enum_snprint(uint32_t tag,
case ANDROID_SENSOR_INFO_WHITE_LEVEL: {
break;
}
+ case ANDROID_SENSOR_INFO_TIMESTAMP_CALIBRATION: {
+ switch (value) {
+ case ANDROID_SENSOR_INFO_TIMESTAMP_CALIBRATION_UNCALIBRATED:
+ msg = "UNCALIBRATED";
+ ret = 0;
+ break;
+ case ANDROID_SENSOR_INFO_TIMESTAMP_CALIBRATION_CALIBRATED:
+ msg = "CALIBRATED";
+ ret = 0;
+ break;
+ default:
+ msg = "error: enum value out of range";
+ }
+ break;
+ }
case ANDROID_SHADING_MODE: {
switch (value) {