diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-08-30 11:37:19 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-30 11:37:19 -0700 |
| commit | 161093230065931260959deb5bffeb98d2c8a7b4 (patch) | |
| tree | 9475c1f8a5aa3182e13f59ebf2e6314fe2a8b396 | |
| parent | f16246f898b8f8bfd96b1bb88ac5a6f1b5d0ef86 (diff) | |
| parent | a1e4e309e9a32afa3a26576fa592789168db182e (diff) | |
| download | frameworks_av-161093230065931260959deb5bffeb98d2c8a7b4.zip frameworks_av-161093230065931260959deb5bffeb98d2c8a7b4.tar.gz frameworks_av-161093230065931260959deb5bffeb98d2c8a7b4.tar.bz2 | |
Merge "Camera2: Require 2 JPEG thumbnail resolutions." into jb-mr1-dev
| -rw-r--r-- | services/camera/libcameraservice/camera2/Parameters.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/camera2/Parameters.cpp b/services/camera/libcameraservice/camera2/Parameters.cpp index 91c5141..2f7d023 100644 --- a/services/camera/libcameraservice/camera2/Parameters.cpp +++ b/services/camera/libcameraservice/camera2/Parameters.cpp @@ -208,7 +208,7 @@ status_t Parameters::initialize(const CameraMetadata *info) { CameraParameters::PIXEL_FORMAT_JPEG); camera_metadata_ro_entry_t availableJpegThumbnailSizes = - staticInfo(ANDROID_JPEG_AVAILABLE_THUMBNAIL_SIZES, 2); + staticInfo(ANDROID_JPEG_AVAILABLE_THUMBNAIL_SIZES, 4); if (!availableJpegThumbnailSizes.count) return NO_INIT; // TODO: Pick default thumbnail size sensibly |