Skip to content

Commit

Permalink
a70q: Import camera hidl
Browse files Browse the repository at this point in the history
*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
  • Loading branch information
Simon1511 authored and rtd1250 committed Oct 30, 2022
1 parent 62b241b commit 873dc69
Show file tree
Hide file tree
Showing 9 changed files with 205 additions and 8 deletions.
6 changes: 3 additions & 3 deletions device.mk
Original file line number Diff line number Diff line change
Expand Up @@ -120,13 +120,13 @@ PRODUCT_PACKAGES += \

# Camera
PRODUCT_PACKAGES += \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected]

# Display/Graphics
Expand Down
47 changes: 47 additions & 0 deletions hidl/camera/provider/Android.bp
Original file line number Diff line number Diff line change
@@ -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: "[email protected]",
defaults: [
"hidl_defaults",
],
compile_multilib: "both",
proprietary: true,
relative_install_path: "hw",
srcs: [
"SamsungCameraProvider.cpp",
"service.cpp"
],
init_rc: ["[email protected]"],
shared_libs: [
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"libbinder",
"libcamera_metadata",
"libcutils",
"libhardware",
"libhidlbase",
"liblog",
"libutils",
],
static_libs: [
"[email protected]",
],
}
60 changes: 60 additions & 0 deletions hidl/camera/provider/SamsungCameraProvider.cpp
Original file line number Diff line number Diff line change
@@ -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 "[email protected]"

#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() {}
35 changes: 35 additions & 0 deletions hidl/camera/provider/SamsungCameraProvider.h
Original file line number Diff line number Diff line change
@@ -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
10 changes: 10 additions & 0 deletions hidl/camera/provider/[email protected]
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
service vendor.camera-provider-2-6 /vendor/bin/hw/[email protected]
interface [email protected]::ICameraProvider legacy/0
interface [email protected]::ICameraProvider legacy/0
interface [email protected]::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
48 changes: 48 additions & 0 deletions hidl/camera/provider/service.cpp
Original file line number Diff line number Diff line change
@@ -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 "[email protected]"

#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("[email protected] 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;
}
2 changes: 0 additions & 2 deletions proprietary-files.txt
Original file line number Diff line number Diff line change
Expand Up @@ -365,8 +365,6 @@ vendor/lib64/[email protected]
vendor/lib64/[email protected]

# Camera
vendor/bin/hw/[email protected]
vendor/etc/init/[email protected]
vendor/lib/[email protected]
vendor/lib/[email protected]
vendor/lib/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions sepolicy/vendor/file_contexts
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,8 @@
/(vendor|system/vendor)/bin/hw/android\.hardware\.usb@1\.1-service\.wahoo u:object_r:hal_usb_default_exec:s0
/(vendor|system/vendor)/bin/hw/nxp\.android\.hardware\.nfc@1\.1-service u:object_r:hal_nfc_default_exec:s0
/(vendor|system/vendor)/bin/hw/vendor\.lineage\.livedisplay@2\.0-service\.samsung-a70q u:object_r:hal_lineage_livedisplay_sysfs_exec:s0
/(vendor|system/vendor)/bin/hw/[email protected] u:object_r:hal_fingerprint_default_exec:s0
/(vendor|system/vendor)/bin/hw/vendor\.samsung\.hardware\.camera\.provider@4\.[0-9]-service u:object_r:hal_camera_default_exec:s0
/(vendor|system/vendor)/bin/hw/[email protected] u:object_r:hal_fingerprint_default_exec:s0
/(vendor|system/vendor)/bin/hw/android\.hardware\.camera\.provider@2\.6-service\.a70q u:object_r:hal_camera_default_exec:s0
/(vendor|system/vendor)/bin/hw/vendor\.samsung\.hardware\.miscpower@2\.0-service u:object_r:hal_power_default_exec:s0
/(vendor|system/vendor)/bin/hw/vendor\.samsung\.hardware\.radio\.configsvc@1\.0-service u:object_r:hal_radio_config_default_exec:s0
/(vendor|system/vendor)/bin/hw/vendor\.samsung\.hardware\.thermal@1\.0-service u:object_r:hal_thermal_default_exec:s0
Expand Down
1 change: 0 additions & 1 deletion sepolicy/vendor/hwservice_contexts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,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
vendor.samsung.hardware.bluetooth::ISehBluetooth u:object_r:hal_bluetooth_hwservice:s0
vendor.samsung.hardware.camera.provider::ISehCameraProvider u:object_r:hal_camera_hwservice:s0
vendor.samsung.hardware.gnss::ISehGnss u:object_r:hal_gnss_hwservice:s0
vendor.samsung.hardware.health::ISehHealth u:object_r:hal_health_hwservice:s0
vendor.samsung.hardware.miscpower::ISehMiscPower u:object_r:hal_miscpower_hwservice:s0
Expand Down

0 comments on commit 873dc69

Please sign in to comment.