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

am e966f01d: am d772b5e3: Merge "Camera: document expected thumbnail size in capture result" into mnc-dev

Browse Source 
* commit 'e966f01d0d6b22fbf0e492cfa5df119394c9e50c':
  Camera: document expected thumbnail size in capture result
This commit is contained in:
Yin-Chia Yeh
2015-06-23 18:08:15 +00:00
committed by Android Git Automerger
parent 59ab4b336e e966f01d0d
commit 361ef3d239
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/hardware/camera2/CaptureRequest.java
View File

@@ -1759,11 +1759,24 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>
* 16:9 aspect ratio, the primary image will be cropped vertically (letterbox) to * 16:9 aspect ratio, the primary image will be cropped vertically (letterbox) to
* generate the thumbnail image. The thumbnail image will always have a smaller Field * generate the thumbnail image. The thumbnail image will always have a smaller Field
* Of View (FOV) than the primary image when aspect ratios differ.</p> * Of View (FOV) than the primary image when aspect ratios differ.</p>
* <p>When an {@link CaptureRequest#JPEG_ORIENTATION android.jpeg.orientation} of non-zero degree is requested,
* the camera device will handle thumbnail rotation in one of the following ways:</p>
* <ul>
* <li>Set the {@link android.media.ExifInterface#TAG_ORIENTATION EXIF orientation flag}
* and keep jpeg and thumbnail image data unrotated.</li>
* <li>Rotate the jpeg and thumbnail image data and not set
* {@link android.media.ExifInterface#TAG_ORIENTATION EXIF orientation flag}. In this
* case, LIMITED or FULL hardware level devices will report rotated thumnail size in
* capture result, so the width and height will be interchanged if 90 or 270 degree
* orientation is requested. LEGACY device will always report unrotated thumbnail
* size.</li>
* </ul>
* <p><b>Range of valid values:</b><br> * <p><b>Range of valid values:</b><br>
* {@link CameraCharacteristics#JPEG_AVAILABLE_THUMBNAIL_SIZES android.jpeg.availableThumbnailSizes}</p> * {@link CameraCharacteristics#JPEG_AVAILABLE_THUMBNAIL_SIZES android.jpeg.availableThumbnailSizes}</p>
* <p>This key is available on all devices.</p> * <p>This key is available on all devices.</p>
* *
* @see CameraCharacteristics#JPEG_AVAILABLE_THUMBNAIL_SIZES * @see CameraCharacteristics#JPEG_AVAILABLE_THUMBNAIL_SIZES
* @see CaptureRequest#JPEG_ORIENTATION
*/ */
@PublicKey @PublicKey
public static final Key<android.util.Size> JPEG_THUMBNAIL_SIZE = public static final Key<android.util.Size> JPEG_THUMBNAIL_SIZE =

13
core/java/android/hardware/camera2/CaptureResult.java
View File

@@ -2314,11 +2314,24 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
* 16:9 aspect ratio, the primary image will be cropped vertically (letterbox) to * 16:9 aspect ratio, the primary image will be cropped vertically (letterbox) to
* generate the thumbnail image. The thumbnail image will always have a smaller Field * generate the thumbnail image. The thumbnail image will always have a smaller Field
* Of View (FOV) than the primary image when aspect ratios differ.</p> * Of View (FOV) than the primary image when aspect ratios differ.</p>
* <p>When an {@link CaptureRequest#JPEG_ORIENTATION android.jpeg.orientation} of non-zero degree is requested,
* the camera device will handle thumbnail rotation in one of the following ways:</p>
* <ul>
* <li>Set the {@link android.media.ExifInterface#TAG_ORIENTATION EXIF orientation flag}
* and keep jpeg and thumbnail image data unrotated.</li>
* <li>Rotate the jpeg and thumbnail image data and not set
* {@link android.media.ExifInterface#TAG_ORIENTATION EXIF orientation flag}. In this
* case, LIMITED or FULL hardware level devices will report rotated thumnail size in
* capture result, so the width and height will be interchanged if 90 or 270 degree
* orientation is requested. LEGACY device will always report unrotated thumbnail
* size.</li>
* </ul>
* <p><b>Range of valid values:</b><br> * <p><b>Range of valid values:</b><br>
* {@link CameraCharacteristics#JPEG_AVAILABLE_THUMBNAIL_SIZES android.jpeg.availableThumbnailSizes}</p> * {@link CameraCharacteristics#JPEG_AVAILABLE_THUMBNAIL_SIZES android.jpeg.availableThumbnailSizes}</p>
* <p>This key is available on all devices.</p> * <p>This key is available on all devices.</p>
* *
* @see CameraCharacteristics#JPEG_AVAILABLE_THUMBNAIL_SIZES * @see CameraCharacteristics#JPEG_AVAILABLE_THUMBNAIL_SIZES
* @see CaptureRequest#JPEG_ORIENTATION
*/ */
@PublicKey @PublicKey
public static final Key<android.util.Size> JPEG_THUMBNAIL_SIZE = public static final Key<android.util.Size> JPEG_THUMBNAIL_SIZE =