From 1c5b9426e294b5d6aa05174de202fe4d0282c828 Mon Sep 17 00:00:00 2001 From: Astrako Date: Thu, 23 Jan 2020 21:36:49 +0100 Subject: [PATCH] universal7870: shims: update libcamera_client shim --- shims/libcamera_client/Android.mk | 26 +++++++++ .../CameraParameters.cpp | 2 + shims/libcamera_client/CameraParameters.h | 54 +++++++++++++++++++ 3 files changed, 82 insertions(+) create mode 100644 shims/libcamera_client/Android.mk rename shims/{libexynoscamera => libcamera_client}/CameraParameters.cpp (95%) create mode 100644 shims/libcamera_client/CameraParameters.h diff --git a/shims/libcamera_client/Android.mk b/shims/libcamera_client/Android.mk new file mode 100644 index 0000000..8aaab1a --- /dev/null +++ b/shims/libcamera_client/Android.mk @@ -0,0 +1,26 @@ +# +# Copyright (C) 2018 The LineageOS 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. + +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) +LOCAL_SRC_FILES := CameraParameters.cpp + +LOCAL_MODULE := libcamera_client_shim +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_VENDOR_MODULE := true + +include $(BUILD_SHARED_LIBRARY) diff --git a/shims/libexynoscamera/CameraParameters.cpp b/shims/libcamera_client/CameraParameters.cpp similarity index 95% rename from shims/libexynoscamera/CameraParameters.cpp rename to shims/libcamera_client/CameraParameters.cpp index 5b4fbec..ce26841 100644 --- a/shims/libexynoscamera/CameraParameters.cpp +++ b/shims/libcamera_client/CameraParameters.cpp @@ -29,6 +29,8 @@ const char CameraParameters::EFFECT_WASHED[] = "washed"; const char CameraParameters::ISO_AUTO[] = "auto"; const char CameraParameters::ISO_NIGHT[] = "night"; const char CameraParameters::ISO_SPORTS[] = "sports"; +const char CameraParameters::ISO_6400[] = "6400"; +const char CameraParameters::ISO_3200[] = "3200"; const char CameraParameters::ISO_1600[] = "1600"; const char CameraParameters::ISO_800[] = "800"; const char CameraParameters::ISO_400[] = "400"; diff --git a/shims/libcamera_client/CameraParameters.h b/shims/libcamera_client/CameraParameters.h new file mode 100644 index 0000000..e5dd660 --- /dev/null +++ b/shims/libcamera_client/CameraParameters.h @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2018 The LineageOS 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. + */ + +namespace android { + +class CameraParameters +{ +public: + static const char PIXEL_FORMAT_YUV420SP_NV21[]; + static const char EFFECT_CARTOONIZE[]; + static const char EFFECT_POINT_RED_YELLOW[]; + static const char EFFECT_POINT_GREEN[]; + static const char EFFECT_POINT_BLUE[]; + static const char EFFECT_VINTAGE_COLD[]; + static const char EFFECT_VINTAGE_WARM[]; + static const char EFFECT_WASHED[]; + static const char ISO_AUTO[]; + static const char ISO_NIGHT[]; + static const char ISO_SPORTS[]; + static const char ISO_6400[]; + static const char ISO_3200[]; + static const char ISO_1600[]; + static const char ISO_800[]; + static const char ISO_400[]; + static const char ISO_200[]; + static const char ISO_100[]; + static const char ISO_80[]; + static const char ISO_50[]; + static const char KEY_SUPPORTED_METERING_MODE[]; + static const char METERING_CENTER[]; + static const char METERING_MATRIX[]; + static const char METERING_SPOT[]; + static const char METERING_OFF[]; + static const char KEY_DYNAMIC_RANGE_CONTROL[]; + static const char KEY_SUPPORTED_PHASE_AF[]; + static const char KEY_PHASE_AF[]; + static const char KEY_SUPPORTED_RT_HDR[]; + static const char KEY_RT_HDR[]; +}; + +}; // namespace android