diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2014-09-30 23:44:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-30 23:44:58 +0000 |
| commit | 0a62ab707977d4d6666d1c452ba702442655b6e6 (patch) | |
| tree | 90d739b52260504e3a55dda7cdafb1733fcfbd06 /core/java/android/hardware/camera2 | |
| parent | 6b491b64ba7200a85199452b6a7f99c777105f22 (diff) | |
| parent | 3adf18dc33c1a57983461a3f23976ca9103492c4 (diff) | |
| download | frameworks_base-0a62ab707977d4d6666d1c452ba702442655b6e6.zip frameworks_base-0a62ab707977d4d6666d1c452ba702442655b6e6.tar.gz frameworks_base-0a62ab707977d4d6666d1c452ba702442655b6e6.tar.bz2 | |
Merge "Camera2 Legacy: Set a default thumbnail size" into lmp-dev
Diffstat (limited to 'core/java/android/hardware/camera2')
| -rw-r--r-- | core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java b/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java index 618195a..03540e1 100644 --- a/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java +++ b/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java @@ -1350,6 +1350,14 @@ public class LegacyMetadataMapper { m.set(CaptureRequest.LENS_FOCAL_LENGTH, c.get(CameraCharacteristics.LENS_INFO_AVAILABLE_FOCAL_LENGTHS)[0]); + /* + * jpeg.* + */ + + // jpeg.thumbnailSize - set smallest non-zero size if possible + Size[] sizes = c.get(CameraCharacteristics.JPEG_AVAILABLE_THUMBNAIL_SIZES); + m.set(CaptureRequest.JPEG_THUMBNAIL_SIZE, (sizes.length > 1) ? sizes[1] : sizes[0]); + // TODO: map other request template values return m; } |