sm7125: Import camera hidl

*From https://github.com/LineageOS/android_device_samsung_exynos9820-common/tree/lineage-19.1/hidl/camera/provider Simon1511: Don't build as 64bit-only and uprev to 2.6 Change-Id: I0627668fba1c8ce0da67d161342871023155a159
2 years ago · 3707617171
parent 227ba8995b
commit 3707617171
9 changed files with 202 additions and 6 deletions
--- a/common.mk
+++ b/common.mk
@ -111,6 +111,7 @@ PRODUCT_PACKAGES += \

 # Camera
 PRODUCT_PACKAGES += \
+    android.hardware.camera.provider@2.6-service.sm7125 \
    android.hardware.camera.provider@2.4-legacy \
    android.hardware.camera.provider@2.5-legacy \
    camera.device@1.0-impl \
--- a/hidl/camera/provider/Android.bp
+++ b/hidl/camera/provider/Android.bp
@ -0,0 +1,47 @@
+//
+// Copyright (C) 2022 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.
+
+
+cc_binary {
+    name: "android.hardware.camera.provider@2.6-service.sm7125",
+    defaults: [
+        "hidl_defaults",
+    ],
+    compile_multilib: "both",
+    proprietary: true,
+    relative_install_path: "hw",
+    srcs: [
+        "SamsungCameraProvider.cpp",
+        "service.cpp"
+    ],
+    init_rc: ["android.hardware.camera.provider@2.6-service.sm7125.rc"],
+    shared_libs: [
+        "android.hardware.camera.provider@2.4",
+        "android.hardware.camera.provider@2.4-legacy",
+        "android.hardware.camera.provider@2.5",
+        "android.hardware.camera.provider@2.5-legacy",
+        "android.hardware.camera.provider@2.6",
+        "libbinder",
+        "libcamera_metadata",
+        "libcutils",
+        "libhardware",
+        "libhidlbase",
+        "liblog",
+        "libutils",
+    ],
+    static_libs: [
+        "android.hardware.camera.common@1.0-helper",
+    ],
+}
--- a/hidl/camera/provider/SamsungCameraProvider.cpp
+++ b/hidl/camera/provider/SamsungCameraProvider.cpp
@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2021 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.
+ */
+
+#define LOG_TAG "SamsungCameraProvider@2.6"
+
+#include "SamsungCameraProvider.h"
+
+#include <algorithm>
+
+using ::android::NO_ERROR;
+using ::android::OK;
+
+const int kMaxCameraIdLen = 16;
+
+SamsungCameraProvider::SamsungCameraProvider() : LegacyCameraProviderImpl_2_5() {
+    if (!mInitFailed) {
+        for (int i : mExtraIDs) {
+            struct camera_info info;
+            auto rc = mModule->getCameraInfo(i, &info);
+
+            if (rc != NO_ERROR) {
+                continue;
+            }
+
+            if (checkCameraVersion(i, info) != OK) {
+                ALOGE("Camera version check failed!");
+                mModule.clear();
+                mInitFailed = true;
+                return;
+            }
+
+#ifdef SAMSUNG_CAMERA_DEBUG
+            ALOGI("ID=%d is at index %d", i, mNumberOfLegacyCameras);
+#endif
+
+            char cameraId[kMaxCameraIdLen];
+            snprintf(cameraId, sizeof(cameraId), "%d", i);
+            std::string cameraIdStr(cameraId);
+            mCameraStatusMap[cameraIdStr] = CAMERA_DEVICE_STATUS_PRESENT;
+
+            addDeviceNames(i);
+            mNumberOfLegacyCameras++;
+        }
+    }
+}
+
+SamsungCameraProvider::~SamsungCameraProvider() {}
--- a/hidl/camera/provider/SamsungCameraProvider.h
+++ b/hidl/camera/provider/SamsungCameraProvider.h
@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2021 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.
+ */
+
+#ifndef SAMSUNG_CAMERA_PROVIDER_H
+
+#include "LegacyCameraProviderImpl_2_5.h"
+
+#define SAMSUNG_CAMERA_DEBUG
+
+using ::android::hardware::camera::provider::V2_5::implementation::LegacyCameraProviderImpl_2_5;
+using ::android::hardware::Return;
+
+class SamsungCameraProvider : public LegacyCameraProviderImpl_2_5 {
+public:
+    SamsungCameraProvider();
+    ~SamsungCameraProvider();
+
+private:
+    std::vector<int> mExtraIDs;
+};
+
+#endif // SAMSUNG_CAMERA_PROVIDER_H
--- a/hidl/camera/provider/android.hardware.camera.provider@2.6-service.sm7125.rc
+++ b/hidl/camera/provider/android.hardware.camera.provider@2.6-service.sm7125.rc
@ -0,0 +1,10 @@
+service vendor.camera-provider-2-6 /vendor/bin/hw/android.hardware.camera.provider@2.6-service.sm7125
+    interface android.hardware.camera.provider@2.6::ICameraProvider legacy/0
+    interface android.hardware.camera.provider@2.5::ICameraProvider legacy/0
+    interface android.hardware.camera.provider@2.4::ICameraProvider legacy/0
+    class hal
+    user cameraserver
+    group audio camera input drmrpc system media_rw sdcard_rw media
+    ioprio rt 4
+    capabilities SYS_NICE
+    task_profiles CameraServiceCapacity MaxPerformance
--- a/hidl/camera/provider/service.cpp
+++ b/hidl/camera/provider/service.cpp
@ -0,0 +1,48 @@
+/*
+ * Copyright 2019 The Android Open Source Project
+ * Copyright 2021 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.
+ */
+
+#define LOG_TAG "android.hardware.camera.provider@2.6-service.samsung"
+
+#include <android/hardware/camera/provider/2.6/ICameraProvider.h>
+#include <binder/ProcessState.h>
+#include <hidl/HidlLazyUtils.h>
+#include <hidl/HidlTransportSupport.h>
+
+#include "CameraProvider_2_5.h"
+#include "SamsungCameraProvider.h"
+
+using android::status_t;
+using android::hardware::camera::provider::V2_5::ICameraProvider;
+
+int main()
+{
+    using namespace android::hardware::camera::provider::V2_5::implementation;
+
+    ALOGI("CameraProvider@2.5 legacy service is starting.");
+
+    ::android::hardware::configureRpcThreadpool(/*threads*/ HWBINDER_THREAD_COUNT, /*willJoin*/ true);
+
+    ::android::sp<ICameraProvider> provider = new CameraProvider<SamsungCameraProvider>();
+
+    status_t status = provider->registerAsService("legacy/0");
+    LOG_ALWAYS_FATAL_IF(status != android::OK, "Error while registering provider service: %d",
+            status);
+
+    ::android::hardware::joinRpcThreadpool();
+
+    return 0;
+}
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@ -158,8 +158,6 @@ vendor/firmware/crnv21.bin
 vendor/firmware/apnv11.bin

 # Camera
