* This allows us to get rid of TARGET_SPECIFIC_HEADER_PATH and our custom camera provider for extra camera IDs Change-Id: If7630fc11b117273cae78f26a3ba337823ac58b4fourteen-wip
Tim Zimmermann
1 year ago
committed by
Simon1511
parent
8a0da21487
commit
6526837b69
@ -1,64 +0,0 @@ |
|||||||
// |
|
||||||
// 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. |
|
||||||
|
|
||||||
soong_config_module_type { |
|
||||||
name: "samsung_sm7125_model", |
|
||||||
module_type: "cc_defaults", |
|
||||||
config_namespace: "samsung_sm7125CameraVars", |
|
||||||
value_variables: ["samsung_sm7125_model"], |
|
||||||
properties: ["cppflags"], |
|
||||||
} |
|
||||||
|
|
||||||
samsung_sm7125_model { |
|
||||||
name: "samsung_sm7125_model_defaults", |
|
||||||
soong_config_variables: { |
|
||||||
samsung_sm7125_model: { |
|
||||||
cppflags: ["-DSAMSUNG_SM7125_MODEL_%s"], |
|
||||||
}, |
|
||||||
}, |
|
||||||
} |
|
||||||
|
|
||||||
cc_binary { |
|
||||||
name: "android.hardware.camera.provider@2.6-service.sm7125", |
|
||||||
defaults: [ |
|
||||||
"hidl_defaults", |
|
||||||
"samsung_sm7125_model_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", |
|
||||||
], |
|
||||||
} |
|
||||||
@ -1,69 +0,0 @@ |
|||||||
/*
|
|
||||||
* 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() { |
|
||||||
|
|
||||||
#ifdef SAMSUNG_SM7125_MODEL_a72q |
|
||||||
// tele
|
|
||||||
mExtraIDs.push_back(52); |
|
||||||
#endif |
|
||||||
|
|
||||||
// macro
|
|
||||||
mExtraIDs.push_back(54); |
|
||||||
|
|
||||||
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() {} |
|
||||||
@ -1,35 +0,0 @@ |
|||||||
/*
|
|
||||||
* 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
|
|
||||||
@ -1,10 +0,0 @@ |
|||||||
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 |
|
||||||
@ -1,48 +0,0 @@ |
|||||||
/*
|
|
||||||
* 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; |
|
||||||
} |
|
||||||
Loading…
Reference in new issue