diff options
| author | Ashwin Ramesh <ashwinr64@lineageos.org> | 2017-07-03 19:55:45 +0530 |
|---|---|---|
| committer | Subhrajyoti Sen <subhrajyoti12@gmail.com> | 2017-07-15 18:54:29 +0530 |
| commit | a9fbafa65b50a009d35ca95f0e1215ce578bf09b (patch) | |
| tree | 51bf1d5edbffb9ea5b98d60e69f600820e965b89 | |
| parent | 8ad93fea0aa8b06572cda1c0f6c2c87666042169 (diff) | |
onyx: QCamera2: Move decleration of Camera Parameters
* These parameters are required for camera to work in nougat.
* Since our camera HAL is OSS this can be moved into the HAL instead of an extra header.
* KEY_APP_MASK[] isn't required anymore.
Change-Id: I2ff9de7c6cc7b3725c7ee04f63375c2e58fbd28a
| -rw-r--r-- | camera/QCamera2/HAL/QCameraParameters.cpp | 4 | ||||
| -rw-r--r-- | camera/QCamera2/HAL/QCameraParameters.h | 4 | ||||
| -rw-r--r-- | include/camera/CameraParametersExtra.h | 25 |
3 files changed, 8 insertions, 25 deletions
diff --git a/camera/QCamera2/HAL/QCameraParameters.cpp b/camera/QCamera2/HAL/QCameraParameters.cpp index 1150855..d9eca01 100644 --- a/camera/QCamera2/HAL/QCameraParameters.cpp +++ b/camera/QCamera2/HAL/QCameraParameters.cpp @@ -336,6 +336,10 @@ const char QCameraParameters::CDS_MODE_AUTO[] = "auto"; const char QCameraParameters::KEY_SELECTED_AUTO_SCENE[] = "selected-auto-scene"; +// Values missing in nougat +const char QCameraParameters::FOCUS_MODE_MANUAL_POSITION[] = "manual"; +const char QCameraParameters::WHITE_BALANCE_MANUAL_CCT[] = "manual-cct"; + static const char* portrait = "portrait"; static const char* landscape = "landscape"; diff --git a/camera/QCamera2/HAL/QCameraParameters.h b/camera/QCamera2/HAL/QCameraParameters.h index 78e1798..6684554 100644 --- a/camera/QCamera2/HAL/QCameraParameters.h +++ b/camera/QCamera2/HAL/QCameraParameters.h @@ -480,6 +480,10 @@ public: static const char FLIP_MODE_H[]; static const char FLIP_MODE_VH[]; + // Values missing in nougat + static const char FOCUS_MODE_MANUAL_POSITION[]; + static const char WHITE_BALANCE_MANUAL_CCT[]; + //Values for CDS Mode static const char CDS_MODE_OFF[]; static const char CDS_MODE_ON[]; diff --git a/include/camera/CameraParametersExtra.h b/include/camera/CameraParametersExtra.h deleted file mode 100644 index 3e52c43..0000000 --- a/include/camera/CameraParametersExtra.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (C) 2016 The CyanogenMod Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#define CAMERA_PARAMETERS_EXTRA_C \ - const char CameraParameters::FOCUS_MODE_MANUAL_POSITION[] = "manual"; \ - const char CameraParameters::KEY_APP_MASK[] = "app-mask"; \ - const char CameraParameters::WHITE_BALANCE_MANUAL_CCT[] = "manual-cct"; - -#define CAMERA_PARAMETERS_EXTRA_H \ - static const char FOCUS_MODE_MANUAL_POSITION[]; \ - static const char KEY_APP_MASK[]; \ - static const char WHITE_BALANCE_MANUAL_CCT[]; |