Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 521864e7 authored by Ruben Brunk's avatar Ruben Brunk Committed by Android Git Automerger
Browse files

am f8f2f137: Merge "Fix rounding width." into mnc-dev 

* commit 'f8f2f137':
  Fix rounding width.
parents f202611d f8f2f137

services/camera/libcameraservice/api2/CameraDeviceClient.h

+2 −3
Original line number Diff line number Diff line
@@ -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);