camera: rockchip: Use token to replace mojo channel manager instance
We want to hide the detail of the camera mojo channel manager and camera
hal also doesn't need it. Use a token to decouple it.
BUG=b:173033342
TEST=Pass camera.CCAUITakePicture.swa
Change-Id: I7df9a1dbb81c77db3e72838266cc851989469755
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/2550967
Tested-by: Hsu Wei-Cheng <mojahsu@chromium.org>
Commit-Queue: Hsu Wei-Cheng <mojahsu@chromium.org>
Reviewed-by: Wei Lee <wtlee@chromium.org>
Reviewed-by: Hanlin Chen <hanlinchen@google.com>
diff --git a/camera/hal/rockchip/AAL/Camera3HAL.h b/camera/hal/rockchip/AAL/Camera3HAL.h
index ffcc550..ce7ca13 100644
--- a/camera/hal/rockchip/AAL/Camera3HAL.h
+++ b/camera/hal/rockchip/AAL/Camera3HAL.h
@@ -18,7 +18,7 @@
#ifndef _CAMERA3_HAL_H_
#define _CAMERA3_HAL_H_
-#include <cros-camera/camera_mojo_channel_manager.h>
+#include <cros-camera/camera_mojo_channel_manager_token.h>
#include <hardware/camera3.h>
#include "PlatformData.h"
@@ -26,7 +26,7 @@
NAMESPACE_DECLARATION {
-extern cros::CameraMojoChannelManager* g_mojo_manager;
+extern cros::CameraMojoChannelManagerToken* g_mojo_manager_token;
/**
* \class Camera3HAL
diff --git a/camera/hal/rockchip/Camera3HALModule.cpp b/camera/hal/rockchip/Camera3HALModule.cpp
index 42e5ea0..83de449 100644
--- a/camera/hal/rockchip/Camera3HALModule.cpp
+++ b/camera/hal/rockchip/Camera3HALModule.cpp
@@ -59,7 +59,7 @@
*/
static std::mutex sCameraHalMutex;
-cros::CameraMojoChannelManager* android::camera2::g_mojo_manager = nullptr;
+cros::CameraMojoChannelManagerToken* android::camera2::g_mojo_manager_token = nullptr;
int openCameraHardware(int id, const hw_module_t* module, hw_device_t** device)
{
@@ -238,9 +238,9 @@
return 0;
}
-static void set_up(cros::CameraMojoChannelManager* mojo_manager)
+static void set_up(cros::CameraMojoChannelManagerToken* token)
{
- android::camera2::g_mojo_manager = mojo_manager;
+ android::camera2::g_mojo_manager_token = token;
LogHelper::setDebugLevel();
PerformanceTraces::reset();
@@ -256,7 +256,7 @@
{
PlatformData::deinit();
- android::camera2::g_mojo_manager = nullptr;
+ android::camera2::g_mojo_manager_token = nullptr;
}
static struct hw_module_methods_t hal_module_methods = {
diff --git a/camera/hal/rockchip/common/jpeg/ImgEncoderCore.cpp b/camera/hal/rockchip/common/jpeg/ImgEncoderCore.cpp
index 8223ce1..97d0ea2 100644
--- a/camera/hal/rockchip/common/jpeg/ImgEncoderCore.cpp
+++ b/camera/hal/rockchip/common/jpeg/ImgEncoderCore.cpp
@@ -38,7 +38,7 @@
mMainScaled(nullptr),
mThumbScaled(nullptr),
mJpegSetting(nullptr),
- mJpegCompressor(cros::JpegCompressor::GetInstance(g_mojo_manager))
+ mJpegCompressor(cros::JpegCompressor::GetInstance(g_mojo_manager_token))
{
LOG1("@%s", __FUNCTION__);
diff --git a/camera/hal/rockchip/psl/rkisp1/ipc/client/Rockchip3AClient.cpp b/camera/hal/rockchip/psl/rkisp1/ipc/client/Rockchip3AClient.cpp
index c3f6927..98ec303 100644
--- a/camera/hal/rockchip/psl/rkisp1/ipc/client/Rockchip3AClient.cpp
+++ b/camera/hal/rockchip/psl/rkisp1/ipc/client/Rockchip3AClient.cpp
@@ -64,7 +64,7 @@
Rockchip3AClient::notify = notifyCallback;
mBridge = cros::CameraAlgorithmBridge::CreateInstance(
- cros::CameraAlgorithmBackend::kVendorCpu, g_mojo_manager);
+ cros::CameraAlgorithmBackend::kVendorCpu, g_mojo_manager_token);
CheckAndLogError(!mBridge, VOID_VALUE, "@%s, mBridge is nullptr",
__FUNCTION__);
CheckAndLogError((mBridge->Initialize(this) != 0), VOID_VALUE,
