Commit 0797c3b5 authored by Wei Lee's avatar Wei Lee Committed by Chromium LUCI CQ

VCD: Migrate some VLOG to CAMERA_LOG

The information printed by CAMERA_LOG is visible in feedback report.
Therefore, migrating some VLOG to CAMERA_LOG in VCD should be helpful
for debug camera issues.

Bug: b/172344305
Test: Build successfully
Change-Id: I6398e8a47714417b50fe8225a3fbc443eb860223
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2641689
Auto-Submit: Wei Lee <wtlee@chromium.org>
Reviewed-by: default avatarShik Chen <shik@chromium.org>
Reviewed-by: default avatarGuido Urdaneta <guidou@chromium.org>
Reviewed-by: default avatarSteven Bennetts <stevenjb@chromium.org>
Commit-Queue: Steven Bennetts <stevenjb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#846175}
parent d395d497
......@@ -338,6 +338,7 @@ component("capture_lib") {
"//chromeos/dbus/power",
"//components/chromeos_camera:mojo_mjpeg_decode_accelerator",
"//components/chromeos_camera/common",
"//components/device_event_log",
"//gpu/ipc/common:common",
"//media/capture/video/chromeos/mojom:cros_camera",
"//third_party/libsync",
......
include_rules = [
"+chromeos/dbus",
"+components/device_event_log",
"+mojo/public/cpp",
"+third_party/libyuv",
]
......@@ -22,6 +22,7 @@
#include "base/strings/string_util.h"
#include "base/system/system_monitor.h"
#include "base/unguessable_token.h"
#include "components/device_event_log/device_event_log.h"
#include "media/capture/video/chromeos/camera_app_device_bridge_impl.h"
#include "media/capture/video/chromeos/camera_buffer_factory.h"
#include "media/capture/video/chromeos/camera_hal_dispatcher_impl.h"
......@@ -164,7 +165,7 @@ void CameraHalDelegate::OnRegisteredCameraHalClient(int32_t result) {
camera_hal_client_registered_.Signal();
return;
}
VLOG(1) << "Registered camera HAL client";
CAMERA_LOG(EVENT) << "Registered camera HAL client";
authenticated_ = true;
camera_hal_client_registered_.Signal();
}
......@@ -265,8 +266,9 @@ void CameraHalDelegate::GetSupportedFormats(
continue;
}
VLOG(1) << "Supported format: " << width << "x" << height
<< " fps=" << fps << " format=" << cr_format.video_format;
CAMERA_LOG(EVENT) << "Supported format: " << width << "x" << height
<< " fps=" << fps
<< " format=" << cr_format.video_format;
supported_formats->emplace_back(gfx::Size(width, height), fps,
cr_format.video_format);
}
......@@ -600,7 +602,7 @@ void CameraHalDelegate::OnGotNumberOfCamerasOnIpcThread(int32_t num_cameras) {
LOG(ERROR) << "Failed to get number of cameras: " << num_cameras;
return;
}
VLOG(1) << "Number of built-in cameras: " << num_cameras;
CAMERA_LOG(EVENT) << "Number of built-in cameras: " << num_cameras;
num_builtin_cameras_ = num_cameras;
// Per camera HAL v3 specification SetCallbacks() should be called after the
// first time GetNumberOfCameras() is called, and before other CameraModule
......@@ -709,7 +711,8 @@ void CameraHalDelegate::CameraDeviceStatusChange(
int32_t camera_id,
cros::mojom::CameraDeviceStatus new_status) {
DCHECK(ipc_task_runner_->BelongsToCurrentThread());
VLOG(1) << "camera_id = " << camera_id << ", new_status = " << new_status;
CAMERA_LOG(EVENT) << "camera_id = " << camera_id
<< ", new_status = " << new_status;
base::AutoLock lock(camera_info_lock_);
auto it = camera_info_.find(camera_id);
switch (new_status) {
......
......@@ -23,6 +23,7 @@
#include "base/strings/string_number_conversions.h"
#include "base/synchronization/waitable_event.h"
#include "base/trace_event/trace_event.h"
#include "components/device_event_log/device_event_log.h"
#include "media/base/bind_to_current_loop.h"
#include "media/capture/video/chromeos/mojom/camera_common.mojom.h"
#include "mojo/public/cpp/bindings/pending_remote.h"
......@@ -266,7 +267,7 @@ CameraHalDispatcherImpl::~CameraHalDispatcherImpl() {
proxy_thread_.Stop();
}
blocking_io_thread_.Stop();
VLOG(1) << "CameraHalDispatcherImpl stopped";
CAMERA_LOG(EVENT) << "CameraHalDispatcherImpl stopped";
}
void CameraHalDispatcherImpl::RegisterServer(
......@@ -298,7 +299,7 @@ void CameraHalDispatcherImpl::RegisterServerWithToken(
camera_hal_server_.set_disconnect_handler(
base::BindOnce(&CameraHalDispatcherImpl::OnCameraHalServerConnectionError,
base::Unretained(this)));
VLOG(1) << "Camera HAL server registered";
CAMERA_LOG(EVENT) << "Camera HAL server registered";
std::move(callback).Run(
0, camera_hal_server_callbacks_.BindNewPipeAndPassRemote());
......@@ -565,7 +566,7 @@ void CameraHalDispatcherImpl::AddClientObserverOnProxyThread(
}
client_observers_.insert(std::move(observer));
std::move(result_callback).Run(0);
VLOG(1) << "Camera HAL client registered";
CAMERA_LOG(EVENT) << "Camera HAL client registered";
}
void CameraHalDispatcherImpl::EstablishMojoChannel(
......@@ -573,7 +574,7 @@ void CameraHalDispatcherImpl::EstablishMojoChannel(
DCHECK(proxy_task_runner_->BelongsToCurrentThread());
mojo::PendingRemote<cros::mojom::CameraModule> camera_module;
const auto& type = client_observer->GetType();
VLOG(1) << "Establishing server channel for " << type;
CAMERA_LOG(EVENT) << "Establishing server channel for " << type;
camera_hal_server_->CreateChannel(
camera_module.InitWithNewPipeAndPassReceiver(), type);
client_observer->OnChannelCreated(std::move(camera_module));
......@@ -591,7 +592,7 @@ void CameraHalDispatcherImpl::OnPeerConnected(
void CameraHalDispatcherImpl::OnCameraHalServerConnectionError() {
DCHECK(proxy_task_runner_->BelongsToCurrentThread());
base::AutoLock lock(opened_camera_id_map_lock_);
VLOG(1) << "Camera HAL server connection lost";
CAMERA_LOG(EVENT) << "Camera HAL server connection lost";
camera_hal_server_.reset();
camera_hal_server_callbacks_.reset();
for (auto& opened_camera_id_pair : opened_camera_id_map_) {
......@@ -635,7 +636,7 @@ void CameraHalDispatcherImpl::OnCameraHalClientConnectionError(
auto it = client_observers_.find(client_observer);
if (it != client_observers_.end()) {
client_observers_.erase(it);
VLOG(1) << "Camera HAL client connection lost";
CAMERA_LOG(EVENT) << "Camera HAL client connection lost";
}
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment