diff options
| author | Sol Boucher <solb@google.com> | 2014-06-12 22:31:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-12 22:31:01 +0000 |
| commit | a13697f68dc01db9c54481b4a6dbcf42711fa052 (patch) | |
| tree | 0b11c7d1086ecba2642790b3bac8de80ae8601c7 /core/java/android/hardware | |
| parent | ce2d2822f977949f2b0b8ae1a59c1a2b499daf68 (diff) | |
| parent | b8cee5175d7cbc4901bd2d56aa6a380b1464a074 (diff) | |
| download | frameworks_base-a13697f68dc01db9c54481b4a6dbcf42711fa052.zip frameworks_base-a13697f68dc01db9c54481b4a6dbcf42711fa052.tar.gz frameworks_base-a13697f68dc01db9c54481b4a6dbcf42711fa052.tar.bz2 | |
am 85d82c70: camera2: Remove stray </p> in CameraDevice#createCaptureSession
* commit '85d82c70e1766c5a38c65fdfda8304aefcaa6576':
camera2: Remove stray </p> in CameraDevice#createCaptureSession
Diffstat (limited to 'core/java/android/hardware')
| -rw-r--r-- | core/java/android/hardware/camera2/CameraDevice.java | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/core/java/android/hardware/camera2/CameraDevice.java b/core/java/android/hardware/camera2/CameraDevice.java index 68f4d64..77d0c41 100644 --- a/core/java/android/hardware/camera2/CameraDevice.java +++ b/core/java/android/hardware/camera2/CameraDevice.java @@ -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 |