-vendor/bin/hw/vendor.samsung.hardware.camera.provider@4.0-service
-vendor/etc/init/vendor.samsung.hardware.camera.provider@4.0-service.rc
 vendor/lib/camera.device@1.0-impl.so
 vendor/lib/camera.device@3.2-impl.so
 vendor/lib/camera.device@3.3-impl.so
--- a/sepolicy/vendor/file_contexts
+++ b/sepolicy/vendor/file_contexts
@ -51,7 +51,7 @@
 # VENDOR
 /(vendor|system/vendor)/bin/factory\.ssc                                                                    u:object_r:factory_ssc_exec:s0
 /(vendor|system/vendor)/bin/hw/macloader                                                                    u:object_r:macloader_exec:s0
-/(vendor|system/vendor)/bin/hw/vendor.samsung.hardware.camera.provider@4.0-service                          u:object_r:hal_camera_default_exec:s0
+/(vendor|system/vendor)/bin/hw/android\.hardware\.camera\.provider@2\.6-service\.sm7125                     u:object_r:hal_camera_default_exec:s0
 /(vendor|system/vendor)/bin/hw/android\.hardware\.drm@[0-9]\.[0-9]-service\.widevine                        u:object_r:hal_drm_widevine_exec:s0
 /(vendor|system/vendor)/bin/hw/android\.hardware\.keymaster@[0-9]\.[0-9]-service\.samsung                   u:object_r:hal_keymaster_default_exec:s0
 /(vendor|system/vendor)/bin/hw/android\.hardware\.power(@[0-9]\.[0-9])?-service\.samsung-libperfmgr         u:object_r:hal_power_default_exec:s0
--- a/sepolicy/vendor/hwservice_contexts
+++ b/sepolicy/vendor/hwservice_contexts
@ -4,9 +4,6 @@ vendor.samsung.hardware.bluetooth.a2dp::ISehBluetoothAudioOffload
 vendor.samsung.hardware.bluetooth.a2dpsink::ISehBluetoothA2dpSinkProvidersFactory           u:object_r:hal_bluetooth_a2dp_hwservice:s0
 vendor.samsung.hardware.bluetooth.audio::ISehBluetoothAudioProvidersFactory                 u:object_r:hal_audio_hwservice:s0

-# Camera
-vendor.samsung.hardware.camera.provider::ISehCameraProvider                                 u:object_r:hal_camera_hwservice:s0
-
 # Fingerprint
 vendor.samsung.hardware.biometrics.fingerprint::ISehBiometricsFingerprint                   u:object_r:hal_fingerprint_hwservice:s0