diff options
| author | Igor Murashkin <iam@google.com> | 2013-05-09 19:01:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-09 19:01:19 +0000 |
| commit | 714e392037834a1d183609745e69d3cfc2d26985 (patch) | |
| tree | 0e7cb7acf03cfb1e39a55aae9197689d61bf8fc5 /services | |
| parent | 8513c5ef44428229fc43d4c0fe3f31f0ff79ed41 (diff) | |
| parent | be53a80f4e50921790aa7c5eb12b798b988232b6 (diff) | |
| download | frameworks_av-714e392037834a1d183609745e69d3cfc2d26985.zip frameworks_av-714e392037834a1d183609745e69d3cfc2d26985.tar.gz frameworks_av-714e392037834a1d183609745e69d3cfc2d26985.tar.bz2 | |
Merge "camera2: Add height to the crop region metadata property" into jb-mr2-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/camera/libcameraservice/camera2/Parameters.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/services/camera/libcameraservice/camera2/Parameters.cpp b/services/camera/libcameraservice/camera2/Parameters.cpp index 3503869..910aa19 100644 --- a/services/camera/libcameraservice/camera2/Parameters.cpp +++ b/services/camera/libcameraservice/camera2/Parameters.cpp @@ -1844,13 +1844,14 @@ status_t Parameters::updateRequest(CameraMetadata *request) const { CropRegion::OUTPUT_PREVIEW | CropRegion::OUTPUT_VIDEO | CropRegion::OUTPUT_PICTURE )); - int32_t reqCropRegion[3] = { + int32_t reqCropRegion[4] = { static_cast<int32_t>(crop.left), static_cast<int32_t>(crop.top), - static_cast<int32_t>(crop.width) + static_cast<int32_t>(crop.width), + static_cast<int32_t>(crop.height) }; res = request->update(ANDROID_SCALER_CROP_REGION, - reqCropRegion, 3); + reqCropRegion, 4); if (res != OK) return res; uint8_t reqVstabMode = videoStabilization ? |