Skip to content

Add MIUI camera patches for sdm 660-665 devices [2/2] #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mnasibzade wants to merge 2 commits into
base: alpha-15.1
Choose a base branch
from
Open

Add MIUI camera patches for sdm 660-665 devices [2/2] #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f35c80
libcameraservice: HAX for depth sensor on ginkgo [2/2]
adithya2306 Mar 31, 2024
c724040
libcameraservice: Add support for miui camera mode
adithya2306 Mar 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions services/camera/libcameraservice/CameraService.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
#include <android-base/parseint.h>
#include <android_companion_virtualdevice_flags.h>
#include <android/companion/virtualnative/IVirtualDeviceManagerNative.h>
#include <android-base/properties.h>
#include <binder/ActivityManager.h>
#include <binder/AppOpsManager.h>
#include <binder/IPCThreadState.h>
Expand Down Expand Up @@ -120,6 +121,7 @@ namespace android {
using namespace camera3;
using namespace camera3::SessionConfigurationUtils;

using base::SetProperty;
using binder::Status;
using companion::virtualnative::IVirtualDeviceManagerNative;
using frameworks::cameraservice::service::V2_0::implementation::HidlCameraService;
Expand Down Expand Up @@ -4386,6 +4388,15 @@ status_t CameraService::BasicClient::startCameraOps() {

mOpsActive = true;

// Configure miui camera mode
if (strcmp(mClientPackageName.c_str(), "com.android.camera") == 0) {
SetProperty("sys.camera.miui.apk", "1");
ALOGI("Enabling miui camera mode");
} else {
SetProperty("sys.camera.miui.apk", "0");
ALOGI("Disabling miui camera mode");
}

// Transition device availability listeners from PRESENT -> NOT_AVAILABLE
sCameraService->updateStatus(StatusInternal::NOT_AVAILABLE, mCameraIdStr);

Expand Down
18 changes: 15 additions & 3 deletions services/camera/libcameraservice/device3/hidl/HidlCamera3Device.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
#define CLOGE(fmt, ...) ALOGE("Camera %s: %s: " fmt, mId.c_str(), __FUNCTION__, \
##__VA_ARGS__)

#define CLOGW(fmt, ...) ALOGW("Camera %s: %s: " fmt, mId.c_str(), __FUNCTION__, \
##__VA_ARGS__)

// Convenience macros for transitioning to the error state
#define SET_ERR(fmt, ...) setErrorState( \
"%s: " fmt, __FUNCTION__, \
Expand Down Expand Up @@ -184,10 +187,19 @@ status_t HidlCamera3Device::initialize(sp<CameraProviderManager> manager,
physicalId, /*overrideForPerfClass*/false, &mPhysicalDeviceInfoMap[physicalId],
hardware::ICameraService::ROTATION_OVERRIDE_NONE);
if (res != OK) {
SET_ERR_L("Could not retrieve camera %s characteristics: %s (%d)",
CLOGW("Could not retrieve camera %s characteristics: %s (%d)",
physicalId.c_str(), strerror(-res), res);
session->close();
return res;
// HACK for ginkgo - check camera id 20 for depth sensor
physicalId = "20";
CLOGW("Trying physical camera %s if available", physicalId.c_str());
res = manager->getCameraCharacteristics(
physicalId, false, &mPhysicalDeviceInfoMap[physicalId], true);
if (res != OK) {
SET_ERR_L("Could not retrieve camera %s characteristics: %s (%d)",
physicalId.c_str(), strerror(-res), res);
session->close();
return res;
}
}

bool usePrecorrectArray =
Expand Down