camera: hal_adapter: Use camera module name instead of index in logging
It would be easier to reason about the type/number of cameras on device
with camera module name instead of "Camera module 1".
BUG=None
TEST=See the following log on Nautilus:
> Camera module "Intel Camera3HAL Module" has 1 built-in camera(s)
> Camera module "V4L2 UVC Camera HAL v3" has 1 built-in camera(s)
Change-Id: Ia80512cf3143707abea782d2df703dde95e3a1e4
Reviewed-on: https://chromium-review.googlesource.com/1480890
Commit-Ready: Shik Chen <shik@chromium.org>
Tested-by: Shik Chen <shik@chromium.org>
Reviewed-by: Hung-yu Wu <hywu@chromium.org>
diff --git a/camera/hal_adapter/camera_hal_adapter.cc b/camera/hal_adapter/camera_hal_adapter.cc
index 18c18be..9757a4f 100644
--- a/camera/hal_adapter/camera_hal_adapter.cc
+++ b/camera/hal_adapter/camera_hal_adapter.cc
@@ -7,6 +7,7 @@
#include "hal_adapter/camera_hal_adapter.h"
#include <algorithm>
+#include <iomanip>
#include <string>
#include <tuple>
#include <unordered_map>
@@ -506,7 +507,8 @@
if (m->init) {
int ret = m->init();
if (ret != 0) {
- LOGF(ERROR) << "Failed to init camera module " << m->common.name;
+ LOGF(ERROR) << "Failed to init camera module "
+ << std::quoted(m->common.name);
callback.Run(false);
return;
}
@@ -521,7 +523,8 @@
camera_module_t* m = camera_modules_[module_id];
int n = m->get_number_of_cameras();
- LOGF(INFO) << "Camera module " << module_id << " has " << n << " cameras";
+ LOGF(INFO) << "Camera module " << std::quoted(m->common.name) << " has "
+ << n << " built-in camera(s)";
auto aux = std::make_unique<CameraModuleCallbacksAux>();
aux->camera_device_status_change = camera_device_status_change;
