From 07ed557e542db613a255778282b58cbab90bfcb0 Mon Sep 17 00:00:00 2001 From: wuyue_hw Date: Fri, 12 Sep 2025 10:58:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E9=99=90=E6=97=A5=E5=BF=97=E6=95=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wuyue_hw --- frameworks/js/camera_napi/src/listener_base.cpp | 4 ++-- .../native/camera/base/src/session/capture_session.cpp | 6 +++--- .../kits/js/camera_napi/include/camera_napi_event_emitter.h | 2 +- .../js/camera_napi/include/camera_napi_template_utils.h | 4 ++-- services/camera_service/src/hcamera_host_manager.cpp | 4 ++-- services/camera_service/src/hstream_common.cpp | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/frameworks/js/camera_napi/src/listener_base.cpp b/frameworks/js/camera_napi/src/listener_base.cpp index 3326316dd..b5c56e553 100644 --- a/frameworks/js/camera_napi/src/listener_base.cpp +++ b/frameworks/js/camera_napi/src/listener_base.cpp @@ -66,7 +66,7 @@ void ListenerBase::SaveCallbackReference(const std::string eventName, napi_value void ListenerBase::RemoveCallbackRef(const std::string eventName, napi_value callback) { if (callback == nullptr) { - MEDIA_INFO_LOG("RemoveCallbackReference: js callback is nullptr, remove all callback reference"); + MEDIA_DEBUG_LOG("RemoveCallbackReference: js callback is nullptr, remove all callback reference"); RemoveAllCallbacks(eventName); return; } @@ -146,7 +146,7 @@ void ListenerBase::RemoveAllCallbacks(const std::string eventName) auto& callbackList = GetCallbackList(eventName); std::lock_guard lock(callbackList.listMutex); callbackList.refList.clear(); - MEDIA_INFO_LOG("RemoveAllCallbacks: remove all js callbacks success"); + MEDIA_DEBUG_LOG("RemoveAllCallbacks: remove all js callbacks success"); } bool ListenerBase::IsEmpty(const std::string eventName) const diff --git a/frameworks/native/camera/base/src/session/capture_session.cpp b/frameworks/native/camera/base/src/session/capture_session.cpp index 0980e1030..4505d7723 100644 --- a/frameworks/native/camera/base/src/session/capture_session.cpp +++ b/frameworks/native/camera/base/src/session/capture_session.cpp @@ -2859,12 +2859,12 @@ void CaptureSession::ProcessProfilesAbilityId(const SceneMode supportModes) CHECK_RETURN_ELOG(!inputDeviceInfo, "ProcessProfilesAbilityId inputDeviceInfo is null"); std::vector photoProfiles = inputDeviceInfo->modePhotoProfiles_[supportModes]; std::vector previewProfiles = inputDeviceInfo->modePreviewProfiles_[supportModes]; - MEDIA_INFO_LOG("photoProfiles size = %{public}zu, photoProfiles size = %{public}zu", photoProfiles.size(), + MEDIA_DEBUG_LOG("photoProfiles size = %{public}zu, previewProfiles size = %{public}zu", photoProfiles.size(), previewProfiles.size()); for (auto i : photoProfiles) { std::vector ids = i.GetAbilityId(); std::string abilityIds = Container2String(ids.begin(), ids.end()); - MEDIA_INFO_LOG("photoProfiles f(%{public}d), w(%{public}d), h(%{public}d), ability:(%{public}s)", + MEDIA_DEBUG_LOG("photoProfiles f(%{public}d), w(%{public}d), h(%{public}d), ability:(%{public}s)", i.GetCameraFormat(), i.GetSize().width, i.GetSize().height, abilityIds.c_str()); if (i.GetCameraFormat() == photoProfile_.GetCameraFormat() && i.GetSize().width == photoProfile_.GetSize().width && @@ -2880,7 +2880,7 @@ void CaptureSession::ProcessProfilesAbilityId(const SceneMode supportModes) for (auto i : previewProfiles) { std::vector ids = i.GetAbilityId(); std::string abilityIds = Container2String(ids.begin(), ids.end()); - MEDIA_INFO_LOG("previewProfiles f(%{public}d), w(%{public}d), h(%{public}d), ability:(%{public}s)", + MEDIA_DEBUG_LOG("previewProfiles f(%{public}d), w(%{public}d), h(%{public}d), ability:(%{public}s)", i.GetCameraFormat(), i.GetSize().width, i.GetSize().height, abilityIds.c_str()); if (i.GetCameraFormat() == previewProfile_.GetCameraFormat() && i.GetSize().width == previewProfile_.GetSize().width && diff --git a/interfaces/kits/js/camera_napi/include/camera_napi_event_emitter.h b/interfaces/kits/js/camera_napi/include/camera_napi_event_emitter.h index 2682cc8cd..fa57b4d6e 100644 --- a/interfaces/kits/js/camera_napi/include/camera_napi_event_emitter.h +++ b/interfaces/kits/js/camera_napi/include/camera_napi_event_emitter.h @@ -58,7 +58,7 @@ public: virtual napi_value UnregisterCallback(napi_env env, CameraNapiCallbackParamParser& jsCbParser) final { auto& callbackName = jsCbParser.GetCallbackName(); - MEDIA_INFO_LOG("CameraNapiEventEmitter::UnregisterCallback functionName:%{public}s", callbackName.c_str()); + MEDIA_DEBUG_LOG("CameraNapiEventEmitter::UnregisterCallback functionName:%{public}s", callbackName.c_str()); auto emitterFunctions = GetEmitterFunctions(); auto it = emitterFunctions.find(callbackName); if (it != emitterFunctions.end()) { diff --git a/interfaces/kits/js/camera_napi/include/camera_napi_template_utils.h b/interfaces/kits/js/camera_napi/include/camera_napi_template_utils.h index 939e97318..2b69b0902 100644 --- a/interfaces/kits/js/camera_napi/include/camera_napi_template_utils.h +++ b/interfaces/kits/js/camera_napi/include/camera_napi_template_utils.h @@ -88,7 +88,7 @@ public: napi_throw_error(env, std::to_string(INVALID_ARGUMENT).c_str(), "callback invalid argument"); return nullptr; } - MEDIA_INFO_LOG("On eventType: %{public}s", jsCallbackParamParser.GetCallbackName().c_str()); + MEDIA_DEBUG_LOG("On eventType: %{public}s", jsCallbackParamParser.GetCallbackName().c_str()); return targetInstance->RegisterCallback(env, jsCallbackParamParser, false); } @@ -120,7 +120,7 @@ public: MEDIA_ERR_LOG("On get invalid argument"); return nullptr; } - MEDIA_INFO_LOG("Off eventType: %{public}s", jsCallbackParamParser.GetCallbackName().c_str()); + MEDIA_DEBUG_LOG("Off eventType: %{public}s", jsCallbackParamParser.GetCallbackName().c_str()); return targetInstance->UnregisterCallback(env, jsCallbackParamParser); } }; diff --git a/services/camera_service/src/hcamera_host_manager.cpp b/services/camera_service/src/hcamera_host_manager.cpp index 9b1aaaad4..603f34496 100644 --- a/services/camera_service/src/hcamera_host_manager.cpp +++ b/services/camera_service/src/hcamera_host_manager.cpp @@ -249,7 +249,7 @@ int32_t HCameraHostManager::CameraHostInfo::GetCameras(std::vector& { std::lock_guard lock(mutex_); for (auto id : cameraIds_) { - MEDIA_INFO_LOG("CameraHostInfo::GetCameras, current camera %{public}s", id.c_str()); + MEDIA_DEBUG_LOG("CameraHostInfo::GetCameras, current camera %{public}s", id.c_str()); } cameraIds.insert(cameraIds.end(), cameraIds_.begin(), cameraIds_.end()); return CAMERA_OK; @@ -701,7 +701,7 @@ std::shared_ptr HCameraHostManager::Camera std::vector>::iterator it = std::find_if(devices_.begin(), devices_.end(), [cameraId](const auto& deviceInfo) { return deviceInfo->cameraId == cameraId; }); if (it != devices_.end()) { - MEDIA_INFO_LOG("CameraHostInfo::FindCameraDeviceInfo succeed for %{public}s", cameraId.c_str()); + MEDIA_DEBUG_LOG("CameraHostInfo::FindCameraDeviceInfo succeed for %{public}s", cameraId.c_str()); return (*it); } MEDIA_WARNING_LOG("CameraHostInfo::FindCameraDeviceInfo failed for %{public}s", cameraId.c_str()); diff --git a/services/camera_service/src/hstream_common.cpp b/services/camera_service/src/hstream_common.cpp index 852edc655..0999a786f 100644 --- a/services/camera_service/src/hstream_common.cpp +++ b/services/camera_service/src/hstream_common.cpp @@ -164,7 +164,7 @@ int32_t HStreamCommon::UnlinkInput() int32_t HStreamCommon::StopStream() { CAMERA_SYNC_TRACE; - MEDIA_INFO_LOG("HStreamCommon::StopStream streamType:%{public}d, streamId:%{public}d, hdiStreamId:%{public}d, " + MEDIA_DEBUG_LOG("HStreamCommon::StopStream streamType:%{public}d, streamId:%{public}d, hdiStreamId:%{public}d, " "captureId:%{public}d", streamType_, fwkStreamId_, hdiStreamId_, curCaptureID_); auto streamOperator = GetStreamOperator(); if (streamOperator == nullptr) { @@ -234,7 +234,7 @@ void HStreamCommon::SetStreamInfo(StreamInfo_V1_1 &streamInfo) int32_t HStreamCommon::ReleaseStream(bool isDelay) { - MEDIA_INFO_LOG("Enter Into HStreamCommon::Release streamId is:%{public}d, hdiStreamId is:%{public}d, streamType " + MEDIA_DEBUG_LOG("Enter Into HStreamCommon::Release streamId is:%{public}d, hdiStreamId is:%{public}d, streamType " "is:%{public}d, isDelay:%{public}d", fwkStreamId_, hdiStreamId_, streamType_, isDelay); StopStream(); -- Gitee