diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2014-08-30 00:28:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-30 00:28:09 +0000 |
| commit | 03f2f0fa72ef3d5c6eb146cfcb193892d8e1b32d (patch) | |
| tree | 66965a07f9c606b0e1bdadd40a5e43d7f5768ad5 | |
| parent | 3bfbb811d006ddc583e05b78df291d8fc3fbba47 (diff) | |
| parent | 17b1dd5bf1821d7d326c74192779b54c15eed1a8 (diff) | |
| download | android_system_media-03f2f0fa72ef3d5c6eb146cfcb193892d8e1b32d.tar.gz android_system_media-03f2f0fa72ef3d5c6eb146cfcb193892d8e1b32d.tar.bz2 android_system_media-03f2f0fa72ef3d5c6eb146cfcb193892d8e1b32d.zip | |
Merge "camera2: Add back HDR scenemode." into lmp-dev
| -rw-r--r-- | camera/docs/docs.html | 12 | ||||
| -rw-r--r-- | camera/docs/metadata_properties.xml | 5 | ||||
| -rw-r--r-- | camera/include/system/camera_metadata_tags.h | 1 | ||||
| -rw-r--r-- | camera/src/camera_metadata_tag_info.c | 4 |
4 files changed, 22 insertions, 0 deletions
diff --git a/camera/docs/docs.html b/camera/docs/docs.html index fabf3390..8fb5c3d3 100644 --- a/camera/docs/docs.html +++ b/camera/docs/docs.html @@ -3565,6 +3565,12 @@ by the camera device.<wbr/></p> reconfigurations,<wbr/> which may introduce extra latency.<wbr/> It is recommended that the application avoids unnecessary scene mode switch as much as possible.<wbr/></p></span> </li> + <li> + <span class="entry_type_enum_name">HDR</span> + <span class="entry_type_enum_optional">[optional]</span> + <span class="entry_type_enum_optional">[hidden]</span> + <span class="entry_type_enum_notes"><p>Turn on custom high dynamic range (HDR) mode.<wbr/></p></span> + </li> </ul> </td> <!-- entry_type --> @@ -7407,6 +7413,12 @@ by the camera device.<wbr/></p> reconfigurations,<wbr/> which may introduce extra latency.<wbr/> It is recommended that the application avoids unnecessary scene mode switch as much as possible.<wbr/></p></span> </li> + <li> + <span class="entry_type_enum_name">HDR</span> + <span class="entry_type_enum_optional">[optional]</span> + <span class="entry_type_enum_optional">[hidden]</span> + <span class="entry_type_enum_notes"><p>Turn on custom high dynamic range (HDR) mode.<wbr/></p></span> + </li> </ul> </td> <!-- entry_type --> diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml index 816790a8..af95dac2 100644 --- a/camera/docs/metadata_properties.xml +++ b/camera/docs/metadata_properties.xml @@ -1449,6 +1449,11 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata the application avoids unnecessary scene mode switch as much as possible. </notes> </value> + <value optional="true" hidden="true">HDR + <notes> + Turn on custom high dynamic range (HDR) mode. + </notes> + </value> </enum> <description> A camera mode optimized for conditions typical in a particular diff --git a/camera/include/system/camera_metadata_tags.h b/camera/include/system/camera_metadata_tags.h index c66ae3e3..0bc09cd5 100644 --- a/camera/include/system/camera_metadata_tags.h +++ b/camera/include/system/camera_metadata_tags.h @@ -514,6 +514,7 @@ typedef enum camera_metadata_enum_android_control_scene_mode { ANDROID_CONTROL_SCENE_MODE_CANDLELIGHT, ANDROID_CONTROL_SCENE_MODE_BARCODE, ANDROID_CONTROL_SCENE_MODE_HIGH_SPEED_VIDEO, + ANDROID_CONTROL_SCENE_MODE_HDR, } camera_metadata_enum_android_control_scene_mode_t; // ANDROID_CONTROL_VIDEO_STABILIZATION_MODE diff --git a/camera/src/camera_metadata_tag_info.c b/camera/src/camera_metadata_tag_info.c index ec383e3d..fdf41ff7 100644 --- a/camera/src/camera_metadata_tag_info.c +++ b/camera/src/camera_metadata_tag_info.c @@ -1071,6 +1071,10 @@ int camera_metadata_enum_snprint(uint32_t tag, msg = "HIGH_SPEED_VIDEO"; ret = 0; break; + case ANDROID_CONTROL_SCENE_MODE_HDR: + msg = "HDR"; + ret = 0; + break; default: msg = "error: enum value out of range"; } |