Camera2: Doc entries no longer have type='enum', instead they use enum='true': DO NOT MERGE
* This allows all entries to have any backing type
(usually a byte, but for availableFormats it's int32)
* No longer need special casing for availableFormats
* No longer need to coerce an enum type into a byte
Change-Id: Ib1d4b93521e90f243b54f66c3d4c4b35032bc06a
diff --git a/camera/docs/camera_metadata_tag_info.mako b/camera/docs/camera_metadata_tag_info.mako
index 26ba619..bfe5d86 100644
--- a/camera/docs/camera_metadata_tag_info.mako
+++ b/camera/docs/camera_metadata_tag_info.mako
@@ -49,11 +49,7 @@
${path_name(sec) | csym}_START] = {
% for entry in find_unique_entries(sec):
[ ${entry.name | csym} - ${path_name(sec) | csym}_START ] =
- % if entry.name == "android.scaler.availableFormats": #FIXME: support enums separately from the data type?
- { ${'"%s",' %(entry.name_short) | pad(40)} ${"int32" | ctype_enum,ljust(11)} },
- % else:
{ ${'"%s",' %(entry.name_short) | pad(40)} ${entry.type | ctype_enum,ljust(11)} },
- % endif
% endfor
};
@@ -76,7 +72,7 @@
% for sec in find_all_sections(metadata):
% for idx,entry in enumerate(find_unique_entries(sec)):
case ${entry.name | csym}: {
- % if entry.type == 'enum':
+ % if entry.enum:
switch (value) {
% for val in entry.enum.values:
case ${entry.name | csym}_${val.name}:
diff --git a/camera/docs/camera_metadata_tags.mako b/camera/docs/camera_metadata_tags.mako
index 275510d..d7a5564 100644
--- a/camera/docs/camera_metadata_tags.mako
+++ b/camera/docs/camera_metadata_tags.mako
@@ -81,7 +81,7 @@
% for sec in find_all_sections(metadata):
% for entry in find_unique_entries(sec):
- % if entry.type == 'enum':
+ % if entry.enum:
// ${entry.name | csym}
typedef enum camera_metadata_enum_${csym(entry.name).lower()} {
% for val in entry.enum.values:
diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index bcf28c8..845c9d4 100644
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -41,6 +41,7 @@
/* Entry type flair */
.entry_type_name { color: darkgreen; font-weight: bold; }
+ .entry_type_name_enum:after { color: darkgreen; font-weight: bold; content:" (enum)" }
.entry_type_enum_name { font-family: monospace; font-weight: bolder; }
.entry_type_enum_notes:before { content:" - " }
.entry_type_enum_value:before { content:" = " }
@@ -389,7 +390,7 @@
<tr class="entry" id="controls_android.colorCorrection.mode">
<td class="entry_name">android.<wbr>color<wbr>Correction.<wbr>mode</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -434,7 +435,7 @@
<tr class="entry" id="controls_android.colorCorrection.transform">
<td class="entry_name">android.<wbr>color<wbr>Correction.<wbr>transform</td>
<td class="entry_type">
- <span class="entry_type_name">float</span>
+ <span class="entry_type_name">float</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -505,7 +506,7 @@
<tr class="entry" id="dynamic_android.colorCorrection.mode">
<td class="entry_name">android.<wbr>color<wbr>Correction.<wbr>mode</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -583,7 +584,7 @@
<tr class="entry" id="controls_android.control.aeAntibandingMode">
<td class="entry_name">android.<wbr>control.<wbr>ae<wbr>Antibanding<wbr>Mode</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -629,7 +630,7 @@
<tr class="entry" id="controls_android.control.aeExposureCompensation">
<td class="entry_name">android.<wbr>control.<wbr>ae<wbr>Exposure<wbr>Compensation</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
@@ -665,7 +666,7 @@
<tr class="entry" id="controls_android.control.aeLock">
<td class="entry_name">android.<wbr>control.<wbr>ae<wbr>Lock</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -713,7 +714,7 @@
<tr class="entry" id="controls_android.control.aeMode">
<td class="entry_name">android.<wbr>control.<wbr>ae<wbr>Mode</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -781,7 +782,7 @@
<tr class="entry" id="controls_android.control.aeRegions">
<td class="entry_name">android.<wbr>control.<wbr>ae<wbr>Regions</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -830,7 +831,7 @@
<tr class="entry" id="controls_android.control.aeTargetFpsRange">
<td class="entry_name">android.<wbr>control.<wbr>ae<wbr>Target<wbr>Fps<wbr>Range</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -869,7 +870,7 @@
<tr class="entry" id="controls_android.control.afMode">
<td class="entry_name">android.<wbr>control.<wbr>af<wbr>Mode</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -976,7 +977,7 @@
<tr class="entry" id="controls_android.control.afRegions">
<td class="entry_name">android.<wbr>control.<wbr>af<wbr>Regions</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -1025,7 +1026,7 @@
<tr class="entry" id="controls_android.control.awbLock">
<td class="entry_name">android.<wbr>control.<wbr>awb<wbr>Lock</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -1074,7 +1075,7 @@
<tr class="entry" id="controls_android.control.awbMode">
<td class="entry_name">android.<wbr>control.<wbr>awb<wbr>Mode</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -1137,7 +1138,7 @@
<tr class="entry" id="controls_android.control.awbRegions">
<td class="entry_name">android.<wbr>control.<wbr>awb<wbr>Regions</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -1186,7 +1187,7 @@
<tr class="entry" id="controls_android.control.captureIntent">
<td class="entry_name">android.<wbr>control.<wbr>capture<wbr>Intent</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -1257,7 +1258,7 @@
<tr class="entry" id="controls_android.control.effectMode">
<td class="entry_name">android.<wbr>control.<wbr>effect<wbr>Mode</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -1327,7 +1328,7 @@
<tr class="entry" id="controls_android.control.mode">
<td class="entry_name">android.<wbr>control.<wbr>mode</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -1385,7 +1386,7 @@
<tr class="entry" id="controls_android.control.sceneMode">
<td class="entry_name">android.<wbr>control.<wbr>scene<wbr>Mode</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -1495,7 +1496,7 @@
<tr class="entry" id="controls_android.control.videoStabilizationMode">
<td class="entry_name">android.<wbr>control.<wbr>video<wbr>Stabilization<wbr>Mode</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -1566,7 +1567,7 @@
<tr class="entry" id="static_android.control.aeAvailableAntibandingModes">
<td class="entry_name">android.<wbr>control.<wbr>ae<wbr>Available<wbr>Antibanding<wbr>Modes</td>
<td class="entry_type">
- <span class="entry_type_name">byte</span>
+ <span class="entry_type_name">byte</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -1601,7 +1602,7 @@
<tr class="entry" id="static_android.control.aeAvailableModes">
<td class="entry_name">android.<wbr>control.<wbr>ae<wbr>Available<wbr>Modes</td>
<td class="entry_type">
- <span class="entry_type_name">byte</span>
+ <span class="entry_type_name">byte</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -1639,7 +1640,7 @@
<tr class="entry" id="static_android.control.aeAvailableTargetFpsRanges">
<td class="entry_name">android.<wbr>control.<wbr>ae<wbr>Available<wbr>Target<wbr>Fps<wbr>Ranges</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -1674,7 +1675,7 @@
<tr class="entry" id="static_android.control.aeCompensationRange">
<td class="entry_name">android.<wbr>control.<wbr>ae<wbr>Compensation<wbr>Range</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -1713,7 +1714,7 @@
<tr class="entry" id="static_android.control.aeCompensationStep">
<td class="entry_name">android.<wbr>control.<wbr>ae<wbr>Compensation<wbr>Step</td>
<td class="entry_type">
- <span class="entry_type_name">rational</span>
+ <span class="entry_type_name">rational</span>
@@ -1746,7 +1747,7 @@
<tr class="entry" id="static_android.control.afAvailableModes">
<td class="entry_name">android.<wbr>control.<wbr>af<wbr>Available<wbr>Modes</td>
<td class="entry_type">
- <span class="entry_type_name">byte</span>
+ <span class="entry_type_name">byte</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -1785,7 +1786,7 @@
<tr class="entry" id="static_android.control.availableEffects">
<td class="entry_name">android.<wbr>control.<wbr>available<wbr>Effects</td>
<td class="entry_type">
- <span class="entry_type_name">byte</span>
+ <span class="entry_type_name">byte</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -1823,7 +1824,7 @@
<tr class="entry" id="static_android.control.availableSceneModes">
<td class="entry_name">android.<wbr>control.<wbr>available<wbr>Scene<wbr>Modes</td>
<td class="entry_type">
- <span class="entry_type_name">byte</span>
+ <span class="entry_type_name">byte</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -1862,7 +1863,7 @@
<tr class="entry" id="static_android.control.availableVideoStabilizationModes">
<td class="entry_name">android.<wbr>control.<wbr>available<wbr>Video<wbr>Stabilization<wbr>Modes</td>
<td class="entry_type">
- <span class="entry_type_name">byte</span>
+ <span class="entry_type_name">byte</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -1900,7 +1901,7 @@
<tr class="entry" id="static_android.control.awbAvailableModes">
<td class="entry_name">android.<wbr>control.<wbr>awb<wbr>Available<wbr>Modes</td>
<td class="entry_type">
- <span class="entry_type_name">byte</span>
+ <span class="entry_type_name">byte</span>
@@ -1932,7 +1933,7 @@
<tr class="entry" id="static_android.control.maxRegions">
<td class="entry_name">android.<wbr>control.<wbr>max<wbr>Regions</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
@@ -1965,7 +1966,7 @@
<tr class="entry" id="static_android.control.sceneModeOverrides">
<td class="entry_name">android.<wbr>control.<wbr>scene<wbr>Mode<wbr>Overrides</td>
<td class="entry_type">
- <span class="entry_type_name">byte</span>
+ <span class="entry_type_name">byte</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -2050,7 +2051,7 @@
<tr class="entry" id="dynamic_android.control.aePrecaptureId">
<td class="entry_name">android.<wbr>control.<wbr>ae<wbr>Precapture<wbr>Id</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
@@ -2084,7 +2085,7 @@
<tr class="entry" id="dynamic_android.control.aeRegions">
<td class="entry_name">android.<wbr>control.<wbr>ae<wbr>Regions</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -2131,7 +2132,7 @@
<tr class="entry" id="dynamic_android.control.aeState">
<td class="entry_name">android.<wbr>control.<wbr>ae<wbr>State</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -2199,7 +2200,7 @@
<tr class="entry" id="dynamic_android.control.afMode">
<td class="entry_name">android.<wbr>control.<wbr>af<wbr>Mode</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -2304,7 +2305,7 @@
<tr class="entry" id="dynamic_android.control.afRegions">
<td class="entry_name">android.<wbr>control.<wbr>af<wbr>Regions</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -2351,7 +2352,7 @@
<tr class="entry" id="dynamic_android.control.afState">
<td class="entry_name">android.<wbr>control.<wbr>af<wbr>State</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -2420,7 +2421,7 @@
<tr class="entry" id="dynamic_android.control.afTriggerId">
<td class="entry_name">android.<wbr>control.<wbr>af<wbr>Trigger<wbr>Id</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
@@ -2453,7 +2454,7 @@
<tr class="entry" id="dynamic_android.control.awbMode">
<td class="entry_name">android.<wbr>control.<wbr>awb<wbr>Mode</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -2514,7 +2515,7 @@
<tr class="entry" id="dynamic_android.control.awbRegions">
<td class="entry_name">android.<wbr>control.<wbr>awb<wbr>Regions</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -2561,7 +2562,7 @@
<tr class="entry" id="dynamic_android.control.awbState">
<td class="entry_name">android.<wbr>control.<wbr>awb<wbr>State</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -2614,7 +2615,7 @@
<tr class="entry" id="dynamic_android.control.mode">
<td class="entry_name">android.<wbr>control.<wbr>mode</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -2703,7 +2704,7 @@
<tr class="entry" id="controls_android.demosaic.mode">
<td class="entry_name">android.<wbr>demosaic.<wbr>mode</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -2780,7 +2781,7 @@
<tr class="entry" id="controls_android.edge.mode">
<td class="entry_name">android.<wbr>edge.<wbr>mode</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -2826,7 +2827,7 @@
<tr class="entry" id="controls_android.edge.strength">
<td class="entry_name">android.<wbr>edge.<wbr>strength</td>
<td class="entry_type">
- <span class="entry_type_name">byte</span>
+ <span class="entry_type_name">byte</span>
@@ -2885,7 +2886,7 @@
<tr class="entry" id="dynamic_android.edge.mode">
<td class="entry_name">android.<wbr>edge.<wbr>mode</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -2964,7 +2965,7 @@
<tr class="entry" id="controls_android.flash.firingPower">
<td class="entry_name">android.<wbr>flash.<wbr>firing<wbr>Power</td>
<td class="entry_type">
- <span class="entry_type_name">byte</span>
+ <span class="entry_type_name">byte</span>
@@ -3000,7 +3001,7 @@
<tr class="entry" id="controls_android.flash.firingTime">
<td class="entry_name">android.<wbr>flash.<wbr>firing<wbr>Time</td>
<td class="entry_type">
- <span class="entry_type_name">int64</span>
+ <span class="entry_type_name">int64</span>
@@ -3036,7 +3037,7 @@
<tr class="entry" id="controls_android.flash.mode">
<td class="entry_name">android.<wbr>flash.<wbr>mode</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -3116,7 +3117,7 @@
<tr class="entry" id="static_android.flash.info.available">
<td class="entry_name">android.<wbr>flash.<wbr>info.<wbr>available</td>
<td class="entry_type">
- <span class="entry_type_name">byte</span>
+ <span class="entry_type_name">byte</span>
@@ -3151,7 +3152,7 @@
<tr class="entry" id="static_android.flash.info.chargeDuration">
<td class="entry_name">android.<wbr>flash.<wbr>info.<wbr>charge<wbr>Duration</td>
<td class="entry_type">
- <span class="entry_type_name">int64</span>
+ <span class="entry_type_name">int64</span>
@@ -3190,7 +3191,7 @@
<tr class="entry" id="static_android.flash.colorTemperature">
<td class="entry_name">android.<wbr>flash.<wbr>color<wbr>Temperature</td>
<td class="entry_type">
- <span class="entry_type_name">byte</span>
+ <span class="entry_type_name">byte</span>
@@ -3224,7 +3225,7 @@
<tr class="entry" id="static_android.flash.maxEnergy">
<td class="entry_name">android.<wbr>flash.<wbr>max<wbr>Energy</td>
<td class="entry_type">
- <span class="entry_type_name">byte</span>
+ <span class="entry_type_name">byte</span>
@@ -3286,7 +3287,7 @@
<tr class="entry" id="dynamic_android.flash.firingPower">
<td class="entry_name">android.<wbr>flash.<wbr>firing<wbr>Power</td>
<td class="entry_type">
- <span class="entry_type_name">byte</span>
+ <span class="entry_type_name">byte</span>
@@ -3320,7 +3321,7 @@
<tr class="entry" id="dynamic_android.flash.firingTime">
<td class="entry_name">android.<wbr>flash.<wbr>firing<wbr>Time</td>
<td class="entry_type">
- <span class="entry_type_name">int64</span>
+ <span class="entry_type_name">int64</span>
@@ -3354,7 +3355,7 @@
<tr class="entry" id="dynamic_android.flash.mode">
<td class="entry_name">android.<wbr>flash.<wbr>mode</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -3402,7 +3403,7 @@
<tr class="entry" id="dynamic_android.flash.state">
<td class="entry_name">android.<wbr>flash.<wbr>state</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -3486,7 +3487,7 @@
<tr class="entry" id="controls_android.geometric.mode">
<td class="entry_name">android.<wbr>geometric.<wbr>mode</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -3533,7 +3534,7 @@
<tr class="entry" id="controls_android.geometric.strength">
<td class="entry_name">android.<wbr>geometric.<wbr>strength</td>
<td class="entry_type">
- <span class="entry_type_name">byte</span>
+ <span class="entry_type_name">byte</span>
@@ -3600,7 +3601,7 @@
<tr class="entry" id="controls_android.hotPixel.mode">
<td class="entry_name">android.<wbr>hot<wbr>Pixel.<wbr>mode</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -3679,7 +3680,7 @@
<tr class="entry" id="static_android.hotPixel.info.map">
<td class="entry_name">android.<wbr>hot<wbr>Pixel.<wbr>info.<wbr>map</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -3747,7 +3748,7 @@
<tr class="entry" id="dynamic_android.hotPixel.mode">
<td class="entry_name">android.<wbr>hot<wbr>Pixel.<wbr>mode</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -3829,7 +3830,7 @@
<tr class="entry" id="controls_android.jpeg.gpsCoordinates">
<td class="entry_name">android.<wbr>jpeg.<wbr>gps<wbr>Coordinates</td>
<td class="entry_type">
- <span class="entry_type_name">double</span>
+ <span class="entry_type_name">double</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -3867,7 +3868,7 @@
<tr class="entry" id="controls_android.jpeg.gpsProcessingMethod">
<td class="entry_name">android.<wbr>jpeg.<wbr>gps<wbr>Processing<wbr>Method</td>
<td class="entry_type">
- <span class="entry_type_name">byte</span>
+ <span class="entry_type_name">byte</span>
@@ -3900,7 +3901,7 @@
<tr class="entry" id="controls_android.jpeg.gpsTimestamp">
<td class="entry_name">android.<wbr>jpeg.<wbr>gps<wbr>Timestamp</td>
<td class="entry_type">
- <span class="entry_type_name">int64</span>
+ <span class="entry_type_name">int64</span>
@@ -3933,7 +3934,7 @@
<tr class="entry" id="controls_android.jpeg.orientation">
<td class="entry_name">android.<wbr>jpeg.<wbr>orientation</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
@@ -3967,7 +3968,7 @@
<tr class="entry" id="controls_android.jpeg.quality">
<td class="entry_name">android.<wbr>jpeg.<wbr>quality</td>
<td class="entry_type">
- <span class="entry_type_name">byte</span>
+ <span class="entry_type_name">byte</span>
@@ -4001,7 +4002,7 @@
<tr class="entry" id="controls_android.jpeg.thumbnailQuality">
<td class="entry_name">android.<wbr>jpeg.<wbr>thumbnail<wbr>Quality</td>
<td class="entry_type">
- <span class="entry_type_name">byte</span>
+ <span class="entry_type_name">byte</span>
@@ -4034,7 +4035,7 @@
<tr class="entry" id="controls_android.jpeg.thumbnailSize">
<td class="entry_name">android.<wbr>jpeg.<wbr>thumbnail<wbr>Size</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -4099,7 +4100,7 @@
<tr class="entry" id="static_android.jpeg.availableThumbnailSizes">
<td class="entry_name">android.<wbr>jpeg.<wbr>available<wbr>Thumbnail<wbr>Sizes</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -4138,7 +4139,7 @@
<tr class="entry" id="static_android.jpeg.maxSize">
<td class="entry_name">android.<wbr>jpeg.<wbr>max<wbr>Size</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
@@ -4200,7 +4201,7 @@
<tr class="entry" id="dynamic_android.jpeg.gpsCoordinates">
<td class="entry_name">android.<wbr>jpeg.<wbr>gps<wbr>Coordinates</td>
<td class="entry_type">
- <span class="entry_type_name">double</span>
+ <span class="entry_type_name">double</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -4236,7 +4237,7 @@
<tr class="entry" id="dynamic_android.jpeg.gpsProcessingMethod">
<td class="entry_name">android.<wbr>jpeg.<wbr>gps<wbr>Processing<wbr>Method</td>
<td class="entry_type">
- <span class="entry_type_name">byte</span>
+ <span class="entry_type_name">byte</span>
@@ -4267,7 +4268,7 @@
<tr class="entry" id="dynamic_android.jpeg.gpsTimestamp">
<td class="entry_name">android.<wbr>jpeg.<wbr>gps<wbr>Timestamp</td>
<td class="entry_type">
- <span class="entry_type_name">int64</span>
+ <span class="entry_type_name">int64</span>
@@ -4298,7 +4299,7 @@
<tr class="entry" id="dynamic_android.jpeg.orientation">
<td class="entry_name">android.<wbr>jpeg.<wbr>orientation</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
@@ -4330,7 +4331,7 @@
<tr class="entry" id="dynamic_android.jpeg.quality">
<td class="entry_name">android.<wbr>jpeg.<wbr>quality</td>
<td class="entry_type">
- <span class="entry_type_name">byte</span>
+ <span class="entry_type_name">byte</span>
@@ -4362,7 +4363,7 @@
<tr class="entry" id="dynamic_android.jpeg.size">
<td class="entry_name">android.<wbr>jpeg.<wbr>size</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
@@ -4401,7 +4402,7 @@
<tr class="entry" id="dynamic_android.jpeg.thumbnailQuality">
<td class="entry_name">android.<wbr>jpeg.<wbr>thumbnail<wbr>Quality</td>
<td class="entry_type">
- <span class="entry_type_name">byte</span>
+ <span class="entry_type_name">byte</span>
@@ -4432,7 +4433,7 @@
<tr class="entry" id="dynamic_android.jpeg.thumbnailSize">
<td class="entry_name">android.<wbr>jpeg.<wbr>thumbnail<wbr>Size</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -4500,7 +4501,7 @@
<tr class="entry" id="controls_android.lens.aperture">
<td class="entry_name">android.<wbr>lens.<wbr>aperture</td>
<td class="entry_type">
- <span class="entry_type_name">float</span>
+ <span class="entry_type_name">float</span>
@@ -4535,7 +4536,7 @@
<tr class="entry" id="controls_android.lens.filterDensity">
<td class="entry_name">android.<wbr>lens.<wbr>filter<wbr>Density</td>
<td class="entry_type">
- <span class="entry_type_name">float</span>
+ <span class="entry_type_name">float</span>
@@ -4571,7 +4572,7 @@
<tr class="entry" id="controls_android.lens.focalLength">
<td class="entry_name">android.<wbr>lens.<wbr>focal<wbr>Length</td>
<td class="entry_type">
- <span class="entry_type_name">float</span>
+ <span class="entry_type_name">float</span>
@@ -4605,7 +4606,7 @@
<tr class="entry" id="controls_android.lens.focusDistance">
<td class="entry_name">android.<wbr>lens.<wbr>focus<wbr>Distance</td>
<td class="entry_type">
- <span class="entry_type_name">float</span>
+ <span class="entry_type_name">float</span>
@@ -4641,7 +4642,7 @@
<tr class="entry" id="controls_android.lens.opticalStabilizationMode">
<td class="entry_name">android.<wbr>lens.<wbr>optical<wbr>Stabilization<wbr>Mode</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -4714,7 +4715,7 @@
<tr class="entry" id="static_android.lens.info.availableApertures">
<td class="entry_name">android.<wbr>lens.<wbr>info.<wbr>available<wbr>Apertures</td>
<td class="entry_type">
- <span class="entry_type_name">float</span>
+ <span class="entry_type_name">float</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -4753,7 +4754,7 @@
<tr class="entry" id="static_android.lens.info.availableFilterDensities">
<td class="entry_name">android.<wbr>lens.<wbr>info.<wbr>available<wbr>Filter<wbr>Densities</td>
<td class="entry_type">
- <span class="entry_type_name">float</span>
+ <span class="entry_type_name">float</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -4794,7 +4795,7 @@
<tr class="entry" id="static_android.lens.info.availableFocalLengths">
<td class="entry_name">android.<wbr>lens.<wbr>info.<wbr>available<wbr>Focal<wbr>Lengths</td>
<td class="entry_type">
- <span class="entry_type_name">float</span>
+ <span class="entry_type_name">float</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -4835,7 +4836,7 @@
<tr class="entry" id="static_android.lens.info.availableOpticalStabilization">
<td class="entry_name">android.<wbr>lens.<wbr>info.<wbr>available<wbr>Optical<wbr>Stabilization</td>
<td class="entry_type">
- <span class="entry_type_name">byte</span>
+ <span class="entry_type_name">byte</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -4872,7 +4873,7 @@
<tr class="entry" id="static_android.lens.info.geometricCorrectionMap">
<td class="entry_name">android.<wbr>lens.<wbr>info.<wbr>geometric<wbr>Correction<wbr>Map</td>
<td class="entry_type">
- <span class="entry_type_name">float</span>
+ <span class="entry_type_name">float</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -4916,7 +4917,7 @@
<tr class="entry" id="static_android.lens.info.geometricCorrectionMapSize">
<td class="entry_name">android.<wbr>lens.<wbr>info.<wbr>geometric<wbr>Correction<wbr>Map<wbr>Size</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -4954,7 +4955,7 @@
<tr class="entry" id="static_android.lens.info.hyperfocalDistance">
<td class="entry_name">android.<wbr>lens.<wbr>info.<wbr>hyperfocal<wbr>Distance</td>
<td class="entry_type">
- <span class="entry_type_name">float</span>
+ <span class="entry_type_name">float</span>
@@ -4990,7 +4991,7 @@
<tr class="entry" id="static_android.lens.info.minimumFocusDistance">
<td class="entry_name">android.<wbr>lens.<wbr>info.<wbr>minimum<wbr>Focus<wbr>Distance</td>
<td class="entry_type">
- <span class="entry_type_name">float</span>
+ <span class="entry_type_name">float</span>
@@ -5026,7 +5027,7 @@
<tr class="entry" id="static_android.lens.info.shadingMap">
<td class="entry_name">android.<wbr>lens.<wbr>info.<wbr>shading<wbr>Map</td>
<td class="entry_type">
- <span class="entry_type_name">float</span>
+ <span class="entry_type_name">float</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -5068,7 +5069,7 @@
<tr class="entry" id="static_android.lens.info.shadingMapSize">
<td class="entry_name">android.<wbr>lens.<wbr>info.<wbr>shading<wbr>Map<wbr>Size</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -5109,7 +5110,7 @@
<tr class="entry" id="static_android.lens.facing">
<td class="entry_name">android.<wbr>lens.<wbr>facing</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -5147,7 +5148,7 @@
<tr class="entry" id="static_android.lens.opticalAxisAngle">
<td class="entry_name">android.<wbr>lens.<wbr>optical<wbr>Axis<wbr>Angle</td>
<td class="entry_type">
- <span class="entry_type_name">float</span>
+ <span class="entry_type_name">float</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -5192,7 +5193,7 @@
<tr class="entry" id="static_android.lens.position">
<td class="entry_name">android.<wbr>lens.<wbr>position</td>
<td class="entry_type">
- <span class="entry_type_name">float</span>
+ <span class="entry_type_name">float</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -5257,7 +5258,7 @@
<tr class="entry" id="dynamic_android.lens.aperture">
<td class="entry_name">android.<wbr>lens.<wbr>aperture</td>
<td class="entry_type">
- <span class="entry_type_name">float</span>
+ <span class="entry_type_name">float</span>
@@ -5292,7 +5293,7 @@
<tr class="entry" id="dynamic_android.lens.filterDensity">
<td class="entry_name">android.<wbr>lens.<wbr>filter<wbr>Density</td>
<td class="entry_type">
- <span class="entry_type_name">float</span>
+ <span class="entry_type_name">float</span>
@@ -5328,7 +5329,7 @@
<tr class="entry" id="dynamic_android.lens.focalLength">
<td class="entry_name">android.<wbr>lens.<wbr>focal<wbr>Length</td>
<td class="entry_type">
- <span class="entry_type_name">float</span>
+ <span class="entry_type_name">float</span>
@@ -5362,7 +5363,7 @@
<tr class="entry" id="dynamic_android.lens.focusDistance">
<td class="entry_name">android.<wbr>lens.<wbr>focus<wbr>Distance</td>
<td class="entry_type">
- <span class="entry_type_name">float</span>
+ <span class="entry_type_name">float</span>
@@ -5397,7 +5398,7 @@
<tr class="entry" id="dynamic_android.lens.focusRange">
<td class="entry_name">android.<wbr>lens.<wbr>focus<wbr>Range</td>
<td class="entry_type">
- <span class="entry_type_name">float</span>
+ <span class="entry_type_name">float</span>
@@ -5434,7 +5435,7 @@
<tr class="entry" id="dynamic_android.lens.opticalStabilizationMode">
<td class="entry_name">android.<wbr>lens.<wbr>optical<wbr>Stabilization<wbr>Mode</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -5477,7 +5478,7 @@
<tr class="entry" id="dynamic_android.lens.state">
<td class="entry_name">android.<wbr>lens.<wbr>state</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -5546,7 +5547,7 @@
<tr class="entry" id="controls_android.noiseReduction.mode">
<td class="entry_name">android.<wbr>noise<wbr>Reduction.<wbr>mode</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -5595,7 +5596,7 @@
<tr class="entry" id="controls_android.noiseReduction.strength">
<td class="entry_name">android.<wbr>noise<wbr>Reduction.<wbr>strength</td>
<td class="entry_type">
- <span class="entry_type_name">byte</span>
+ <span class="entry_type_name">byte</span>
@@ -5655,7 +5656,7 @@
<tr class="entry" id="dynamic_android.noiseReduction.mode">
<td class="entry_name">android.<wbr>noise<wbr>Reduction.<wbr>mode</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -5735,7 +5736,7 @@
<tr class="entry" id="static_android.quirks.meteringCropRegion">
<td class="entry_name">android.<wbr>quirks.<wbr>metering<wbr>Crop<wbr>Region</td>
<td class="entry_type">
- <span class="entry_type_name">byte</span>
+ <span class="entry_type_name">byte</span>
@@ -5774,7 +5775,7 @@
<tr class="entry" id="static_android.quirks.triggerAfWithAuto">
<td class="entry_name">android.<wbr>quirks.<wbr>trigger<wbr>Af<wbr>With<wbr>Auto</td>
<td class="entry_type">
- <span class="entry_type_name">byte</span>
+ <span class="entry_type_name">byte</span>
@@ -5810,7 +5811,7 @@
<tr class="entry" id="static_android.quirks.useZslFormat">
<td class="entry_name">android.<wbr>quirks.<wbr>use<wbr>Zsl<wbr>Format</td>
<td class="entry_type">
- <span class="entry_type_name">byte</span>
+ <span class="entry_type_name">byte</span>
@@ -5881,7 +5882,7 @@
<tr class="entry" id="controls_android.request.frameCount">
<td class="entry_name">android.<wbr>request.<wbr>frame<wbr>Count</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
@@ -5913,7 +5914,7 @@
<tr class="entry" id="controls_android.request.id">
<td class="entry_name">android.<wbr>request.<wbr>id</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
@@ -5948,7 +5949,7 @@
<tr class="entry" id="controls_android.request.inputStreams">
<td class="entry_name">android.<wbr>request.<wbr>input<wbr>Streams</td>
<td class="entry_type">
- <span class="entry_type_name">byte</span>
+ <span class="entry_type_name">byte</span>
@@ -5986,7 +5987,7 @@
<tr class="entry" id="controls_android.request.metadataMode">
<td class="entry_name">android.<wbr>request.<wbr>metadata<wbr>Mode</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -6035,7 +6036,7 @@
<tr class="entry" id="controls_android.request.outputStreams">
<td class="entry_name">android.<wbr>request.<wbr>output<wbr>Streams</td>
<td class="entry_type">
- <span class="entry_type_name">byte</span>
+ <span class="entry_type_name">byte</span>
@@ -6072,7 +6073,7 @@
<tr class="entry" id="controls_android.request.type">
<td class="entry_name">android.<wbr>request.<wbr>type</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -6145,7 +6146,7 @@
<tr class="entry" id="static_android.request.maxNumOutputStreams">
<td class="entry_name">android.<wbr>request.<wbr>max<wbr>Num<wbr>Output<wbr>Streams</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -6189,7 +6190,7 @@
<tr class="entry" id="static_android.request.maxNumReprocessStreams">
<td class="entry_name">android.<wbr>request.<wbr>max<wbr>Num<wbr>Reprocess<wbr>Streams</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -6252,7 +6253,7 @@
<tr class="entry" id="dynamic_android.request.frameCount">
<td class="entry_name">android.<wbr>request.<wbr>frame<wbr>Count</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
@@ -6285,7 +6286,7 @@
<tr class="entry" id="dynamic_android.request.id">
<td class="entry_name">android.<wbr>request.<wbr>id</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
@@ -6318,7 +6319,7 @@
<tr class="entry" id="dynamic_android.request.metadataMode">
<td class="entry_name">android.<wbr>request.<wbr>metadata<wbr>Mode</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -6367,7 +6368,7 @@
<tr class="entry" id="dynamic_android.request.outputStreams">
<td class="entry_name">android.<wbr>request.<wbr>output<wbr>Streams</td>
<td class="entry_type">
- <span class="entry_type_name">byte</span>
+ <span class="entry_type_name">byte</span>
@@ -6437,7 +6438,7 @@
<tr class="entry" id="controls_android.scaler.cropRegion">
<td class="entry_name">android.<wbr>scaler.<wbr>crop<wbr>Region</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -6511,7 +6512,7 @@
<tr class="entry" id="static_android.scaler.availableFormats">
<td class="entry_name">android.<wbr>scaler.<wbr>available<wbr>Formats</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">int32</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -6568,7 +6569,7 @@
<tr class="entry" id="static_android.scaler.availableJpegMinDurations">
<td class="entry_name">android.<wbr>scaler.<wbr>available<wbr>Jpeg<wbr>Min<wbr>Durations</td>
<td class="entry_type">
- <span class="entry_type_name">int64</span>
+ <span class="entry_type_name">int64</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -6610,7 +6611,7 @@
<tr class="entry" id="static_android.scaler.availableJpegSizes">
<td class="entry_name">android.<wbr>scaler.<wbr>available<wbr>Jpeg<wbr>Sizes</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -6648,7 +6649,7 @@
<tr class="entry" id="static_android.scaler.availableMaxDigitalZoom">
<td class="entry_name">android.<wbr>scaler.<wbr>available<wbr>Max<wbr>Digital<wbr>Zoom</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
@@ -6677,7 +6678,7 @@
<tr class="entry" id="static_android.scaler.availableProcessedMinDurations">
<td class="entry_name">android.<wbr>scaler.<wbr>available<wbr>Processed<wbr>Min<wbr>Durations</td>
<td class="entry_type">
- <span class="entry_type_name">int64</span>
+ <span class="entry_type_name">int64</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -6719,7 +6720,7 @@
<tr class="entry" id="static_android.scaler.availableProcessedSizes">
<td class="entry_name">android.<wbr>scaler.<wbr>available<wbr>Processed<wbr>Sizes</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -6760,7 +6761,7 @@
<tr class="entry" id="static_android.scaler.availableRawMinDurations">
<td class="entry_name">android.<wbr>scaler.<wbr>available<wbr>Raw<wbr>Min<wbr>Durations</td>
<td class="entry_type">
- <span class="entry_type_name">int64</span>
+ <span class="entry_type_name">int64</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -6801,7 +6802,7 @@
<tr class="entry" id="static_android.scaler.availableRawSizes">
<td class="entry_name">android.<wbr>scaler.<wbr>available<wbr>Raw<wbr>Sizes</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -6837,7 +6838,7 @@
<tr class="entry" id="static_android.scaler.maxDigitalZoom">
<td class="entry_name">android.<wbr>scaler.<wbr>max<wbr>Digital<wbr>Zoom</td>
<td class="entry_type">
- <span class="entry_type_name">float</span>
+ <span class="entry_type_name">float</span>
@@ -6900,7 +6901,7 @@
<tr class="entry" id="dynamic_android.scaler.cropRegion">
<td class="entry_name">android.<wbr>scaler.<wbr>crop<wbr>Region</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -6977,7 +6978,7 @@
<tr class="entry" id="controls_android.sensor.exposureTime">
<td class="entry_name">android.<wbr>sensor.<wbr>exposure<wbr>Time</td>
<td class="entry_type">
- <span class="entry_type_name">int64</span>
+ <span class="entry_type_name">int64</span>
@@ -7012,7 +7013,7 @@
<tr class="entry" id="controls_android.sensor.frameDuration">
<td class="entry_name">android.<wbr>sensor.<wbr>frame<wbr>Duration</td>
<td class="entry_type">
- <span class="entry_type_name">int64</span>
+ <span class="entry_type_name">int64</span>
@@ -7049,7 +7050,7 @@
<tr class="entry" id="controls_android.sensor.sensitivity">
<td class="entry_name">android.<wbr>sensor.<wbr>sensitivity</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
@@ -7115,7 +7116,7 @@
<tr class="entry" id="static_android.sensor.info.activeArraySize">
<td class="entry_name">android.<wbr>sensor.<wbr>info.<wbr>active<wbr>Array<wbr>Size</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -7155,7 +7156,7 @@
<tr class="entry" id="static_android.sensor.info.availableSensitivities">
<td class="entry_name">android.<wbr>sensor.<wbr>info.<wbr>available<wbr>Sensitivities</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -7193,7 +7194,7 @@
<tr class="entry" id="static_android.sensor.info.colorFilterArrangement">
<td class="entry_name">android.<wbr>sensor.<wbr>info.<wbr>color<wbr>Filter<wbr>Arrangement</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -7246,7 +7247,7 @@
<tr class="entry" id="static_android.sensor.info.exposureTimeRange">
<td class="entry_name">android.<wbr>sensor.<wbr>info.<wbr>exposure<wbr>Time<wbr>Range</td>
<td class="entry_type">
- <span class="entry_type_name">int64</span>
+ <span class="entry_type_name">int64</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -7285,7 +7286,7 @@
<tr class="entry" id="static_android.sensor.info.maxFrameDuration">
<td class="entry_name">android.<wbr>sensor.<wbr>info.<wbr>max<wbr>Frame<wbr>Duration</td>
<td class="entry_type">
- <span class="entry_type_name">int64</span>
+ <span class="entry_type_name">int64</span>
@@ -7322,7 +7323,7 @@
<tr class="entry" id="static_android.sensor.info.physicalSize">
<td class="entry_name">android.<wbr>sensor.<wbr>info.<wbr>physical<wbr>Size</td>
<td class="entry_type">
- <span class="entry_type_name">float</span>
+ <span class="entry_type_name">float</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -7360,7 +7361,7 @@
<tr class="entry" id="static_android.sensor.info.pixelArraySize">
<td class="entry_name">android.<wbr>sensor.<wbr>info.<wbr>pixel<wbr>Array<wbr>Size</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -7399,7 +7400,7 @@
<tr class="entry" id="static_android.sensor.info.whiteLevel">
<td class="entry_name">android.<wbr>sensor.<wbr>info.<wbr>white<wbr>Level</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
@@ -7437,7 +7438,7 @@
<tr class="entry" id="static_android.sensor.baseGainFactor">
<td class="entry_name">android.<wbr>sensor.<wbr>base<wbr>Gain<wbr>Factor</td>
<td class="entry_type">
- <span class="entry_type_name">rational</span>
+ <span class="entry_type_name">rational</span>
@@ -7469,7 +7470,7 @@
<tr class="entry" id="static_android.sensor.blackLevelPattern">
<td class="entry_name">android.<wbr>sensor.<wbr>black<wbr>Level<wbr>Pattern</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -7509,7 +7510,7 @@
<tr class="entry" id="static_android.sensor.calibrationTransform1">
<td class="entry_name">android.<wbr>sensor.<wbr>calibration<wbr>Transform1</td>
<td class="entry_type">
- <span class="entry_type_name">rational</span>
+ <span class="entry_type_name">rational</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -7546,7 +7547,7 @@
<tr class="entry" id="static_android.sensor.calibrationTransform2">
<td class="entry_name">android.<wbr>sensor.<wbr>calibration<wbr>Transform2</td>
<td class="entry_type">
- <span class="entry_type_name">rational</span>
+ <span class="entry_type_name">rational</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -7583,7 +7584,7 @@
<tr class="entry" id="static_android.sensor.colorTransform1">
<td class="entry_name">android.<wbr>sensor.<wbr>color<wbr>Transform1</td>
<td class="entry_type">
- <span class="entry_type_name">rational</span>
+ <span class="entry_type_name">rational</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -7624,7 +7625,7 @@
<tr class="entry" id="static_android.sensor.colorTransform2">
<td class="entry_name">android.<wbr>sensor.<wbr>color<wbr>Transform2</td>
<td class="entry_type">
- <span class="entry_type_name">rational</span>
+ <span class="entry_type_name">rational</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -7662,7 +7663,7 @@
<tr class="entry" id="static_android.sensor.forwardMatrix1">
<td class="entry_name">android.<wbr>sensor.<wbr>forward<wbr>Matrix1</td>
<td class="entry_type">
- <span class="entry_type_name">rational</span>
+ <span class="entry_type_name">rational</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -7699,7 +7700,7 @@
<tr class="entry" id="static_android.sensor.forwardMatrix2">
<td class="entry_name">android.<wbr>sensor.<wbr>forward<wbr>Matrix2</td>
<td class="entry_type">
- <span class="entry_type_name">rational</span>
+ <span class="entry_type_name">rational</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -7736,7 +7737,7 @@
<tr class="entry" id="static_android.sensor.maxAnalogSensitivity">
<td class="entry_name">android.<wbr>sensor.<wbr>max<wbr>Analog<wbr>Sensitivity</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
@@ -7772,7 +7773,7 @@
<tr class="entry" id="static_android.sensor.noiseModelCoefficients">
<td class="entry_name">android.<wbr>sensor.<wbr>noise<wbr>Model<wbr>Coefficients</td>
<td class="entry_type">
- <span class="entry_type_name">float</span>
+ <span class="entry_type_name">float</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -7817,7 +7818,7 @@
<tr class="entry" id="static_android.sensor.orientation">
<td class="entry_name">android.<wbr>sensor.<wbr>orientation</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
@@ -7855,7 +7856,7 @@
<tr class="entry" id="static_android.sensor.referenceIlluminant1">
<td class="entry_name">android.<wbr>sensor.<wbr>reference<wbr>Illuminant1</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -7972,7 +7973,7 @@
<tr class="entry" id="static_android.sensor.referenceIlluminant2">
<td class="entry_name">android.<wbr>sensor.<wbr>reference<wbr>Illuminant2</td>
<td class="entry_type">
- <span class="entry_type_name">byte</span>
+ <span class="entry_type_name">byte</span>
@@ -8031,7 +8032,7 @@
<tr class="entry" id="dynamic_android.sensor.exposureTime">
<td class="entry_name">android.<wbr>sensor.<wbr>exposure<wbr>Time</td>
<td class="entry_type">
- <span class="entry_type_name">int64</span>
+ <span class="entry_type_name">int64</span>
@@ -8064,7 +8065,7 @@
<tr class="entry" id="dynamic_android.sensor.frameDuration">
<td class="entry_name">android.<wbr>sensor.<wbr>frame<wbr>Duration</td>
<td class="entry_type">
- <span class="entry_type_name">int64</span>
+ <span class="entry_type_name">int64</span>
@@ -8099,7 +8100,7 @@
<tr class="entry" id="dynamic_android.sensor.sensitivity">
<td class="entry_name">android.<wbr>sensor.<wbr>sensitivity</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
@@ -8133,7 +8134,7 @@
<tr class="entry" id="dynamic_android.sensor.timestamp">
<td class="entry_name">android.<wbr>sensor.<wbr>timestamp</td>
<td class="entry_type">
- <span class="entry_type_name">int64</span>
+ <span class="entry_type_name">int64</span>
@@ -8202,7 +8203,7 @@
<tr class="entry" id="controls_android.shading.mode">
<td class="entry_name">android.<wbr>shading.<wbr>mode</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -8248,7 +8249,7 @@
<tr class="entry" id="controls_android.shading.strength">
<td class="entry_name">android.<wbr>shading.<wbr>strength</td>
<td class="entry_type">
- <span class="entry_type_name">byte</span>
+ <span class="entry_type_name">byte</span>
@@ -8310,7 +8311,7 @@
<tr class="entry" id="dynamic_android.shading.mode">
<td class="entry_name">android.<wbr>shading.<wbr>mode</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -8389,7 +8390,7 @@
<tr class="entry" id="controls_android.statistics.faceDetectMode">
<td class="entry_name">android.<wbr>statistics.<wbr>face<wbr>Detect<wbr>Mode</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -8438,7 +8439,7 @@
<tr class="entry" id="controls_android.statistics.histogramMode">
<td class="entry_name">android.<wbr>statistics.<wbr>histogram<wbr>Mode</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -8478,7 +8479,7 @@
<tr class="entry" id="controls_android.statistics.sharpnessMapMode">
<td class="entry_name">android.<wbr>statistics.<wbr>sharpness<wbr>Map<wbr>Mode</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -8548,7 +8549,7 @@
<tr class="entry" id="static_android.statistics.info.availableFaceDetectModes">
<td class="entry_name">android.<wbr>statistics.<wbr>info.<wbr>available<wbr>Face<wbr>Detect<wbr>Modes</td>
<td class="entry_type">
- <span class="entry_type_name">byte</span>
+ <span class="entry_type_name">byte</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -8584,7 +8585,7 @@
<tr class="entry" id="static_android.statistics.info.histogramBucketCount">
<td class="entry_name">android.<wbr>statistics.<wbr>info.<wbr>histogram<wbr>Bucket<wbr>Count</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
@@ -8615,7 +8616,7 @@
<tr class="entry" id="static_android.statistics.info.maxFaceCount">
<td class="entry_name">android.<wbr>statistics.<wbr>info.<wbr>max<wbr>Face<wbr>Count</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
@@ -8647,7 +8648,7 @@
<tr class="entry" id="static_android.statistics.info.maxHistogramCount">
<td class="entry_name">android.<wbr>statistics.<wbr>info.<wbr>max<wbr>Histogram<wbr>Count</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
@@ -8677,7 +8678,7 @@
<tr class="entry" id="static_android.statistics.info.maxSharpnessMapValue">
<td class="entry_name">android.<wbr>statistics.<wbr>info.<wbr>max<wbr>Sharpness<wbr>Map<wbr>Value</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
@@ -8707,7 +8708,7 @@
<tr class="entry" id="static_android.statistics.info.sharpnessMapSize">
<td class="entry_name">android.<wbr>statistics.<wbr>info.<wbr>sharpness<wbr>Map<wbr>Size</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -8774,7 +8775,7 @@
<tr class="entry" id="dynamic_android.statistics.faceDetectMode">
<td class="entry_name">android.<wbr>statistics.<wbr>face<wbr>Detect<wbr>Mode</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -8821,7 +8822,7 @@
<tr class="entry" id="dynamic_android.statistics.faceIds">
<td class="entry_name">android.<wbr>statistics.<wbr>face<wbr>Ids</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -8858,7 +8859,7 @@
<tr class="entry" id="dynamic_android.statistics.faceLandmarks">
<td class="entry_name">android.<wbr>statistics.<wbr>face<wbr>Landmarks</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -8896,7 +8897,7 @@
<tr class="entry" id="dynamic_android.statistics.faceRectangles">
<td class="entry_name">android.<wbr>statistics.<wbr>face<wbr>Rectangles</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -8934,7 +8935,7 @@
<tr class="entry" id="dynamic_android.statistics.faceScores">
<td class="entry_name">android.<wbr>statistics.<wbr>face<wbr>Scores</td>
<td class="entry_type">
- <span class="entry_type_name">byte</span>
+ <span class="entry_type_name">byte</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -8972,7 +8973,7 @@
<tr class="entry" id="dynamic_android.statistics.histogram">
<td class="entry_name">android.<wbr>statistics.<wbr>histogram</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -9013,7 +9014,7 @@
<tr class="entry" id="dynamic_android.statistics.histogramMode">
<td class="entry_name">android.<wbr>statistics.<wbr>histogram<wbr>Mode</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -9051,7 +9052,7 @@
<tr class="entry" id="dynamic_android.statistics.sharpnessMap">
<td class="entry_name">android.<wbr>statistics.<wbr>sharpness<wbr>Map</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -9090,7 +9091,7 @@
<tr class="entry" id="dynamic_android.statistics.sharpnessMapMode">
<td class="entry_name">android.<wbr>statistics.<wbr>sharpness<wbr>Map<wbr>Mode</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -9161,7 +9162,7 @@
<tr class="entry" id="controls_android.tonemap.curveBlue">
<td class="entry_name">android.<wbr>tonemap.<wbr>curve<wbr>Blue</td>
<td class="entry_type">
- <span class="entry_type_name">byte</span>
+ <span class="entry_type_name">byte</span>
@@ -9193,7 +9194,7 @@
<tr class="entry" id="controls_android.tonemap.curveGreen">
<td class="entry_name">android.<wbr>tonemap.<wbr>curve<wbr>Green</td>
<td class="entry_type">
- <span class="entry_type_name">byte</span>
+ <span class="entry_type_name">byte</span>
@@ -9225,7 +9226,7 @@
<tr class="entry" id="controls_android.tonemap.curveRed">
<td class="entry_name">android.<wbr>tonemap.<wbr>curve<wbr>Red</td>
<td class="entry_type">
- <span class="entry_type_name">float</span>
+ <span class="entry_type_name">float</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -9270,7 +9271,7 @@
<tr class="entry" id="controls_android.tonemap.mode">
<td class="entry_name">android.<wbr>tonemap.<wbr>mode</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -9343,7 +9344,7 @@
<tr class="entry" id="static_android.tonemap.maxCurvePoints">
<td class="entry_name">android.<wbr>tonemap.<wbr>max<wbr>Curve<wbr>Points</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">int32</span>
@@ -9402,7 +9403,7 @@
<tr class="entry" id="dynamic_android.tonemap.curveBlue">
<td class="entry_name">android.<wbr>tonemap.<wbr>curve<wbr>Blue</td>
<td class="entry_type">
- <span class="entry_type_name">byte</span>
+ <span class="entry_type_name">byte</span>
@@ -9434,7 +9435,7 @@
<tr class="entry" id="dynamic_android.tonemap.curveGreen">
<td class="entry_name">android.<wbr>tonemap.<wbr>curve<wbr>Green</td>
<td class="entry_type">
- <span class="entry_type_name">byte</span>
+ <span class="entry_type_name">byte</span>
@@ -9466,7 +9467,7 @@
<tr class="entry" id="dynamic_android.tonemap.curveRed">
<td class="entry_name">android.<wbr>tonemap.<wbr>curve<wbr>Red</td>
<td class="entry_type">
- <span class="entry_type_name">float</span>
+ <span class="entry_type_name">float</span>
<span class="entry_type_container">x</span>
<span class="entry_type_array">
@@ -9509,7 +9510,7 @@
<tr class="entry" id="dynamic_android.tonemap.mode">
<td class="entry_name">android.<wbr>tonemap.<wbr>mode</td>
<td class="entry_type">
- <span class="entry_type_name">enum</span>
+ <span class="entry_type_name entry_type_name_enum">byte</span>
diff --git a/camera/docs/html.mako b/camera/docs/html.mako
index c29859e..4866472 100644
--- a/camera/docs/html.mako
+++ b/camera/docs/html.mako
@@ -42,6 +42,7 @@
/* Entry type flair */
.entry_type_name { color: darkgreen; font-weight: bold; }
+ .entry_type_name_enum:after { color: darkgreen; font-weight: bold; content:" (enum)" }
.entry_type_enum_name { font-family: monospace; font-weight: bolder; }
.entry_type_enum_notes:before { content:" - " }
.entry_type_enum_value:before { content:" = " }
@@ -184,7 +185,11 @@
<tr class="entry" id="${prop.kind}_${prop.name}">
<td class="entry_name">${prop.name | wbr}</td>
<td class="entry_type">
- <span class="entry_type_name">${prop.type}</span>
+ % if prop.enum:
+ <span class="entry_type_name entry_type_name_enum">${prop.type}</span>
+ % else:
+ <span class="entry_type_name">${prop.type}</span>
+ % endif
% if prop.container is not None:
<span class="entry_type_container">x</span>
% endif
@@ -205,7 +210,7 @@
<div class="entry_type_notes">${prop.type_notes | wbr}</div>
% endif
- % if prop.type == 'enum':
+ % if prop.enum:
<ul class="entry_type_enum">
% for value in prop.enum.values:
<li>
diff --git a/camera/docs/metadata_helpers.py b/camera/docs/metadata_helpers.py
index 35e9ba4..fd09d98 100644
--- a/camera/docs/metadata_helpers.py
+++ b/camera/docs/metadata_helpers.py
@@ -235,12 +235,9 @@
ctype_enum('int32') == 'TYPE_INT32'
ctype_enum('int64') == 'TYPE_INT64'
ctype_enum('float') == 'TYPE_FLOAT'
- ctype_enum('enum') == 'TYPE_BYTE'
Remarks:
An enum is coerced to a byte since the rest of the camera_metadata
code doesn't support enums directly yet.
"""
- if what == 'enum':
- return 'TYPE_BYTE'
return 'TYPE_%s' %(what.upper())
diff --git a/camera/docs/metadata_model.py b/camera/docs/metadata_model.py
index b403a47..e2a2f0e 100644
--- a/camera/docs/metadata_model.py
+++ b/camera/docs/metadata_model.py
@@ -789,7 +789,7 @@
ancestor Kind#name
container: The container attribute from <entry container="array">, or None.
container_sizes: A sequence of size strings or None if container is None.
- enum: An Enum instance if type is 'enum', None otherwise.
+ enum: An Enum instance if the enum attribute is true, None otherwise.
tuple_values: A sequence of strings describing the tuple values,
None if container is not 'tuple'.
description: A string description, or None.
@@ -821,7 +821,8 @@
Args (if container is 'tuple'):
tuple_values: A list of tuple values, e.g. ['width', 'height']
- Args (if type is 'enum'):
+ Args (if the 'enum' attribute is true):
+ enum: A boolean, True if this is an enum, False otherwise
enum_values: A list of value strings, e.g. ['ON', 'OFF']
enum_optionals: A list of optional enum values, e.g. ['OFF']
enum_notes: A dictionary of value->notes strings.
@@ -950,7 +951,7 @@
self._type_notes = kwargs.get('type_notes')
- if self._type == 'enum':
+ if kwargs.get('enum', False):
self._enum = Enum(self, enum_values, enum_ids, enum_optionals, enum_notes)
else:
self._enum = None
@@ -1068,7 +1069,8 @@
Args (if container is 'tuple'):
tuple_values: A list of tuple values, e.g. ['width', 'height']
- Args (if type is 'enum'):
+ Args (if the 'enum' attribute is true):
+ enum: A boolean, True if this is an enum, False otherwise
enum_values: A list of value strings, e.g. ['ON', 'OFF']
enum_optionals: A list of optional enum values, e.g. ['OFF']
enum_notes: A dictionary of value->notes strings.
diff --git a/camera/docs/metadata_parser_xml.py b/camera/docs/metadata_parser_xml.py
index cadbac1..d42a8b4 100755
--- a/camera/docs/metadata_parser_xml.py
+++ b/camera/docs/metadata_parser_xml.py
@@ -146,7 +146,7 @@
#
# Enum
#
- if entry['type'] == 'enum':
+ if entry.get('enum', 'false') == 'true':
enum_values = []
enum_optionals = []
@@ -171,6 +171,7 @@
d['enum_optionals'] = enum_optionals
d['enum_notes'] = enum_notes
d['enum_ids'] = enum_ids
+ d['enum'] = True
#
# Container (Array/Tuple)
diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml
index 3bca091..99f5844 100644
--- a/camera/docs/metadata_properties.xml
+++ b/camera/docs/metadata_properties.xml
@@ -40,7 +40,7 @@
<namespace name="android">
<section name="colorCorrection">
<controls>
- <entry name="mode" type="enum">
+ <entry name="mode" type="byte" enum="true">
<enum>
<value>TRANSFORM_MATRIX
<notes>Use the android.colorCorrection.transform matrix
@@ -82,7 +82,7 @@
</section>
<section name="control">
<controls>
- <entry name="aeAntibandingMode" type="enum">
+ <entry name="aeAntibandingMode" type="byte" enum="true">
<enum>
<value>OFF</value>
<value>50HZ</value>
@@ -103,7 +103,7 @@
compensation of -1</notes>
<tag id="BC" />
</entry>
- <entry name="aeLock" type="enum">
+ <entry name="aeLock" type="byte" enum="true">
<enum>
<value>ON
<notes>Autoexposure lock is enabled; the AE algorithm
@@ -120,7 +120,7 @@
ON_AUTO_FLASH_REDEYE.</notes>
<tag id="BC" />
</entry>
- <entry name="aeMode" type="enum">
+ <entry name="aeMode" type="byte" enum="true">
<enum>
<value>OFF
<notes>Autoexposure is disabled; sensor.exposureTime
@@ -187,7 +187,7 @@
of android.sensor.exposureTime</notes>
<tag id="BC" />
</entry>
- <entry name="afMode" type="enum">
+ <entry name="afMode" type="byte" enum="true">
<enum>
<value>OFF
<notes>The 3A routines do not control the lens;
@@ -277,7 +277,7 @@
in the frame metadata</notes>
<tag id="BC" />
</entry>
- <entry name="awbLock" type="enum">
+ <entry name="awbLock" type="byte" enum="true">
<enum>
<value>ON
<notes>Auto-whitebalance lock is enabled; the AWB
@@ -295,7 +295,7 @@
setting</notes>
<tag id="BC" />
</entry>
- <entry name="awbMode" type="enum">
+ <entry name="awbMode" type="byte" enum="true">
<enum>
<value>OFF</value>
<value>AUTO</value>
@@ -336,7 +336,7 @@
in the frame metadata</notes>
<tag id="BC" />
</entry>
- <entry name="captureIntent" type="enum">
+ <entry name="captureIntent" type="byte" enum="true">
<enum>
<value>CUSTOM
<notes>This request doesn't fall into the other
@@ -368,7 +368,7 @@
<notes>Only used if android.control.mode != OFF.</notes>
<tag id="BC" />
</entry>
- <entry name="effectMode" type="enum">
+ <entry name="effectMode" type="byte" enum="true">
<enum>
<value>OFF</value>
<value optional="true">MONO</value>
@@ -385,7 +385,7 @@
<range>android.control.availableEffects</range>
<tag id="BC" />
</entry>
- <entry name="mode" type="enum">
+ <entry name="mode" type="byte" enum="true">
<enum>
<value>OFF
<notes>Full application control of pipeline. All 3A
@@ -410,7 +410,7 @@
<range>all must be supported</range>
<tag id="BC" />
</entry>
- <entry name="sceneMode" type="enum">
+ <entry name="sceneMode" type="byte" enum="true">
<enum>
<value id="0">UNSUPPORTED</value>
<value>FACE_PRIORITY
@@ -443,7 +443,7 @@
<range>android.control.availableSceneModes</range>
<tag id="BC" />
</entry>
- <entry name="videoStabilizationMode" type="enum">
+ <entry name="videoStabilizationMode" type="byte" enum="true">
<enum>
<value>OFF</value>
<value>ON</value>
@@ -601,7 +601,7 @@
</entry>
<clone entry="android.control.aeRegions" kind="controls">
</clone>
- <entry name="aeState" type="enum">
+ <entry name="aeState" type="byte" enum="true">
<enum>
<value>INACTIVE
<notes>AE is off</notes></value>
@@ -635,7 +635,7 @@
</clone>
<clone entry="android.control.afRegions" kind="controls">
</clone>
- <entry name="afState" type="enum">
+ <entry name="afState" type="byte" enum="true">
<enum>
<value>INACTIVE
<notes>AF off or has not yet tried to scan/been asked
@@ -677,7 +677,7 @@
</clone>
<clone entry="android.control.awbRegions" kind="controls">
</clone>
- <entry name="awbState" type="enum">
+ <entry name="awbState" type="byte" enum="true">
<enum>
<value>INACTIVE
<notes>AWB is not in auto mode</notes></value>
@@ -702,7 +702,7 @@
</section>
<section name="demosaic">
<controls>
- <entry name="mode" type="enum">
+ <entry name="mode" type="byte" enum="true">
<enum>
<value>FAST
<notes>Minimal or no slowdown of frame rate compared to
@@ -719,7 +719,7 @@
</section>
<section name="edge">
<controls>
- <entry name="mode" type="enum">
+ <entry name="mode" type="byte" enum="true">
<enum>
<value>OFF
<notes>No edge enhancement is applied</notes></value>
@@ -763,7 +763,7 @@
duration).</notes>
<tag id="V1" />
</entry>
- <entry name="mode" type="enum">
+ <entry name="mode" type="byte" enum="true">
<enum>
<value>OFF
<notes>Do not fire the flash for this
@@ -822,7 +822,7 @@
<clone entry="android.flash.firingTime" kind="controls">
</clone>
<clone entry="android.flash.mode" kind="controls"></clone>
- <entry name="state" type="enum">
+ <entry name="state" type="byte" enum="true">
<enum>
<value>UNAVAILABLE
<notes>No flash on camera</notes></value>
@@ -843,7 +843,7 @@
</section>
<section name="geometric">
<controls>
- <entry name="mode" type="enum">
+ <entry name="mode" type="byte" enum="true">
<enum>
<value>OFF
<notes>No geometric correction is
@@ -869,7 +869,7 @@
</section>
<section name="hotPixel">
<controls>
- <entry name="mode" type="enum">
+ <entry name="mode" type="byte" enum="true">
<enum>
<value>OFF
<notes>No hot pixel correction can be
@@ -1050,7 +1050,7 @@
<tag id="BC" />
<tag id="V1" />
</entry>
- <entry name="opticalStabilizationMode" type="enum">
+ <entry name="opticalStabilizationMode" type="byte" enum="true">
<enum>
<value>OFF</value>
<value optional="true">ON</value>
@@ -1192,7 +1192,7 @@
<tag id="V1" />
</entry>
</namespace>
- <entry name="facing" type="enum">
+ <entry name="facing" type="byte" enum="true">
<enum>
<value>FRONT</value>
<value>BACK</value>
@@ -1256,7 +1256,7 @@
kind="controls">
<tag id="V1" />
</clone>
- <entry name="state" type="enum">
+ <entry name="state" type="byte" enum="true">
<enum>
<value>STATIONARY</value>
</enum>
@@ -1267,7 +1267,7 @@
</section>
<section name="noiseReduction">
<controls>
- <entry name="mode" type="enum">
+ <entry name="mode" type="byte" enum="true">
<enum>
<value>OFF
<notes>No noise reduction is applied</notes></value>
@@ -1362,7 +1362,7 @@
<notes>Only meaningful when android.request.type ==
REPROCESS. Ignored otherwise</notes>
</entry>
- <entry name="metadataMode" type="enum">
+ <entry name="metadataMode" type="byte" enum="true">
<enum>
<value>NONE
<notes>No metadata should be produced on output, except
@@ -1392,7 +1392,7 @@
still be captured for metadata and statistics production,
and the lens and flash must operate as requested.</notes>
</entry>
- <entry name="type" type="enum">
+ <entry name="type" type="byte" enum="true">
<enum>
<value>CAPTURE
<notes>Capture a new image from the imaging hardware,
@@ -1473,7 +1473,7 @@
</entry>
</controls>
<static>
- <entry name="availableFormats" type="enum"
+ <entry name="availableFormats" type="int32" enum="true"
type_notes="values from HAL_PIXEL_FORMAT_* in /system/core/include/system/graphics.h"
container="array">
<array>
@@ -1652,7 +1652,7 @@
<tag id="BC" />
<tag id="V1" />
</entry>
- <entry name="colorFilterArrangement" type="enum">
+ <entry name="colorFilterArrangement" type="byte" enum="true">
<enum>
<value>RGGB</value>
<value>GRBG</value>
@@ -1844,7 +1844,7 @@
<range>0,90,180,270</range>
<tag id="BC" />
</entry>
- <entry name="referenceIlluminant1" type="enum">
+ <entry name="referenceIlluminant1" type="byte" enum="true">
<enum>
<value id="1">DAYLIGHT</value>
<value id="2">FLUORESCENT</value>
@@ -1904,7 +1904,7 @@
</section>
<section name="shading">
<controls>
- <entry name="mode" type="enum">
+ <entry name="mode" type="byte" enum="true">
<enum>
<value>OFF
<notes>No shading correction is applied</notes></value>
@@ -1933,7 +1933,7 @@
</section>
<section name="statistics">
<controls>
- <entry name="faceDetectMode" type="enum">
+ <entry name="faceDetectMode" type="byte" enum="true">
<enum>
<value>OFF</value>
<value>SIMPLE
@@ -1949,7 +1949,7 @@
android.statistics.availableFaceDetectModes</range>
<tag id="BC" />
</entry>
- <entry name="histogramMode" type="enum">
+ <entry name="histogramMode" type="byte" enum="true">
<enum>
<value>OFF</value>
<value>ON</value>
@@ -1958,7 +1958,7 @@
generation</description>
<tag id="V1" />
</entry>
- <entry name="sharpnessMapMode" type="enum">
+ <entry name="sharpnessMapMode" type="byte" enum="true">
<enum>
<value>OFF</value>
<value>ON</value>
@@ -2123,7 +2123,7 @@
0.25, 0.3 -> 0.5, 0.5 -> 0.64</notes>
<tag id="DNG" />
</entry>
- <entry name="mode" type="enum">
+ <entry name="mode" type="byte" enum="true">
<enum>
<value>CONTRAST_CURVE
<notes>Use the tone mapping curve specified in
diff --git a/camera/docs/metadata_properties.xsd b/camera/docs/metadata_properties.xsd
index 8159e45..48a2c26 100644
--- a/camera/docs/metadata_properties.xsd
+++ b/camera/docs/metadata_properties.xsd
@@ -124,7 +124,6 @@
<enumeration value="float" />
<enumeration value="double" />
<enumeration value="rational" />
- <enumeration value="enum" />
</restriction>
</simpleType>
</attribute>
@@ -137,6 +136,14 @@
</restriction>
</simpleType>
</attribute>
+ <attribute name="enum">
+ <simpleType>
+ <restriction base="string">
+ <enumeration value="true"></enumeration>
+ <enumeration value="false"></enumeration>
+ </restriction>
+ </simpleType>
+ </attribute>
</complexType>
<complexType name="EnumType">
diff --git a/camera/docs/metadata_template.mako b/camera/docs/metadata_template.mako
index 84ac43d..253db61 100644
--- a/camera/docs/metadata_template.mako
+++ b/camera/docs/metadata_template.mako
@@ -72,6 +72,9 @@
</clone>
% else:
<entry name="${prop.name_short}" type="${prop.type}"
+ % if prop.enum:
+ enum="true"
+ % endif
% if prop.type_notes is not None:
type_notes="${prop.type_notes}"
% endif
@@ -93,7 +96,7 @@
% endfor
</tuple>
% endif
- % if prop.type == 'enum':
+ % if prop.enum:
<enum>
% for value in prop.enum.values:
<value
diff --git a/camera/docs/metadata_validate.py b/camera/docs/metadata_validate.py
index 6c9c408..0dc4ae9 100755
--- a/camera/docs/metadata_validate.py
+++ b/camera/docs/metadata_validate.py
@@ -236,15 +236,15 @@
%(fully_qualified_name(entry), find_kind(entry), \
entry_container, entry_container))
- typ = entry.attrs.get('type')
- if typ == 'enum':
+ enum = entry.attrs.get('enum')
+ if enum and enum == 'true':
if entry.enum is None:
validate_error(("Entry '%s' in kind '%s' is missing enum") \
% (fully_qualified_name(entry), find_kind(entry),
))
+ success = False
- if typ == 'enum' and entry.enum is not None:
-
+ else:
for value in entry.enum.find_all('value'):
value_id = value.attrs.get('id')
@@ -256,6 +256,12 @@
" numeric.") \
%(fully_qualified_name(entry), value_id))
success = False
+ else:
+ if entry.enum:
+ validate_error(("Entry '%s' kind '%s' has enum el, but no enum attr") \
+ % (fully_qualified_name(entry), find_kind(entry),
+ ))
+ success = False
return success
