Docs: Add figure captions to images
Bug: 18334770
Change-Id: I4ed95bb638b6502129d59c099de9a0cd8b16ccb4
diff --git a/src/devices/camera/camera3.jd b/src/devices/camera/camera3.jd
index 4d4d3a1..fd72ba3 100644
--- a/src/devices/camera/camera3.jd
+++ b/src/devices/camera/camera3.jd
@@ -2,7 +2,7 @@
@jd:body
<!--
- Copyright 2013 The Android Open Source Project
+ Copyright 2014 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -68,8 +68,10 @@
<p>Each mode has slightly different and overlapping capabilities. This made it hard
to implement new types of features, such as burst mode, since it would fall
between two of these modes.<br/>
-<img src="images/camera_block.png" alt="Camera block diagram"/><br/>
-<strong>Figure 1.</strong> Camera components</p>
+<img src="images/camera_block.png" alt="Camera block diagram" id="figure1" />
+<p class="img-caption">
+ <strong>Figure 1.</strong> Camera components
+</p>
<h2 id="v3-enhance">Version 3 enhancements</h2>
@@ -122,8 +124,10 @@
request can be one-shot ( with capture() ), or it may be repeated indefinitely
(with setRepeatingRequest() ). Captures have priority over repeating
requests.</p>
-<img src="images/camera_simple_model.png" alt="Camera data model"/>
-<p><strong>Figure 2.</strong> Camera core operation model</p>
+<img src="images/camera_simple_model.png" alt="Camera data model" id="figure2" />
+<p class="img-caption">
+ <strong>Figure 2.</strong> Camera core operation model
+</p>
<h2 id="supported-version">Supported version</h2>
diff --git a/src/devices/camera/camera3_crop_reprocess.jd b/src/devices/camera/camera3_crop_reprocess.jd
index e617e1e..dd9f9c1 100644
--- a/src/devices/camera/camera3_crop_reprocess.jd
+++ b/src/devices/camera/camera3_crop_reprocess.jd
@@ -96,27 +96,38 @@
</p>
Crop region: (500, 375, 1000, 750) (4:3 aspect ratio)<br/>
640x480 stream crop: (500, 375, 1000, 750) (equal to crop region)<br/>
- 1280x720 stream crop: (500, 469, 1000, 562)<br/>
- <img src="images/crop-region-43-ratio.png" alt="crop-region-43-ratio"/>
+ 1280x720 stream crop: (500, 469, 1000, 562)
+</p>
+ <img src="images/crop-region-43-ratio.png" alt="crop-region-43-ratio" id="figure1" />
+<p class="img-caption">
+ <strong>Figure 1.</strong> 4:3 aspect ratio
</p>
<p>Crop region: (500, 375, 1333, 750) (16:9 aspect ratio)<br/>
640x480 stream crop: (666, 375, 1000, 750)<br/>
- 1280x720 stream crop: (500, 375, 1333, 750) (equal to crop region)<br/>
- <img src="images/crop-region-169-ratio.png" alt="crop-region-169-ratio"/>
- <!-- TODO: Fix alt text and URL -->
+ 1280x720 stream crop: (500, 375, 1333, 750) (equal to crop region)
+</p>
+ <img src="images/crop-region-169-ratio.png" alt="crop-region-169-ratio" id="figure2" />
+<p class="img-caption">
+ <strong>Figure 2.</strong> 16:9 aspect ratio
</p>
<p>Crop region: (500, 375, 750, 750) (1:1 aspect ratio)<br/>
640x480 stream crop: (500, 469, 750, 562)<br/>
- 1280x720 stream crop: (500, 543, 750, 414)<br/>
- <img src="images/crop-region-11-ratio.png" alt="crop-region-11-ratio"/>
- <br/>
+ 1280x720 stream crop: (500, 543, 750, 414)
+</p>
+ <img src="images/crop-region-11-ratio.png" alt="crop-region-11-ratio" id="figure3" />
+<p class="img-caption">
+ <strong>Figure 3.</strong> 1:1 aspect ratio
+</p>
+<p>
And a final example, a 1024x1024 square aspect ratio stream instead of the 480p
stream:<br/>
Crop region: (500, 375, 1000, 750) (4:3 aspect ratio)<br/>
1024x1024 stream crop: (625, 375, 750, 750)<br/>
- 1280x720 stream crop: (500, 469, 1000, 562)<br/>
- <img src="images/crop-region-43-square-ratio.png"
-alt="crop-region-43-square-ratio"/>
+ 1280x720 stream crop: (500, 469, 1000, 562)
+</p>
+ <img src="images/crop-region-43-square-ratio.png" alt="crop-region-43-square-ratio" id="figure4" />
+<p class="img-caption">
+ <strong>Figure 4.</strong> 4:3 aspect ratio, square
</p>
<h2 id="reprocessing">Reprocessing</h2>
<p> Additional support for raw image files is provided by reprocessing support for RAW Bayer
diff --git a/src/devices/camera/camera3_requests_hal.jd b/src/devices/camera/camera3_requests_hal.jd
index 9bd4f28..35c7478 100644
--- a/src/devices/camera/camera3_requests_hal.jd
+++ b/src/devices/camera/camera3_requests_hal.jd
@@ -34,9 +34,10 @@
output and processing. Multiple requests can be in flight at once, and
submitting requests is non-blocking. And the requests are always processed in
the order they are received.<br/>
- <img src="images/camera_model.png" alt="Camera request model"/>
- <br/>
- <strong>Figure 3.</strong> Camera model</p>
+ <img src="images/camera_model.png" alt="Camera request model" id="figure1" />
+ <p class="img-caption">
+ <strong>Figure 1.</strong> Camera model
+</p>
<h2 id="hal-subsystem">The HAL and camera subsystem</h2>
<p> The camera subsystem includes the implementations for components in the camera
pipeline such as the 3A algorithm and processing controls. The camera HAL
@@ -51,9 +52,10 @@
The camera pipeline also supports triggers that the app framework can initiate
to turn on things such as auto-focus. It also sends notifications back to the
app framework, notifying apps of events such as an auto-focus lock or errors.<br/>
- <img src="images/camera_hal.png" alt="Camera hardware abstraction layer"/>
- <br/>
- <strong>Figure 4.</strong> Camera pipeline<br/>
+ <img src="images/camera_hal.png" alt="Camera hardware abstraction layer" id="figure2" />
+ <p class="img-caption">
+ <strong>Figure 2.</strong> Camera pipeline
+ </p>
Please note, some image processing blocks shown in the diagram above are not
well-defined in the initial release.<br/>
The camera pipeline makes the following assumptions:</p>
@@ -92,9 +94,10 @@
<li>All capture configuration and state (except for the 3A routines) is
encapsulated in the requests and results.</li>
</ul>
-<p><img src="images/camera-hal-overview.png" alt="Camera HAL overview"/>
- <br/>
- <strong>Figure 5.</strong> Camera HAL overview</p>
+<p><img src="images/camera-hal-overview.png" alt="Camera HAL overview" id="figure3" />
+<p class="img-caption">
+ <strong>Figure 3.</strong> Camera HAL overview
+</p>
<h2 id="startup">Startup and expected operation sequence</h2>
<p>This section contains a detailed explanation of the steps expected when using
the camera API. Please see <a href="https://android.googlesource.com/platform/hardware/libhardware/+/master/include/hardware/camera3.h">platform/hardware/libhardware/include/hardware/camera3.h</a> for definitions of these structures and methods.</p>
@@ -162,9 +165,10 @@
-ENODEV or NULL after the notify() method returns from a fatal error
message.</li>
</ol>
-<p><img src="images/camera-ops-flow.png" width="600" height="434" alt="Camera operations flow" />
+<img src="images/camera-ops-flow.png" width="600" height="434" alt="Camera operations flow" id="figure4" />
+<p class="img-caption">
+ <strong>Figure 4.</strong> Camera operational flow
</p>
-<p><strong>Figure 6.</strong> Camera operational flow</p>
<h2 id="ops-modes">Operational modes</h2>
<p>The camera 3 HAL device can implement one of two possible operational modes:
limited and full. Full support is expected from new higher-end devices. Limited
diff --git a/src/devices/camera/index.jd b/src/devices/camera/index.jd
index a1e837f..012f989 100644
--- a/src/devices/camera/index.jd
+++ b/src/devices/camera/index.jd
@@ -2,7 +2,7 @@
@jd:body
<!--
- Copyright 2013 The Android Open Source Project
+ Copyright 2014 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -29,7 +29,10 @@
The following figure and list describe the components involved and where to find the source for each:
</p>
-<p><img src="images/camera_hal.png"></p>
+<img src="images/camera_hal.png" alt="Android camera architecture" id="figure1" />
+<p class="img-caption">
+ <strong>Figure 1.</strong> Camera architecture
+</p>
<dl>