diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2015-06-12 23:34:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-12 23:34:54 +0000 |
| commit | f8f2f137cceebe3bee4ff3219bc75189a4eccc65 (patch) | |
| tree | 3a9785eaa821fbd8f67235af6e27cc7329c08755 /services/camera | |
| parent | 7bf8e1c28ba7ba6eb0c677d9ca749e4238fa43f4 (diff) | |
| parent | 77a77f6ef6f04dba8caa54bda937cb276cace9ad (diff) | |
| download | frameworks_av-f8f2f137cceebe3bee4ff3219bc75189a4eccc65.zip frameworks_av-f8f2f137cceebe3bee4ff3219bc75189a4eccc65.tar.gz frameworks_av-f8f2f137cceebe3bee4ff3219bc75189a4eccc65.tar.bz2 | |
Merge "Fix rounding width." into mnc-dev
Diffstat (limited to 'services/camera')
| -rw-r--r-- | services/camera/libcameraservice/api2/CameraDeviceClient.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/services/camera/libcameraservice/api2/CameraDeviceClient.h b/services/camera/libcameraservice/api2/CameraDeviceClient.h index 3bda70c..0f485ca 100644 --- a/services/camera/libcameraservice/api2/CameraDeviceClient.h +++ b/services/camera/libcameraservice/api2/CameraDeviceClient.h @@ -27,8 +27,7 @@ namespace android { -struct CameraDeviceClientBase : - public CameraService::BasicClient, public BnCameraDeviceUser +struct CameraDeviceClientBase : public CameraService::BasicClient, public BnCameraDeviceUser { typedef ICameraDeviceCallbacks TCamCallbacks; @@ -167,7 +166,7 @@ private: // Find the closest dimensions for a given format in available stream configurations with // a width <= ROUNDING_WIDTH_CAP - static const int32_t ROUNDING_WIDTH_CAP = 1080; + static const int32_t ROUNDING_WIDTH_CAP = 1920; static bool roundBufferDimensionNearest(int32_t width, int32_t height, int32_t format, android_dataspace dataSpace, const CameraMetadata& info, /*out*/int32_t* outWidth, /*out*/int32_t* outHeight); |