Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

camera2: Remove stray </p> in CameraDevice#createCaptureSession

Browse Source 
This was causing strange indentation.
The change also clarifies how to get the supported output sizes in the
ImageReader flow: Although the doc (correctly) instructed the developer to use
StreamConfigurationMap#getOutputSizes(int) with an ImageReader, this instruction
appeared after the bulleted list of output types. Since all other items in that
list specify that getOutputSizes(Class<?>) should be used, the reader shouldn't
be expected to read beyond the list only in this specific case.

Bug: 15574400
Change-Id: Id952b46ae52322d75abbcaffea678d5ba50b22a5
This commit is contained in:
Sol Boucher
2014-06-11 16:35:57 -07:00
committed by Solomon Boucher
parent 879d8b3308
commit b8cee5175d
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/java/android/hardware/camera2/CameraDevice.java
View File

@@ -190,22 +190,18 @@ public abstract class CameraDevice implements AutoCloseable {
* Then obtain the Surface with
* {@link android.renderscript.Allocation#getSurface}.</li>
*
* <li>For access to raw, uncompressed or JPEG data in the application: Create a
* {@link android.media.ImageReader} object with the one of the supported
* {@link StreamConfigurationMap#getOutputFormats() output image formats}, and a
* size from the supported
* {@link StreamConfigurationMap#getOutputSizes(int) sizes for that format}. Then obtain
* a Surface from it with {@link android.media.ImageReader#getSurface}.</li>
* <li>For access to raw, uncompressed JPEG data in the application: Create an
* {@link android.media.ImageReader} object with one of the supported output formats given by
* {@link StreamConfigurationMap#getOutputFormats()}, setting its size to one of the
* corresponding supported sizes by passing the chosen output format into
* {@link StreamConfigurationMap#getOutputSizes(int)}. Then obtain a
* {@link android.view.Surface} from it with {@link android.media.ImageReader#getSurface()}.
* </li>
*
* </ul>
*
* </p>
*
* <p>The camera device will query each Surface's size and formats upon this
* call, so they must be set to a valid setting at this time (in particular:
* if the format is user-visible, it must be one of
* {@link StreamConfigurationMap#getOutputFormats}; and the size must be one of
* {@link StreamConfigurationMap#getOutputSizes(int)}).</p>
* call, so they must be set to a valid setting at this time.</p>
*
* <p>It can take several hundred milliseconds for the session's configuration to complete,
* since camera hardware may need to be powered on or reconfigured. Once the configuration is