camera_metadata: Fix HTML range output not to swallow the > sign
- escape all uses of > with > so that it gets converted to
'>' before markdown renders it.
- use regular > for markdown block quotes
Change-Id: Ib86f83102a308613153d09dc5bae2bdb97c3d14f
diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index 28ea35b..a0b8a66 100644
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -2849,9 +2849,7 @@
</td>
<td class="entry_range">
- <blockquote>
-<p>= 1</p>
-</blockquote>
+ <p>>= 1</p>
</td>
<td class="entry_tags">
@@ -4411,9 +4409,7 @@
</td>
<td class="entry_range">
- <blockquote>
-<p>= 0</p>
-</blockquote>
+ <p>>= 0</p>
</td>
<td class="entry_tags">
@@ -5714,9 +5710,7 @@
</td>
<td class="entry_range">
- <blockquote>
-<p>= 0</p>
-</blockquote>
+ <p>>= 0</p>
</td>
<td class="entry_tags">
@@ -5978,9 +5972,7 @@
</td>
<td class="entry_range">
- <blockquote>
-<p>0</p>
-</blockquote>
+ <p>> 0</p>
</td>
<td class="entry_tags">
@@ -6026,9 +6018,7 @@
</td>
<td class="entry_range">
- <blockquote>
-<p>= 0</p>
-</blockquote>
+ <p>>= 0</p>
</td>
<td class="entry_tags">
@@ -6266,9 +6256,7 @@
</td>
<td class="entry_range">
- <blockquote>
-<p>0</p>
-</blockquote>
+ <p>> 0</p>
</td>
<td class="entry_tags">
@@ -6454,9 +6442,7 @@
</td>
<td class="entry_range">
- <blockquote>
-<p>= 0</p>
-</blockquote>
+ <p>>= 0</p>
</td>
<td class="entry_tags">
@@ -6503,9 +6489,7 @@
</td>
<td class="entry_range">
- <blockquote>
-<p>= 0</p>
-</blockquote>
+ <p>>= 0</p>
</td>
<td class="entry_tags">
@@ -6864,9 +6848,7 @@
</td>
<td class="entry_range">
- <blockquote>
-<p>0</p>
-</blockquote>
+ <p>> 0</p>
</td>
<td class="entry_tags">
@@ -6912,9 +6894,7 @@
</td>
<td class="entry_range">
- <blockquote>
-<p>= 0</p>
-</blockquote>
+ <p>>= 0</p>
</td>
<td class="entry_tags">
@@ -6966,9 +6946,7 @@
</td>
<td class="entry_range">
- <blockquote>
-<p>=0</p>
-</blockquote>
+ <p>>=0</p>
</td>
<td class="entry_tags">
@@ -8007,10 +7985,8 @@
</td>
<td class="entry_range">
- <blockquote>
-<p>=1 for Raw and JPEG-compressed stream.<wbr/> >= 3
+ <p>>=1 for Raw and JPEG-compressed stream.<wbr/> >= 3
for processed,<wbr/> uncompressed streams</p>
-</blockquote>
</td>
<td class="entry_tags">
@@ -8061,9 +8037,7 @@
</td>
<td class="entry_range">
- <blockquote>
-<p>= 1</p>
-</blockquote>
+ <p>>= 1</p>
</td>
<td class="entry_tags">
@@ -8126,9 +8100,7 @@
</td>
<td class="entry_range">
- <blockquote>
-<p>0</p>
-</blockquote>
+ <p>> 0</p>
</td>
<td class="entry_tags">
@@ -8619,9 +8591,7 @@
</td>
<td class="entry_range">
- <blockquote>
-<p>=1</p>
-</blockquote>
+ <p>>=1</p>
</td>
<td class="entry_tags">
@@ -9358,9 +9328,7 @@
</td>
<td class="entry_range">
- <blockquote>
-<p>= 30e9</p>
-</blockquote>
+ <p>>= 30e9</p>
</td>
<td class="entry_tags">
@@ -9511,9 +9479,7 @@
</td>
<td class="entry_range">
- <blockquote>
-<p>1024 (10-bit output)</p>
-</blockquote>
+ <p>> 1024 (10-bit output)</p>
</td>
<td class="entry_tags">
@@ -9604,9 +9570,7 @@
</td>
<td class="entry_range">
- <blockquote>
-<p>= 0 each</p>
-</blockquote>
+ <p>>= 0 each</p>
</td>
<td class="entry_tags">
@@ -10393,9 +10357,7 @@
</td>
<td class="entry_range">
- <blockquote>
-<p>0</p>
-</blockquote>
+ <p>> 0</p>
</td>
<td class="entry_tags">
@@ -10996,9 +10958,7 @@
</td>
<td class="entry_range">
- <blockquote>
-<p>= 64</p>
-</blockquote>
+ <p>>= 64</p>
</td>
<td class="entry_tags">
@@ -11032,10 +10992,8 @@
</td>
<td class="entry_range">
- <blockquote>
-<p>= 4 if availableFaceDetectionModes lists
+ <p>>= 4 if availableFaceDetectionModes lists
modes besides OFF,<wbr/> otherwise 0</p>
-</blockquote>
</td>
<td class="entry_tags">
@@ -12169,9 +12127,7 @@
</td>
<td class="entry_range">
- <blockquote>
-<p>= 128</p>
-</blockquote>
+ <p>>= 128</p>
</td>
<td class="entry_tags">
diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml
index fe8fce8..e18f48b 100644
--- a/camera/docs/metadata_properties.xml
+++ b/camera/docs/metadata_properties.xml
@@ -797,7 +797,7 @@
<entry name="maxRegions" type="int32" visibility="public">
<description>For AE, AWB, and AF, how many individual
regions can be listed for metering?</description>
- <range>>= 1</range>
+ <range>&gt;= 1</range>
<tag id="BC" />
</entry>
<entry name="sceneModeOverrides" type="byte" visibility="system"
@@ -1073,7 +1073,7 @@
<description>Max energy output of the flash for a full
power single flash</description>
<units>lumen-seconds</units>
- <range>>= 0</range>
+ <range>&gt;= 0</range>
<tag id="ADV" />
</entry>
</static>
@@ -1276,7 +1276,7 @@
<entry name="size" type="int32">
<description>The size of the compressed JPEG image, in
bytes</description>
- <range>>= 0</range>
+ <range>&gt;= 0</range>
<details>If no JPEG output is produced for the request,
this must be 0.
@@ -1315,7 +1315,7 @@
<entry name="focalLength" type="float" visibility="public">
<description>Lens optical zoom setting</description>
<units>focal length in mm</units>
- <range>> 0</range>
+ <range>&gt; 0</range>
<details>Will not be supported on most devices.</details>
<tag id="V1" />
</entry>
@@ -1323,7 +1323,7 @@
<description>Distance to plane of sharpest focus,
measured from frontmost surface of the lens</description>
<units>diopters (1/m)</units>
- <range>>= 0</range>
+ <range>&gt;= 0</range>
<details>0 = infinity focus. Used value should be clamped
to (0,minimum focus distance)</details>
<tag id="BC" />
@@ -1351,7 +1351,7 @@
</array>
<description>List of supported aperture
values</description>
- <range>one entry required, > 0</range>
+ <range>one entry required, &gt; 0</range>
<details>If variable aperture not available, only setting
should be for the fixed aperture</details>
<tag id="V1" />
@@ -1363,7 +1363,7 @@
</array>
<description>List of supported ND filter
values</description>
- <range>one entry required, >= 0</range>
+ <range>one entry required, &gt;= 0</range>
<details>If not available, only setting is 0. Otherwise,
lists the available exposure index values for dimming
(2 would mean the filter is set to reduce incoming
@@ -1379,7 +1379,7 @@
<description>If fitted with optical zoom, what focal
lengths are available. If not, the static focal
length</description>
- <range>> 0</range>
+ <range>&gt; 0</range>
<details>If optical zoom not supported, only one value
should be reported</details>
<tag id="BC" />
@@ -1406,7 +1406,7 @@
<description>A low-resolution map for correction of
geometric distortions and chromatic aberrations, per
color channel</description>
- <range>N, M >= 2</range>
+ <range>N, M &gt;= 2</range>
<details>[DNG wants a function instead]. What's easiest
for implementers? With an array size (M, N), entry (i,
j) provides the destination for pixel (i/(M-1) * width,
@@ -1422,14 +1422,14 @@
</array>
<description>Dimensions of geometric correction
map</description>
- <range>Both values >= 2</range>
+ <range>Both values &gt;= 2</range>
<tag id="V1" />
</entry>
<entry name="hyperfocalDistance" type="float" visibility="public">
<description>Hyperfocal distance for this lens; set to
0 if fixed focus</description>
<units>diopters</units>
- <range>>= 0</range>
+ <range>&gt;= 0</range>
<details>The hyperfocal distance is used for the old
API's 'fixed' setting</details>
<tag id="BC" />
@@ -1438,7 +1438,7 @@
<description>Shortest distance from frontmost surface
of the lens that can be focused correctly</description>
<units>diopters</units>
- <range>>= 0</range>
+ <range>&gt;= 0</range>
<details>If the lens is fixed-focus, this should be
0</details>
<tag id="V1" />
@@ -1450,7 +1450,7 @@
<size>2</size>
</array>
<description>Dimensions of lens shading map.</description>
- <range>Both values >= 1</range>
+ <range>Both values &gt;= 1</range>
<details>
The map should be on the order of 30-40 rows and columns, and
must be smaller than 64x64.
@@ -1524,7 +1524,7 @@
sharp focus (depth of field)</description>
<units>pair of focus distances in diopters: (near,
far)</units>
- <range>>=0</range>
+ <range>&gt;=0</range>
<details>If variable focus not supported, can still report
fixed depth of field range</details>
<tag id="BC" />
@@ -1766,7 +1766,7 @@
<units>The number of raw sensor streams; the number of
processed, uncompressed streams; and the number of
JPEG-compressed streams</units>
- <range>>=1 for Raw and JPEG-compressed stream. >= 3
+ <range>&gt;=1 for Raw and JPEG-compressed stream. &gt;= 3
for processed, uncompressed streams</range>
<details>Video snapshot with preview callbacks requires 3
processed streams (preview, record, app callbacks) and
@@ -1780,7 +1780,7 @@
</array>
<description>How many reprocessing streams of any type
can be allocated at the same time</description>
- <range>>= 1</range>
+ <range>&gt;= 1</range>
</entry>
</static>
<dynamic>
@@ -1789,7 +1789,7 @@
increases with every new result (that is, each new result has a unique
frameCount value).</description>
<units>count of frames</units>
- <range>> 0</range>
+ <range>&gt; 0</range>
<details>Reset on release()</details>
</entry>
<clone entry="android.request.id" kind="controls"></clone>
@@ -1892,7 +1892,7 @@
stream is active and captured in a burst, with all
processing set to FAST</description>
<details>When multiple streams are configured, the minimum
- frame duration will be >= max(individual stream min
+ frame duration will be &gt;= max(individual stream min
durations)</details>
<tag id="BC" />
</entry>
@@ -1913,7 +1913,7 @@
and crop region width, or between active area height and
crop region height, if the crop region height is larger
than width</description>
- <range>>=1</range>
+ <range>&gt;=1</range>
<tag id="BC" />
</entry>
<entry name="availableProcessedMinDurations" type="int64" visibility="public"
@@ -1927,7 +1927,7 @@
stream is active, with all processing set to
FAST</description>
<details>When multiple streams are configured, the minimum
- frame duration will be >= max(individual stream min
+ frame duration will be &gt;= max(individual stream min
durations)</details>
<tag id="BC" />
</entry>
@@ -1963,7 +1963,7 @@
correspond to the frame duration when only the raw stream
is active.</description>
<details>When multiple streams are configured, the minimum
- frame duration will be >= max(individual stream min
+ frame duration will be &gt;= max(individual stream min
durations)</details>
<tag id="BC" />
</entry>
@@ -2046,7 +2046,7 @@
<size>2</size>
</array>
<description>Range of valid sensitivities</description>
- <range>Min <= 100, Max >= 1600</range>
+ <range>Min <= 100, Max &gt;= 1600</range>
<tag id="BC" />
<tag id="V1" />
</entry>
@@ -2073,7 +2073,7 @@
</array>
<description>Range of valid exposure
times</description>
- <range>Min <= 100e3 (100 us), Max >= 30e9 (30
+ <range>Min <= 100e3 (100 us), Max &gt;= 30e9 (30
sec)</range>
<tag id="V1" />
</entry>
@@ -2081,7 +2081,7 @@
<description>Maximum possible frame duration (minimum frame
rate)</description>
<units>nanoseconds</units>
- <range>>= 30e9</range>
+ <range>&gt;= 30e9</range>
<details>Minimum duration is a function of resolution,
processing settings. See
android.scaler.availableProcessedMinDurations
@@ -2118,7 +2118,7 @@
<entry name="whiteLevel" type="int32">
<description>Maximum raw value output by
sensor</description>
- <range>> 1024 (10-bit output)</range>
+ <range>&gt; 1024 (10-bit output)</range>
<details>Defines sensor bit depth (10-14 bits is
expected)</details>
<tag id="DNG" />
@@ -2138,7 +2138,7 @@
</array>
<description>A fixed black level offset for each of the
Bayer mosaic channels</description>
- <range>>= 0 each</range>
+ <range>&gt;= 0 each</range>
<details>As per DNG BlackLevelRepeatDim / BlackLevel
tags</details>
<tag id="DNG" />
@@ -2299,7 +2299,7 @@
<description>Time at start of exposure of first
row</description>
<units>nanoseconds</units>
- <range>> 0</range>
+ <range>&gt; 0</range>
<details>Monotonic, should be synced to other timestamps in
system</details>
<tag id="BC" />
@@ -2419,12 +2419,12 @@
<entry name="histogramBucketCount" type="int32">
<description>Number of histogram buckets
supported</description>
- <range>>= 64</range>
+ <range>&gt;= 64</range>
</entry>
<entry name="maxFaceCount" type="int32" visibility="public" >
<description>Maximum number of simultaneously detectable
faces</description>
- <range>>= 4 if availableFaceDetectionModes lists
+ <range>&gt;= 4 if availableFaceDetectionModes lists
modes besides OFF, otherwise 0</range>
</entry>
<entry name="maxHistogramCount" type="int32">
@@ -2537,7 +2537,7 @@
<description>The shading map is a low-resolution floating-point map
that lists the coefficients used to correct for vignetting, for each
Bayer color channel.</description>
- <range>Each gain factor is >= 1</range>
+ <range>Each gain factor is &gt;= 1</range>
<details>The least shaded section of the image should have a gain factor
of 1; all other sections should have gains above 1.
@@ -2715,9 +2715,9 @@
The curve should be linearly interpolated between the
defined points. The points will be listed in increasing
order of P_IN. For example, if the array is: [0.0, 0.0,
- 0.3, 0.5, 1.0, 1.0], then the input->output mapping
- for a few sample points would be: 0 -> 0, 0.15 ->
- 0.25, 0.3 -> 0.5, 0.5 -> 0.64</details>
+ 0.3, 0.5, 1.0, 1.0], then the input-&gt;output mapping
+ for a few sample points would be: 0 -&gt; 0, 0.15 -&gt;
+ 0.25, 0.3 -&gt; 0.5, 0.5 -&gt; 0.64</details>
<tag id="DNG" />
</entry>
<entry name="mode" type="byte" visibility="public" enum="true">
@@ -2738,7 +2738,7 @@
<entry name="maxCurvePoints" type="int32" visibility="public" >
<description>Maximum number of supported points in the
tonemap curve</description>
- <range>>= 128</range>
+ <range>&gt;= 128</range>
</entry>
</static>
<dynamic>