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 | 23466a95b6b66b9f9592148f4252775e16d46e5b (patch) | |
| tree | 116bb58134dd2eef543f7bacda197f09d139efcf | |
| parent | 5f00501d1cf538af7be0af4ec7866bf5a9397dd4 (diff) | |
| parent | f128dc51c81e6b831806e0de505e4edbb02b7e71 (diff) | |
| download | frameworks_av-23466a95b6b66b9f9592148f4252775e16d46e5b.zip frameworks_av-23466a95b6b66b9f9592148f4252775e16d46e5b.tar.gz frameworks_av-23466a95b6b66b9f9592148f4252775e16d46e5b.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 |