From 5aa2eb558a47fb3e4699c8abb6ddf4a288b8cfc8 Mon Sep 17 00:00:00 2001 From: byndyx Date: Tue, 5 Mar 2024 17:44:00 +0800 Subject: [PATCH 1/2] modify hilog Signed-off-by: byndyx --- audiohandler/BUILD.gn | 1 + audiohandler/test/unittest/BUILD.gn | 1 + common/dfx_utils/src/daudio_hidumper.cpp | 2 +- common/include/daudio_log.h | 29 +++---- common/src/daudio_latency_test.cpp | 11 +-- common/src/daudio_log.cpp | 85 ------------------- common/src/daudio_util.cpp | 8 +- common/test/unittest/BUILD.gn | 5 +- .../test/unittest/src/daudio_utils_test.cpp | 1 - .../inner_kits/native_cpp/audio_sink/BUILD.gn | 1 + .../native_cpp/audio_source/BUILD.gn | 1 + .../test/unittest/audiosinktest/BUILD.gn | 1 + .../audioclient/micclient/src/dmic_client.cpp | 16 ++-- .../spkclient/src/dspeaker_client.cpp | 30 ++++--- .../src/daudio_manager_callback.cpp | 8 +- .../managersource/src/dmic_dev.cpp | 15 ++-- .../managersource/src/dspeaker_dev.cpp | 8 +- services/audiomanager/servicesink/BUILD.gn | 1 + .../servicesink/src/daudio_sink_hidumper.cpp | 2 +- services/audiomanager/servicesource/BUILD.gn | 1 + .../test/unittest/managersink/BUILD.gn | 1 + .../test/unittest/sourcedevice/BUILD.gn | 3 + .../audiotransport/receiverengine/BUILD.gn | 1 + services/audiotransport/senderengine/BUILD.gn | 1 + services/common/BUILD.gn | 1 - .../src/daudio_adapter_internal.cpp | 4 +- .../hdfaudioclient/test/unittest/BUILD.gn | 12 ++- 27 files changed, 99 insertions(+), 151 deletions(-) delete mode 100644 common/src/daudio_log.cpp diff --git a/audiohandler/BUILD.gn b/audiohandler/BUILD.gn index 1932bfc6..94edb8af 100644 --- a/audiohandler/BUILD.gn +++ b/audiohandler/BUILD.gn @@ -43,6 +43,7 @@ ohos_shared_library("distributed_audio_handler") { "audio_framework:audio_renderer", "c_utils:utils", "distributed_hardware_fwk:distributedhardwareutils", + "hilog:libhilog", ] defines = [ diff --git a/audiohandler/test/unittest/BUILD.gn b/audiohandler/test/unittest/BUILD.gn index e2b6b28d..08ee4b68 100644 --- a/audiohandler/test/unittest/BUILD.gn +++ b/audiohandler/test/unittest/BUILD.gn @@ -53,6 +53,7 @@ ohos_unittest("AudioHandlerTest") { external_deps = [ "audio_framework:audio_renderer", "c_utils:utils", + "hilog:libhilog", ] } diff --git a/common/dfx_utils/src/daudio_hidumper.cpp b/common/dfx_utils/src/daudio_hidumper.cpp index e5528fce..9c31db94 100644 --- a/common/dfx_utils/src/daudio_hidumper.cpp +++ b/common/dfx_utils/src/daudio_hidumper.cpp @@ -57,9 +57,9 @@ DaudioHidumper::~DaudioHidumper() bool DaudioHidumper::Dump(const std::vector &args, std::string &result) { - DHLOGI("Distributed audio hidumper dump args.size():%d.", args.size()); result.clear(); int32_t argsSize = static_cast(args.size()); + DHLOGI("Distributed audio hidumper dump args.size():%d", argsSize); for (int32_t i = 0; i < argsSize; i++) { DHLOGI("Distributed audio hidumper dump args[%d]: %s.", i, args.at(i).c_str()); } diff --git a/common/include/daudio_log.h b/common/include/daudio_log.h index f74e6865..d708f81e 100644 --- a/common/include/daudio_log.h +++ b/common/include/daudio_log.h @@ -17,28 +17,25 @@ #define OHOS_DAUDIO_LOG_H #include "cJSON.h" +#include "hilog/log.h" +#include + namespace OHOS { namespace DistributedHardware { -typedef enum { - DH_LOG_DEBUG, - DH_LOG_INFO, - DH_LOG_WARN, - DH_LOG_ERROR, -} DHLogLevel; - -void DHLog(DHLogLevel logLevel, const char *fmt, ...); +#undef LOG_TAG +#define LOG_TAG "DAUDIO" -#define DHLOGD(fmt, ...) DHLog(DH_LOG_DEBUG, \ - (std::string("[") + DH_LOG_TAG + "][" + __FUNCTION__ + "]:" + fmt).c_str(), ##__VA_ARGS__) +#define DHLOGD(fmt, ...) HILOG_DEBUG(LOG_CORE, \ + "[%{public}s][%{public}s]:" fmt, DH_LOG_TAG, __FUNCTION__, ##__VA_ARGS__) -#define DHLOGI(fmt, ...) DHLog(DH_LOG_INFO, \ - (std::string("[") + DH_LOG_TAG + "][" + __FUNCTION__ + "]:" + fmt).c_str(), ##__VA_ARGS__) +#define DHLOGI(fmt, ...) HILOG_INFO(LOG_CORE, \ + "[%{public}s][%{public}s]:" fmt, DH_LOG_TAG, __FUNCTION__, ##__VA_ARGS__) -#define DHLOGW(fmt, ...) DHLog(DH_LOG_WARN, \ - (std::string("[") + DH_LOG_TAG + "][" + __FUNCTION__ + "]:" + fmt).c_str(), ##__VA_ARGS__) +#define DHLOGW(fmt, ...) HILOG_WARN(LOG_CORE, \ + "[%{public}s][%{public}s]:" fmt, DH_LOG_TAG, __FUNCTION__, ##__VA_ARGS__) -#define DHLOGE(fmt, ...) DHLog(DH_LOG_ERROR, \ - (std::string("[") + DH_LOG_TAG + "][" + __FUNCTION__ + "]:" + fmt).c_str(), ##__VA_ARGS__) +#define DHLOGE(fmt, ...) HILOG_ERROR(LOG_CORE, \ + "[%{public}s][%{public}s]:" fmt, DH_LOG_TAG, __FUNCTION__, ##__VA_ARGS__) #define CHECK_NULL_VOID(ptr) \ do { \ diff --git a/common/src/daudio_latency_test.cpp b/common/src/daudio_latency_test.cpp index 1fd78732..c0f95381 100644 --- a/common/src/daudio_latency_test.cpp +++ b/common/src/daudio_latency_test.cpp @@ -44,7 +44,7 @@ int32_t DAudioLatencyTest::AddPlayTime(const int64_t playBeepTime) DHLOGE("Catch play high frame, but not in %d ms.", TWO_BEEP_TIME_INTERVAL); return ERR_DH_AUDIO_FAILED; } - DHLOGI("Catch play high frame, playTime: %lld.", playBeepTime); + DHLOGI("Catch play high frame, playTime: %" PRId64, playBeepTime); playBeepTime_.push_back(playBeepTime); lastPlayTime_ = GetNowTimeUs(); return DH_SUCCESS; @@ -61,7 +61,7 @@ int32_t DAudioLatencyTest::AddRecordTime(const int64_t recordBeepTime) DHLOGE("Catch record high frame, but not in %d ms.", TWO_BEEP_TIME_INTERVAL); return ERR_DH_AUDIO_FAILED; } - DHLOGI("Catch record high frame, recordTime: %lld.", recordBeepTime); + DHLOGI("Catch record high frame, recordTime: %" PRId64, recordBeepTime); captureBeepTime_.push_back(recordBeepTime); lastRecordTime_ = GetNowTimeUs(); return DH_SUCCESS; @@ -97,15 +97,16 @@ int32_t DAudioLatencyTest::ComputeLatency() { DHLOGD("Compute latency time."); int32_t playSize = static_cast(playBeepTime_.size()); + int32_t captureSize = static_cast(captureBeepTime_.size()); if (playSize == 0 || playBeepTime_.size() != captureBeepTime_.size()) { - DHLOGE("Record num is not equal <%d, %d>", playSize, captureBeepTime_.size()); + DHLOGE("Record num is not equal %d: %d", playSize, captureSize); return -1; } DHLOGI("Record %d times frame high.", playSize); int32_t sum = 0; for (int32_t i = 0; i < playSize; i++) { - DHLOGI("Send: %lld, Received: %lld", playBeepTime_[i], captureBeepTime_[i]); - DHLOGI("Time is: %d ms.", (captureBeepTime_[i] - playBeepTime_[i]) / US_PER_MS); + DHLOGI("Send: %" PRId64", Received: %" PRId64, playBeepTime_[i], captureBeepTime_[i]); + DHLOGI("Time is: %" PRId64" ms.", (captureBeepTime_[i] - playBeepTime_[i]) / US_PER_MS); sum += captureBeepTime_[i] - playBeepTime_[i]; } DHLOGI("Audio latency in average is: %d us.", sum / playSize); diff --git a/common/src/daudio_log.cpp b/common/src/daudio_log.cpp deleted file mode 100644 index d0ad61fe..00000000 --- a/common/src/daudio_log.cpp +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright (c) 2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "daudio_log.h" - -#include "daudio_constants.h" -#include "securec.h" - -#ifdef HI_LOG_ENABLE -#include "hilog/log.h" -#else -#include -#endif - -namespace OHOS { -namespace DistributedHardware { -static void DHLogOut(DHLogLevel logLevel, const char *logBuf) -{ -#ifdef HI_LOG_ENABLE - LogLevel hiLogLevel = LOG_INFO; - switch (logLevel) { - case DH_LOG_DEBUG: - hiLogLevel = LOG_DEBUG; - break; - case DH_LOG_INFO: - hiLogLevel = LOG_INFO; - break; - case DH_LOG_WARN: - hiLogLevel = LOG_WARN; - break; - case DH_LOG_ERROR: - hiLogLevel = LOG_ERROR; - break; - default: - break; - } - (void)HiLogPrint(LOG_CORE, hiLogLevel, LOG_DOMAIN, DAUDIO_LOG_TITLE_TAG.c_str(), "%{public}s", logBuf); -#else - switch (logLevel) { - case DH_LOG_DEBUG: - printf("[D]%s\n", logBuf); - break; - case DH_LOG_INFO: - printf("[I]%s\n", logBuf); - break; - case DH_LOG_WARN: - printf("[W]%s\n", logBuf); - break; - case DH_LOG_ERROR: - printf("[E]%s\n", logBuf); - break; - default: - break; - } -#endif -} - -void DHLog(DHLogLevel logLevel, const char *fmt, ...) -{ - char logBuf[LOG_MAX_LEN] = {0}; - va_list arg; - va_start(arg, fmt); - - int32_t ret = vsprintf_s(logBuf, sizeof(logBuf), fmt, arg); - va_end(arg); - if (ret < 0) { - DHLogOut(logLevel, "DH log length error."); - return; - } - DHLogOut(logLevel, logBuf); -} -} // namespace DistributedHardware -} // namespace OHOS diff --git a/common/src/daudio_util.cpp b/common/src/daudio_util.cpp index 8f3a6d0e..9c2ebdc7 100644 --- a/common/src/daudio_util.cpp +++ b/common/src/daudio_util.cpp @@ -367,7 +367,7 @@ int32_t AbsoluteSleep(int64_t nanoTime) { int32_t ret = -1; if (nanoTime <= 0) { - DHLOGE("AbsoluteSleep invalid sleep time : %d ns", nanoTime); + DHLOGE("AbsoluteSleep invalid sleep time : %" PRId64" ns", nanoTime); return ret; } struct timespec time; @@ -402,7 +402,8 @@ int64_t UpdateTimeOffset(const int64_t frameIndex, const int64_t framePeriodNs, bool CheckIsNum(const std::string &jsonString) { if (jsonString.empty() || jsonString.size() > MAX_KEY_DH_ID_LEN) { - DHLOGE("Json string size %d, is zero or too long.", jsonString.size()); + int32_t stringSize = static_cast(jsonString.size()); + DHLOGE("Json string size %d, is zero or too long.", stringSize); return false; } for (char const &c : jsonString) { @@ -417,7 +418,8 @@ bool CheckIsNum(const std::string &jsonString) bool CheckDevIdIsLegal(const std::string &devId) { if (devId.empty() || devId.size() > DAUDIO_MAX_DEVICE_ID_LEN) { - DHLOGE("DevId size %d, is zero or too long.", devId.size()); + int32_t stringSize = static_cast(devId.size()); + DHLOGE("DevId size %d, is zero or too long.", stringSize); return false; } for (char const &c : devId) { diff --git a/common/test/unittest/BUILD.gn b/common/test/unittest/BUILD.gn index 168738bc..17054354 100644 --- a/common/test/unittest/BUILD.gn +++ b/common/test/unittest/BUILD.gn @@ -45,7 +45,10 @@ ohos_unittest("DaudioUtilsTest") { "//third_party/googletest:gtest_main", ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "hilog:libhilog", + ] defines = [ "HI_LOG_ENABLE", diff --git a/common/test/unittest/src/daudio_utils_test.cpp b/common/test/unittest/src/daudio_utils_test.cpp index 2521862f..32c342b6 100644 --- a/common/test/unittest/src/daudio_utils_test.cpp +++ b/common/test/unittest/src/daudio_utils_test.cpp @@ -140,7 +140,6 @@ HWTEST_F(DAudioUtilsTest, DAudioUtilTest_001, TestSize.Level1) DHLOGI("DAudio TDD test DHLOGI print."); DHLOGW("DAudio TDD test DHLOGW print."); DHLOGE("DAudio TDD test DHLOGE print."); - DHLog(DHLogLevel::DH_LOG_ERROR, ""); int64_t tvSec; int64_t tvNSec; GetCurrentTime(tvSec, tvNSec); diff --git a/interfaces/inner_kits/native_cpp/audio_sink/BUILD.gn b/interfaces/inner_kits/native_cpp/audio_sink/BUILD.gn index 268fbf79..f47fceaf 100755 --- a/interfaces/inner_kits/native_cpp/audio_sink/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/audio_sink/BUILD.gn @@ -46,6 +46,7 @@ ohos_shared_library("distributed_audio_sink_sdk") { external_deps = [ "c_utils:utils", "distributed_hardware_fwk:distributedhardwareutils", + "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", "ipc:ipc_core", diff --git a/interfaces/inner_kits/native_cpp/audio_source/BUILD.gn b/interfaces/inner_kits/native_cpp/audio_source/BUILD.gn index f86faa6d..43978839 100755 --- a/interfaces/inner_kits/native_cpp/audio_source/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/audio_source/BUILD.gn @@ -46,6 +46,7 @@ ohos_shared_library("distributed_audio_source_sdk") { external_deps = [ "c_utils:utils", "distributed_hardware_fwk:distributedhardwareutils", + "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", "ipc:ipc_core", diff --git a/interfaces/inner_kits/native_cpp/test/unittest/audiosinktest/BUILD.gn b/interfaces/inner_kits/native_cpp/test/unittest/audiosinktest/BUILD.gn index 88d30e02..3e4bc07a 100755 --- a/interfaces/inner_kits/native_cpp/test/unittest/audiosinktest/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/unittest/audiosinktest/BUILD.gn @@ -51,6 +51,7 @@ ohos_unittest("AudioSinkTest") { external_deps = [ "c_utils:utils", + "hilog:libhilog", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/services/audioclient/micclient/src/dmic_client.cpp b/services/audioclient/micclient/src/dmic_client.cpp index 394a389b..17b33560 100644 --- a/services/audioclient/micclient/src/dmic_client.cpp +++ b/services/audioclient/micclient/src/dmic_client.cpp @@ -153,7 +153,7 @@ int32_t DMicClient::TransSetUp() int32_t DMicClient::SetUp(const AudioParam ¶m) { - DHLOGI("Set up mic client, param: {sampleRate: %d, bitFormat: %d," + + DHLOGI("Set up mic client, param: {sampleRate: %d, bitFormat: %d," "channelMask: %d, sourceType: %d, capturerFlags: %d, frameSize: %d}.", param.comParam.sampleRate, param.comParam.bitFormat, param.comParam.channelMask, param.captureOpts.sourceType, param.captureOpts.capturerFlags, param.comParam.frameSize); @@ -252,8 +252,8 @@ void DMicClient::AudioFwkCaptureData() } int64_t endTime = GetNowTimeUs(); if (IsOutDurationRange(startTime, endTime, lastCaptureStartTime_)) { - DHLOGE("This time capture spend: %lld us, The interval of capture this time and the last time: %lld us", - endTime - startTime, startTime - lastCaptureStartTime_); + DHLOGE("This time capture spend: %" PRId64" us, The interval of capture this time and " + "the last time: %" PRId64" us", endTime - startTime, startTime - lastCaptureStartTime_); } lastCaptureStartTime_ = startTime; } @@ -276,8 +276,8 @@ void DMicClient::AudioFwkCaptureData() } int64_t endTransTime = GetNowTimeUs(); if (IsOutDurationRange(startTransTime, endTransTime, lastTransStartTime_)) { - DHLOGE("This time send data spend: %lld us, The interval of send data this time and the last time: %lld us", - endTransTime - startTransTime, startTransTime - lastTransStartTime_); + DHLOGE("This time send data spend: %" PRId64" us, The interval of send data this time and " + "the last time: %" PRId64" us", endTransTime - startTransTime, startTransTime - lastTransStartTime_); } lastTransStartTime_ = startTransTime; } @@ -312,8 +312,10 @@ void DMicClient::OnReadData(size_t length) std::shared_ptr audioData = std::make_shared(audioParam_.comParam.frameSize); if (audioData->Capacity() != bufDesc.bufLength) { - DHLOGE("Audio data length is not equal to buflength. datalength: %d, bufLength: %d", - audioData->Capacity(), bufDesc.bufLength); + uint64_t capacity = static_cast(audioData->Capacity()); + uint64_t bufLength = static_cast(bufDesc.bufLength); + DHLOGE("Audio data length is not equal to buflength. datalength: %" PRIu64", bufLength: %" PRIu64, + capacity, bufLength); } if (memcpy_s(audioData->Data(), audioData->Capacity(), bufDesc.buffer, bufDesc.bufLength) != EOK) { DHLOGE("Copy audio data failed."); diff --git a/services/audioclient/spkclient/src/dspeaker_client.cpp b/services/audioclient/spkclient/src/dspeaker_client.cpp index 5a800462..49eaf747 100644 --- a/services/audioclient/spkclient/src/dspeaker_client.cpp +++ b/services/audioclient/spkclient/src/dspeaker_client.cpp @@ -74,7 +74,7 @@ int32_t DSpeakerClient::InitReceiverEngine(IAVEngineProvider *providerPtr) int32_t DSpeakerClient::CreateAudioRenderer(const AudioParam ¶m) { - DHLOGD("Set up spk client: {sampleRate: %d, bitFormat: %d, channelMask: %d," + + DHLOGD("Set up spk client: {sampleRate: %d, bitFormat: %d, channelMask: %d," "frameSize: %d, contentType: %d, renderFlags: %d, streamUsage: %d}.", param.comParam.sampleRate, param.comParam.bitFormat, param.comParam.channelMask, param.comParam.frameSize, param.renderOpts.contentType, param.renderOpts.renderFlags, param.renderOpts.streamUsage); @@ -127,12 +127,15 @@ void DSpeakerClient::OnWriteData(size_t length) } else { audioData = dataQueue_.front(); dataQueue_.pop(); - DHLOGI("Pop spk data, dataQueue size: %d.", dataQueue_.size()); + uint64_t queueSize = static_cast(dataQueue_.size()); + DHLOGI("Pop spk data, dataQueue size: %" PRIu64, queueSize); } } if (audioData->Capacity() != bufDesc.bufLength) { - DHLOGE("Audio data length is not equal to buflength. datalength: %d, bufLength: %d", - audioData->Capacity(), bufDesc.bufLength); + uint64_t capacity = static_cast(audioData->Capacity()); + uint64_t bufLength = static_cast(bufDesc.bufLength); + DHLOGE("Audio data length is not equal to buflength. datalength: %" PRIu64 + ", bufLength: %" PRIu64, capacity, bufLength); } if (memcpy_s(bufDesc.buffer, bufDesc.bufLength, audioData->Data(), audioData->Capacity()) != EOK) { DHLOGE("Copy audio data failed."); @@ -283,7 +286,8 @@ void DSpeakerClient::PlayThreadRunning() } audioData = dataQueue_.front(); dataQueue_.pop(); - DHLOGD("Pop spk data, dataqueue size: %d.", dataQueue_.size()); + uint64_t queueSize = static_cast(dataQueue_.size()); + DHLOGD("Pop spk data, dataqueue size: %" PRIu64, queueSize); } #ifdef DUMP_DSPEAKERCLIENT_FILE if (DaudioSinkHidumper::GetInstance().QueryDumpDataFlag()) { @@ -294,8 +298,9 @@ void DSpeakerClient::PlayThreadRunning() while (writeOffSet < static_cast(audioData->Capacity())) { int32_t writeLen = audioRenderer_->Write(audioData->Data() + writeOffSet, static_cast(audioData->Capacity()) - writeOffSet); - DHLOGD("Write audio render, write len: %d, raw len: %d, offset: %d", writeLen, audioData->Capacity(), - writeOffSet); + uint64_t capacity = static_cast(audioData->Capacity()); + DHLOGD("Write audio render, write len: %d, raw len: %" PRIu64", offset: %d", + writeLen, capacity, writeOffSet); if (writeLen < 0) { break; } @@ -303,8 +308,8 @@ void DSpeakerClient::PlayThreadRunning() } int64_t endTime = GetNowTimeUs(); if (IsOutDurationRange(startTime, endTime, lastPlayStartTime_)) { - DHLOGE("This time play spend: %lld us, The interval of play this time and the last time: %lld us", - endTime - startTime, startTime - lastPlayStartTime_); + DHLOGE("This time play spend: %" PRId64" us, The interval of play this time and " + "the last time: %" PRId64" us", endTime - startTime, startTime - lastPlayStartTime_); } lastPlayStartTime_ = startTime; } @@ -349,11 +354,12 @@ int32_t DSpeakerClient::OnDecodeTransDataDone(const std::shared_ptr & } dataQueue_.push(audioData); dataQueueCond_.notify_all(); - DHLOGI("Push new spk data, buf len: %d.", dataQueue_.size()); + uint64_t queueSize = static_cast(dataQueue_.size()); + DHLOGI("Push new spk data, buf len: %" PRIu64, queueSize); int64_t endTime = GetNowTimeUs(); if (IsOutDurationRange(startTime, endTime, lastReceiveStartTime_)) { - DHLOGE("This time receivce data spend: %lld us, Receivce data this time and the last time: %lld us", - endTime - startTime, startTime - lastReceiveStartTime_); + DHLOGE("This time receivce data spend: %" PRId64" us, Receivce data this time and " + "the last time: %" PRId64" us", endTime - startTime, startTime - lastReceiveStartTime_); } lastReceiveStartTime_ = startTime; return DH_SUCCESS; diff --git a/services/audiohdiproxy/src/daudio_manager_callback.cpp b/services/audiohdiproxy/src/daudio_manager_callback.cpp index f87c4807..d50f9f08 100644 --- a/services/audiohdiproxy/src/daudio_manager_callback.cpp +++ b/services/audiohdiproxy/src/daudio_manager_callback.cpp @@ -69,7 +69,7 @@ int32_t DAudioManagerCallback::GetAudioParamHDF(const AudioParameter& param, Aud paramHDF.bitFormat = AudioSampleFormat::SAMPLE_S24LE; break; default: - DHLOGE("Format [%zu] does not support conversion.", param.format); + DHLOGE("Format [%" PRIu32"] does not support conversion.", param.format); return HDF_FAILURE; } switch (static_cast(param.streamUsage)) { @@ -86,7 +86,7 @@ int32_t DAudioManagerCallback::GetAudioParamHDF(const AudioParameter& param, Aud paramHDF.streamUsage = StreamUsage::STREAM_USAGE_MEDIA; break; default: - DHLOGE("Stream usage [%zu] does not support conversion.", param.streamUsage); + DHLOGE("Stream usage [%" PRIu32"] does not support conversion.", param.streamUsage); return HDF_FAILURE; } paramHDF.frameSize = param.frameSize; @@ -94,8 +94,8 @@ int32_t DAudioManagerCallback::GetAudioParamHDF(const AudioParameter& param, Aud paramHDF.ext = param.ext; paramHDF.renderFlags = static_cast(param.renderFlags); paramHDF.capturerFlags = static_cast(param.capturerFlags); - DHLOGI("HDF Param: sample rate %d, channel %d, bit format %d, stream usage %d, frame size %zu, " + - "period %zu, renderFlags %d, capturerFlags %d, ext {%s}.", paramHDF.sampleRate, paramHDF.channelMask, + DHLOGI("HDF Param: sample rate %d, channel %d, bit format %d, stream usage %d, frame size %" PRIu32 + ", period %" PRIu32", renderFlags %d, capturerFlags %d, ext {%s}.", paramHDF.sampleRate, paramHDF.channelMask, paramHDF.bitFormat, paramHDF.streamUsage, paramHDF.frameSize, paramHDF.period, paramHDF.renderFlags, paramHDF.capturerFlags, paramHDF.ext.c_str()); return HDF_SUCCESS; diff --git a/services/audiomanager/managersource/src/dmic_dev.cpp b/services/audiomanager/managersource/src/dmic_dev.cpp index de7a394d..8b5779a9 100644 --- a/services/audiomanager/managersource/src/dmic_dev.cpp +++ b/services/audiomanager/managersource/src/dmic_dev.cpp @@ -329,8 +329,8 @@ int32_t DMicDev::ReadStreamData(const std::string &devId, const int32_t dhId, st #endif int64_t endTime = GetNowTimeUs(); if (IsOutDurationRange(startTime, endTime, lastReadStartTime_)) { - DHLOGE("This time read data spend: %lld us, The interval of read data this time and the last time: %lld us", - endTime - startTime, startTime - lastReadStartTime_); + DHLOGE("This time read data spend: %" PRId64" us, The interval of read data this time and " + "the last time: %" PRId64" us", endTime - startTime, startTime - lastReadStartTime_); } lastReadStartTime_ = startTime; return DH_SUCCESS; @@ -339,7 +339,7 @@ int32_t DMicDev::ReadStreamData(const std::string &devId, const int32_t dhId, st int32_t DMicDev::ReadMmapPosition(const std::string &devId, const int32_t dhId, uint64_t &frames, CurrentTimeHDF &time) { - DHLOGD("Read mmap position. frames: %lu, tvsec: %lu, tvNSec:%lu", + DHLOGD("Read mmap position. frames: %" PRIu64", tvsec: %" PRId64", tvNSec:%" PRId64, writeNum_, writeTvSec_, writeTvNSec_); frames = writeNum_; time.tvSec = writeTvSec_; @@ -393,7 +393,7 @@ void DMicDev::EnqueueThread() while (ashmem_ != nullptr && isEnqueueRunning_.load()) { int64_t timeOffset = UpdateTimeOffset(frameIndex_, LOW_LATENCY_INTERVAL_NS, startTime_); - DHLOGD("Write frameIndex: %lld, timeOffset: %lld.", frameIndex_, timeOffset); + DHLOGD("Write frameIndex: %" PRId64", timeOffset: %" PRId64, frameIndex_, timeOffset); std::shared_ptr audioData = nullptr; { std::lock_guard lock(dataQueueMtx_); @@ -512,12 +512,15 @@ int32_t DMicDev::OnDecodeTransDataDone(const std::shared_ptr &audioDa if (isExistedEmpty_.load()) { dataQueSize_ = param_.captureOpts.capturerFlags == MMAP_MODE ? dataQueSize_ : DATA_QUEUE_EXT_SIZE; } + uint64_t queueSize; while (dataQueue_.size() > dataQueSize_) { - DHLOGD("Data queue overflow. buf current size: %d", dataQueue_.size()); + queueSize = static_cast(dataQueue_.size()); + DHLOGD("Data queue overflow. buf current size: %" PRIu64, queueSize); dataQueue_.pop(); } dataQueue_.push(audioData); - DHLOGD("Push new mic data, buf len: %d", dataQueue_.size()); + queueSize = static_cast(dataQueue_.size()); + DHLOGD("Push new mic data, buf len: %" PRIu64, queueSize); return DH_SUCCESS; } } // DistributedHardware diff --git a/services/audiomanager/managersource/src/dspeaker_dev.cpp b/services/audiomanager/managersource/src/dspeaker_dev.cpp index 9207add5..fb83e5c3 100644 --- a/services/audiomanager/managersource/src/dspeaker_dev.cpp +++ b/services/audiomanager/managersource/src/dspeaker_dev.cpp @@ -314,8 +314,8 @@ int32_t DSpeakerDev::WriteStreamData(const std::string &devId, const int32_t dhI } int64_t endTime = GetNowTimeUs(); if (IsOutDurationRange(startTime, endTime, lastwriteStartTime_)) { - DHLOGE("This time write data spend: %lld us, The interval of write data this time and the last time: %lld us", - endTime - startTime, startTime - lastwriteStartTime_); + DHLOGE("This time write data spend: %" PRId64" us, The interval of write data this time and " + "the last time: %" PRId64" us", endTime - startTime, startTime - lastwriteStartTime_); } lastwriteStartTime_ = startTime; return DH_SUCCESS; @@ -324,7 +324,7 @@ int32_t DSpeakerDev::WriteStreamData(const std::string &devId, const int32_t dhI int32_t DSpeakerDev::ReadMmapPosition(const std::string &devId, const int32_t dhId, uint64_t &frames, CurrentTimeHDF &time) { - DHLOGD("Read mmap position. frames: %lu, tvsec: %lu, tvNSec:%lu", + DHLOGD("Read mmap position. frames: %" PRIu64", tvsec: %" PRId64", tvNSec:%" PRId64, readNum_, readTvSec_, readTvNSec_); frames = readNum_; time.tvSec = readTvSec_; @@ -375,7 +375,7 @@ void DSpeakerDev::EnqueueThread() while (ashmem_ != nullptr && isEnqueueRunning_.load()) { int64_t timeOffset = UpdateTimeOffset(frameIndex_, LOW_LATENCY_INTERVAL_NS, startTime_); - DHLOGD("Read frameIndex: %lld, timeOffset: %lld.", frameIndex_, timeOffset); + DHLOGD("Read frameIndex: %" PRId64", timeOffset: %" PRId64, frameIndex_, timeOffset); auto readData = ashmem_->ReadFromAshmem(lengthPerTrans_, readIndex_); DHLOGI("Read from ashmem success! read index: %d, readLength: %d.", readIndex_, lengthPerTrans_); std::shared_ptr audioData = std::make_shared(lengthPerTrans_); diff --git a/services/audiomanager/servicesink/BUILD.gn b/services/audiomanager/servicesink/BUILD.gn index f5d8f5b2..c10b887a 100755 --- a/services/audiomanager/servicesink/BUILD.gn +++ b/services/audiomanager/servicesink/BUILD.gn @@ -89,6 +89,7 @@ ohos_shared_library("distributed_audio_sink") { "eventhandler:libeventhandler", "hdf_core:libhdf_ipc_adapter", "hdf_core:libhdi", + "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", "ipc:ipc_core", diff --git a/services/audiomanager/servicesink/src/daudio_sink_hidumper.cpp b/services/audiomanager/servicesink/src/daudio_sink_hidumper.cpp index 5060b504..0b4b1c3c 100644 --- a/services/audiomanager/servicesink/src/daudio_sink_hidumper.cpp +++ b/services/audiomanager/servicesink/src/daudio_sink_hidumper.cpp @@ -53,9 +53,9 @@ DaudioSinkHidumper::~DaudioSinkHidumper() bool DaudioSinkHidumper::Dump(const std::vector &args, std::string &result) { - DHLOGI("Distributed audio hidumper dump args.size():%d.", args.size()); result.clear(); int32_t argsSize = static_cast(args.size()); + DHLOGI("Distributed audio hidumper dump args.size():%d", argsSize); for (int32_t i = 0; i < argsSize; i++) { DHLOGI("Distributed audio hidumper dump args[%d]: %s.", i, args.at(i).c_str()); } diff --git a/services/audiomanager/servicesource/BUILD.gn b/services/audiomanager/servicesource/BUILD.gn index 64c6d106..cdfbd5ea 100755 --- a/services/audiomanager/servicesource/BUILD.gn +++ b/services/audiomanager/servicesource/BUILD.gn @@ -93,6 +93,7 @@ ohos_shared_library("distributed_audio_source") { "eventhandler:libeventhandler", "hdf_core:libhdi", "hicollie:libhicollie", + "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", "ipc:ipc_core", diff --git a/services/audiomanager/test/unittest/managersink/BUILD.gn b/services/audiomanager/test/unittest/managersink/BUILD.gn index e0355657..f0518d38 100644 --- a/services/audiomanager/test/unittest/managersink/BUILD.gn +++ b/services/audiomanager/test/unittest/managersink/BUILD.gn @@ -82,6 +82,7 @@ ohos_unittest("DaudioSinkDevTest") { "hdf_core:libhdf_ipc_adapter", "hdf_core:libhdf_utils", "hdf_core:libhdi", + "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/services/audiomanager/test/unittest/sourcedevice/BUILD.gn b/services/audiomanager/test/unittest/sourcedevice/BUILD.gn index 15ab6201..031fac43 100644 --- a/services/audiomanager/test/unittest/sourcedevice/BUILD.gn +++ b/services/audiomanager/test/unittest/sourcedevice/BUILD.gn @@ -77,6 +77,7 @@ ohos_unittest("DaudioSourceDevTest") { "drivers_interface_distributed_audio:libdaudioext_proxy_1.0", "dsoftbus:softbus_client", "eventhandler:libeventhandler", + "hilog:libhilog", "ipc:ipc_core", "samgr:samgr_proxy", ] @@ -102,6 +103,7 @@ ohos_unittest("DMicDevTest") { "distributed_hardware_fwk:distributed_av_receiver", "distributed_hardware_fwk:distributed_av_sender", "drivers_interface_distributed_audio:libdaudioext_proxy_1.0", + "hilog:libhilog", "ipc:ipc_core", "samgr:samgr_proxy", ] @@ -127,6 +129,7 @@ ohos_unittest("DSpeakerDevTest") { "distributed_hardware_fwk:distributed_av_receiver", "distributed_hardware_fwk:distributed_av_sender", "drivers_interface_distributed_audio:libdaudioext_proxy_1.0", + "hilog:libhilog", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/services/audiotransport/receiverengine/BUILD.gn b/services/audiotransport/receiverengine/BUILD.gn index bd3173ba..27f9be43 100644 --- a/services/audiotransport/receiverengine/BUILD.gn +++ b/services/audiotransport/receiverengine/BUILD.gn @@ -61,6 +61,7 @@ ohos_shared_library("distributed_audio_decode_transport") { "c_utils:utils", "distributed_hardware_fwk:distributed_av_receiver", "dsoftbus:softbus_client", + "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", "player_framework:media_client", diff --git a/services/audiotransport/senderengine/BUILD.gn b/services/audiotransport/senderengine/BUILD.gn index b5c936aa..5c623318 100644 --- a/services/audiotransport/senderengine/BUILD.gn +++ b/services/audiotransport/senderengine/BUILD.gn @@ -61,6 +61,7 @@ ohos_shared_library("distributed_audio_encode_transport") { "c_utils:utils", "distributed_hardware_fwk:distributed_av_sender", "dsoftbus:softbus_client", + "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", "player_framework:media_client", diff --git a/services/common/BUILD.gn b/services/common/BUILD.gn index 8c7fc469..da1699b3 100644 --- a/services/common/BUILD.gn +++ b/services/common/BUILD.gn @@ -52,7 +52,6 @@ ohos_shared_library("distributed_audio_utils") { "${common_path}/dfx_utils/src/daudio_hisysevent.cpp", "${common_path}/dfx_utils/src/daudio_hitrace.cpp", "${common_path}/src/daudio_latency_test.cpp", - "${common_path}/src/daudio_log.cpp", "${common_path}/src/daudio_util.cpp", "audiodata/src/audio_data.cpp", ] diff --git a/services/hdfaudioclient/src/daudio_adapter_internal.cpp b/services/hdfaudioclient/src/daudio_adapter_internal.cpp index b6128c28..9ad676ba 100644 --- a/services/hdfaudioclient/src/daudio_adapter_internal.cpp +++ b/services/hdfaudioclient/src/daudio_adapter_internal.cpp @@ -200,11 +200,11 @@ static int32_t GetPassthroughModeInternal(struct AudioAdapter *adapter, const st static int32_t InitAudioPortCapability(std::unique_ptr<::AudioPortCapability> &capInternal, AudioPortCapability &capabilityHal) { - DHLOGI("Init audio port capability internal, formatNum: %zu.", capabilityHal.formatNum); + DHLOGI("Init audio port capability internal, formatNum: %" PRIu32, capabilityHal.formatNum); constexpr uint32_t maxFormatNum = 100; constexpr uint32_t minFormatNum = 1; if (capabilityHal.formatNum < minFormatNum || capabilityHal.formatNum > maxFormatNum) { - DHLOGE("Init audio port capability, formatNum: %zu.", capabilityHal.formatNum); + DHLOGE("Init audio port capability, formatNum: %" PRIu32, capabilityHal.formatNum); return ERR_DH_AUDIO_HDI_INVALID_PARAM; } ::AudioFormat *audioFormats = (::AudioFormat *)malloc(capabilityHal.formatNum * sizeof(::AudioFormat)); diff --git a/services/hdfaudioclient/test/unittest/BUILD.gn b/services/hdfaudioclient/test/unittest/BUILD.gn index b483e6ec..1a2b0948 100644 --- a/services/hdfaudioclient/test/unittest/BUILD.gn +++ b/services/hdfaudioclient/test/unittest/BUILD.gn @@ -43,6 +43,7 @@ ohos_unittest("AudioAdapterHdiTest") { external_deps = [ "drivers_interface_distributed_audio:libdaudio_proxy_1.0", + "hilog:libhilog", "ipc:ipc_core", ] @@ -75,7 +76,10 @@ ohos_unittest("AudioRenderInternalTest") { "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", ] - external_deps = [ "drivers_interface_distributed_audio:libdaudio_proxy_1.0" ] + external_deps = [ + "drivers_interface_distributed_audio:libdaudio_proxy_1.0", + "hilog:libhilog", + ] defines = [ "HI_LOG_ENABLE", @@ -106,7 +110,10 @@ ohos_unittest("AudioCaptureInternalTest") { "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", ] - external_deps = [ "drivers_interface_distributed_audio:libdaudio_proxy_1.0" ] + external_deps = [ + "drivers_interface_distributed_audio:libdaudio_proxy_1.0", + "hilog:libhilog", + ] defines = [ "HI_LOG_ENABLE", @@ -141,6 +148,7 @@ ohos_unittest("AudioAdapterInternalTest") { external_deps = [ "c_utils:utils", "drivers_interface_distributed_audio:libdaudio_proxy_1.0", + "hilog:libhilog", ] defines = [ -- Gitee From 819ab7a6b5c729cc0b8bcb0611e09ab30ebc13c6 Mon Sep 17 00:00:00 2001 From: byndyx Date: Wed, 6 Mar 2024 18:19:58 +0800 Subject: [PATCH 2/2] modify every log bak Signed-off-by: byndyx --- audiohandler/src/daudio_handler.cpp | 5 +- common/dfx_utils/src/daudio_hidumper.cpp | 4 +- common/src/daudio_latency_test.cpp | 20 +-- common/src/daudio_util.cpp | 38 +++--- .../audio_sink/src/daudio_sink_handler.cpp | 2 +- .../src/daudio_sink_ipc_callback.cpp | 4 +- .../src/daudio_sink_ipc_callback_stub.cpp | 2 +- .../src/daudio_sink_load_callback.cpp | 4 +- .../audio_source/src/daudio_ipc_callback.cpp | 18 +-- .../src/daudio_ipc_callback_stub.cpp | 2 +- .../src/daudio_source_handler.cpp | 11 +- .../src/daudio_source_load_callback.cpp | 4 +- .../audioclient/micclient/src/dmic_client.cpp | 31 ++--- .../spkclient/src/dspeaker_client.cpp | 60 ++++----- .../audiohdiproxy/src/daudio_hdf_operate.cpp | 8 +- .../audiohdiproxy/src/daudio_hdi_handler.cpp | 16 +-- .../src/daudio_manager_callback.cpp | 17 +-- .../managersink/src/daudio_sink_dev.cpp | 112 ++++++++--------- .../managersink/src/daudio_sink_manager.cpp | 69 +++++------ .../managersource/src/daudio_source_dev.cpp | 114 +++++++++--------- .../src/daudio_source_manager.cpp | 42 +++---- .../managersource/src/dmic_dev.cpp | 65 +++++----- .../managersource/src/dspeaker_dev.cpp | 66 +++++----- .../servicesink/src/daudio_sink_hidumper.cpp | 4 +- .../servicesink/src/daudio_sink_service.cpp | 12 +- .../servicesink/src/daudio_sink_stub.cpp | 2 +- .../src/daudio_source_service.cpp | 12 +- .../src/av_receiver_engine_adapter.cpp | 8 +- .../src/av_receiver_engine_transport.cpp | 4 +- .../src/av_sender_engine_adapter.cpp | 8 +- .../src/av_sender_engine_transport.cpp | 2 +- .../include/daudio_attribute_internal.h | 2 +- .../src/daudio_adapter_internal.cpp | 19 +-- .../src/daudio_capture_internal.cpp | 2 +- .../src/daudio_render_internal.cpp | 2 +- .../src/distributed_audio_client.cpp | 4 +- .../test_example/distributedaudiotest.cpp | 2 +- 37 files changed, 405 insertions(+), 392 deletions(-) diff --git a/audiohandler/src/daudio_handler.cpp b/audiohandler/src/daudio_handler.cpp index f3dcd772..93779bfa 100644 --- a/audiohandler/src/daudio_handler.cpp +++ b/audiohandler/src/daudio_handler.cpp @@ -103,11 +103,12 @@ std::vector DAudioHandler::Query() } dhItem.attrs = jsonInfo; dhItemVec.push_back(dhItem); - DHLOGD("Query result: dhId: %d, subtype: %s, attrs: %s.", dhId, dhItem.subtype.c_str(), jsonInfo); + DHLOGD("Query result: dhId: %{public}d, subtype: %{public}s, attrs: %{public}s.", + dhId, dhItem.subtype.c_str(), jsonInfo); if (dhId == DEFAULT_RENDER_ID) { dhItem.dhId = std::to_string(LOW_LATENCY_RENDER_ID); dhItemVec.push_back(dhItem); - DHLOGD("Query result: dhId: %d, attrs: %s.", LOW_LATENCY_RENDER_ID, jsonInfo); + DHLOGD("Query result: dhId: %{public}d, attrs: %{public}s.", LOW_LATENCY_RENDER_ID, jsonInfo); } cJSON_Delete(infoJson); cJSON_free(jsonInfo); diff --git a/common/dfx_utils/src/daudio_hidumper.cpp b/common/dfx_utils/src/daudio_hidumper.cpp index 9c31db94..93a6098c 100644 --- a/common/dfx_utils/src/daudio_hidumper.cpp +++ b/common/dfx_utils/src/daudio_hidumper.cpp @@ -59,9 +59,9 @@ bool DaudioHidumper::Dump(const std::vector &args, std::string &res { result.clear(); int32_t argsSize = static_cast(args.size()); - DHLOGI("Distributed audio hidumper dump args.size():%d", argsSize); + DHLOGI("Distributed audio hidumper dump args.size():%{public}d", argsSize); for (int32_t i = 0; i < argsSize; i++) { - DHLOGI("Distributed audio hidumper dump args[%d]: %s.", i, args.at(i).c_str()); + DHLOGI("Distributed audio hidumper dump args[%{public}d]: %{public}s.", i, args.at(i).c_str()); } if (args.empty()) { diff --git a/common/src/daudio_latency_test.cpp b/common/src/daudio_latency_test.cpp index c0f95381..d88024b9 100644 --- a/common/src/daudio_latency_test.cpp +++ b/common/src/daudio_latency_test.cpp @@ -41,10 +41,10 @@ DAudioLatencyTest::~DAudioLatencyTest() int32_t DAudioLatencyTest::AddPlayTime(const int64_t playBeepTime) { if (GetNowTimeUs() - lastPlayTime_ <= TWO_BEEP_TIME_INTERVAL) { - DHLOGE("Catch play high frame, but not in %d ms.", TWO_BEEP_TIME_INTERVAL); + DHLOGE("Catch play high frame, but not in %{public}d ms.", TWO_BEEP_TIME_INTERVAL); return ERR_DH_AUDIO_FAILED; } - DHLOGI("Catch play high frame, playTime: %" PRId64, playBeepTime); + DHLOGI("Catch play high frame, playTime: %{public}" PRId64, playBeepTime); playBeepTime_.push_back(playBeepTime); lastPlayTime_ = GetNowTimeUs(); return DH_SUCCESS; @@ -53,15 +53,15 @@ int32_t DAudioLatencyTest::AddPlayTime(const int64_t playBeepTime) int32_t DAudioLatencyTest::AddRecordTime(const int64_t recordBeepTime) { if (captureBeepTime_.size() >= playBeepTime_.size()) { - DHLOGE("Catch record high frame size error, capturesize %zu, playsize %zu.", + DHLOGE("Catch record high frame size error, capturesize %{public}zu, playsize %{public}zu.", captureBeepTime_.size(), playBeepTime_.size()); return ERR_DH_AUDIO_BAD_VALUE; } if (GetNowTimeUs() - lastRecordTime_ <= TWO_BEEP_TIME_INTERVAL) { - DHLOGE("Catch record high frame, but not in %d ms.", TWO_BEEP_TIME_INTERVAL); + DHLOGE("Catch record high frame, but not in %{public}d ms.", TWO_BEEP_TIME_INTERVAL); return ERR_DH_AUDIO_FAILED; } - DHLOGI("Catch record high frame, recordTime: %" PRId64, recordBeepTime); + DHLOGI("Catch record high frame, recordTime: %{public}" PRId64, recordBeepTime); captureBeepTime_.push_back(recordBeepTime); lastRecordTime_ = GetNowTimeUs(); return DH_SUCCESS; @@ -99,17 +99,17 @@ int32_t DAudioLatencyTest::ComputeLatency() int32_t playSize = static_cast(playBeepTime_.size()); int32_t captureSize = static_cast(captureBeepTime_.size()); if (playSize == 0 || playBeepTime_.size() != captureBeepTime_.size()) { - DHLOGE("Record num is not equal %d: %d", playSize, captureSize); + DHLOGE("Record num is not equal %{public}d: %{public}d", playSize, captureSize); return -1; } - DHLOGI("Record %d times frame high.", playSize); + DHLOGI("Record %{public}d times frame high.", playSize); int32_t sum = 0; for (int32_t i = 0; i < playSize; i++) { - DHLOGI("Send: %" PRId64", Received: %" PRId64, playBeepTime_[i], captureBeepTime_[i]); - DHLOGI("Time is: %" PRId64" ms.", (captureBeepTime_[i] - playBeepTime_[i]) / US_PER_MS); + DHLOGI("Send: %{public}" PRId64", Received: %{public}" PRId64, playBeepTime_[i], captureBeepTime_[i]); + DHLOGI("Time is: %{public}" PRId64" ms.", (captureBeepTime_[i] - playBeepTime_[i]) / US_PER_MS); sum += captureBeepTime_[i] - playBeepTime_[i]; } - DHLOGI("Audio latency in average is: %d us.", sum / playSize); + DHLOGI("Audio latency in average is: %{public}d us.", sum / playSize); playBeepTime_.clear(); captureBeepTime_.clear(); return sum / playSize; diff --git a/common/src/daudio_util.cpp b/common/src/daudio_util.cpp index 9c2ebdc7..f8a963fc 100644 --- a/common/src/daudio_util.cpp +++ b/common/src/daudio_util.cpp @@ -130,7 +130,7 @@ int32_t GetLocalDeviceNetworkId(std::string &networkId) NodeBasicInfo basicInfo = { { 0 } }; int32_t ret = GetLocalNodeDeviceInfo(PKG_NAME.c_str(), &basicInfo); if (ret != DH_SUCCESS) { - DHLOGE("Failed to obtain the network ID of the local device. ret: %d", ret); + DHLOGE("Failed to obtain the network ID of the local device. ret: %{public}d", ret); return ret; } @@ -187,7 +187,7 @@ std::string GetAnonyString(const std::string &value) int32_t GetDevTypeByDHId(int32_t dhId) { - DHLOGI("Get dev type by dhId: %d.", dhId); + DHLOGI("Get dev type by dhId: %{public}d.", dhId); if (static_cast(dhId) & 0x8000000) { return AUDIO_DEVICE_TYPE_MIC; } else if (static_cast(dhId) & 0x7ffffff) { @@ -237,7 +237,7 @@ int32_t GetAudioParamBool(const std::string ¶ms, const std::string &key, boo std::string val; int32_t ret = GetAudioParamStr(params, key, val); if (ret != DH_SUCCESS) { - DHLOGE("Get audio param string fail, error code %d.", ret); + DHLOGE("Get audio param string fail, error code %{public}d.", ret); return ret; } @@ -250,11 +250,11 @@ int32_t GetAudioParamInt(const std::string ¶ms, const std::string &key, int3 std::string val = "0"; int32_t ret = GetAudioParamStr(params, key, val); if (ret != DH_SUCCESS) { - DHLOGE("Get audio param string fail, error code %d.", ret); + DHLOGE("Get audio param string fail, error code %{public}d.", ret); return ret; } if (!CheckIsNum(val)) { - DHLOGE("String is not number. str:%s.", val.c_str()); + DHLOGE("String is not number. str:%{public}s.", val.c_str()); return ERR_DH_AUDIO_NOT_SUPPORT; } value = std::stoi(val); @@ -326,18 +326,18 @@ bool CJsonParamCheck(const cJSON *jsonObj, const std::initializer_listsecond; bool res = (*func)(jsonObj, *it); if (!res) { - DHLOGE("The key %s value format in JSON is illegal.", (*it).c_str()); + DHLOGE("The key %{public}s value format in JSON is illegal.", (*it).c_str()); return false; } } @@ -356,7 +356,7 @@ int64_t GetCurNano() clockid_t clockId = CLOCK_MONOTONIC; int ret = clock_gettime(clockId, &time); if (ret < 0) { - DHLOGE("GetCurNanoTime fail, ret: %d", ret); + DHLOGE("GetCurNanoTime fail, ret: %{public}d", ret); return result; } result = (time.tv_sec * AUDIO_NS_PER_SECOND) + time.tv_nsec; @@ -367,7 +367,7 @@ int32_t AbsoluteSleep(int64_t nanoTime) { int32_t ret = -1; if (nanoTime <= 0) { - DHLOGE("AbsoluteSleep invalid sleep time : %" PRId64" ns", nanoTime); + DHLOGE("AbsoluteSleep invalid sleep time : %{public}" PRId64" ns", nanoTime); return ret; } struct timespec time; @@ -377,7 +377,7 @@ int32_t AbsoluteSleep(int64_t nanoTime) clockid_t clockId = CLOCK_MONOTONIC; ret = clock_nanosleep(clockId, TIMER_ABSTIME, &time, nullptr); if (ret != 0) { - DHLOGE("AbsoluteSleep may failed, ret is : %d", ret); + DHLOGE("AbsoluteSleep may failed, ret is : %{public}d", ret); } return ret; } @@ -403,7 +403,7 @@ bool CheckIsNum(const std::string &jsonString) { if (jsonString.empty() || jsonString.size() > MAX_KEY_DH_ID_LEN) { int32_t stringSize = static_cast(jsonString.size()); - DHLOGE("Json string size %d, is zero or too long.", stringSize); + DHLOGE("Json string size %{public}d, is zero or too long.", stringSize); return false; } for (char const &c : jsonString) { @@ -419,7 +419,7 @@ bool CheckDevIdIsLegal(const std::string &devId) { if (devId.empty() || devId.size() > DAUDIO_MAX_DEVICE_ID_LEN) { int32_t stringSize = static_cast(devId.size()); - DHLOGE("DevId size %d, is zero or too long.", stringSize); + DHLOGE("DevId size %{public}d, is zero or too long.", stringSize); return false; } for (char const &c : devId) { @@ -455,32 +455,32 @@ std::string GetCJsonString(const char *key, const char *value) std::string content(jsonData); cJSON_Delete(jParam); cJSON_free(jsonData); - DHLOGD("create cJSON success : %s", content.c_str()); + DHLOGD("create cJSON success : %{public}s", content.c_str()); return content; } std::string ParseStringFromArgs(std::string args, const char *key) { - DHLOGD("ParseStringFrom Args : %s", args.c_str()); + DHLOGD("ParseStringFrom Args : %{public}s", args.c_str()); cJSON *jParam = cJSON_Parse(args.c_str()); if (jParam == nullptr) { - DHLOGE("Failed to parse JSON: %s", cJSON_GetErrorPtr()); + DHLOGE("Failed to parse JSON: %{public}s", cJSON_GetErrorPtr()); return "Failed to parse JSON"; } if (!CJsonParamCheck(jParam, { key })) { - DHLOGE("Not found the key : %s.", key); + DHLOGE("Not found the key : %{public}s.", key); cJSON_Delete(jParam); return "Not found the key."; } cJSON *dhIdItem = cJSON_GetObjectItem(jParam, key); if (dhIdItem == NULL || !cJSON_IsString(dhIdItem)) { - DHLOGE("Not found the value of the key : %s.", key); + DHLOGE("Not found the value of the key : %{public}s.", key); cJSON_Delete(jParam); return "Not found the value."; } std::string content(dhIdItem->valuestring); cJSON_Delete(jParam); - DHLOGD("Parsed string is: %s.", content.c_str()); + DHLOGD("Parsed string is: %{public}s.", content.c_str()); return content; } diff --git a/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_handler.cpp b/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_handler.cpp index 4a4a971f..b904d65b 100644 --- a/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_handler.cpp +++ b/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_handler.cpp @@ -54,7 +54,7 @@ int32_t DAudioSinkHandler::InitSink(const std::string ¶ms) sptr loadCallback(new DAudioSinkLoadCallback(params)); int32_t ret = samgr->LoadSystemAbility(DISTRIBUTED_HARDWARE_AUDIO_SINK_SA_ID, loadCallback); if (ret != ERR_OK) { - DHLOGE("Failed to Load systemAbility ret code: %d.", ret); + DHLOGE("Failed to Load systemAbility ret code: %{public}d.", ret); DAudioHisysevent::GetInstance().SysEventWriteFault(DAUDIO_INIT_FAIL, DISTRIBUTED_HARDWARE_AUDIO_SINK_SA_ID, ERR_DH_AUDIO_SA_LOAD_FAILED, "daudio sink LoadSystemAbility call failed."); return ERR_DH_AUDIO_SA_LOAD_FAILED; diff --git a/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_ipc_callback.cpp b/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_ipc_callback.cpp index 226efb4b..050cd2f8 100644 --- a/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_ipc_callback.cpp +++ b/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_ipc_callback.cpp @@ -28,8 +28,8 @@ namespace DistributedHardware { int32_t DAudioSinkIpcCallback::OnNotifyResourceInfo(const ResourceEventType &type, const std::string &subType, const std::string &networkId, bool &isSensitive, bool &isSameAccount) { - DHLOGI("On notify the resource info, subType: %s, networkId: %s, isSensitive: %d, isSameAccount: %d", - subType.c_str(), networkId.c_str(), isSensitive, isSameAccount); + DHLOGI("On notify the resource info, subType: %{public}s, networkId: %{public}s, isSensitive: " + "%{public}d, isSameAccount: %{public}d", subType.c_str(), networkId.c_str(), isSensitive, isSameAccount); int32_t ret = DH_SUCCESS; std::lock_guard resourceLck(privacyResMtx_); diff --git a/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_ipc_callback_stub.cpp b/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_ipc_callback_stub.cpp index e794b043..4c5e7a47 100644 --- a/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_ipc_callback_stub.cpp +++ b/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_ipc_callback_stub.cpp @@ -31,7 +31,7 @@ DAudioSinkIpcCallbackStub::DAudioSinkIpcCallbackStub() : IRemoteStub(true) int32_t DAudioSinkIpcCallbackStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { - DHLOGI("On remote request, code: %u", code); + DHLOGI("On remote request, code: %{public}u", code); std::u16string desc = DAudioSinkIpcCallbackStub::GetDescriptor(); std::u16string remoteDesc = data.ReadInterfaceToken(); if (desc != remoteDesc) { diff --git a/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_load_callback.cpp b/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_load_callback.cpp index c81bcdbf..8b5e014f 100644 --- a/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_load_callback.cpp +++ b/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_load_callback.cpp @@ -27,14 +27,14 @@ namespace DistributedHardware { void DAudioSinkLoadCallback::OnLoadSystemAbilitySuccess( int32_t systemAbilityId, const sptr &remoteObject) { - DHLOGI("Load audio SA success, systemAbilityId: %d.", systemAbilityId); + DHLOGI("Load audio SA success, systemAbilityId: %{public}d.", systemAbilityId); CHECK_NULL_VOID(remoteObject); DAudioSinkHandler::GetInstance().FinishStartSA(params_, remoteObject); } void DAudioSinkLoadCallback::OnLoadSystemAbilityFail(int32_t systemAbilityId) { - DHLOGE("Load audio SA failed, systemAbilityId: %d.", systemAbilityId); + DHLOGE("Load audio SA failed, systemAbilityId: %{public}d.", systemAbilityId); DAudioHisysevent::GetInstance().SysEventWriteFault(DAUDIO_INIT_FAIL, "daudio sink LoadSA call failed."); } } // namespace DistributedHardware diff --git a/interfaces/inner_kits/native_cpp/audio_source/src/daudio_ipc_callback.cpp b/interfaces/inner_kits/native_cpp/audio_source/src/daudio_ipc_callback.cpp index 6cfdb76f..6f5d8205 100644 --- a/interfaces/inner_kits/native_cpp/audio_source/src/daudio_ipc_callback.cpp +++ b/interfaces/inner_kits/native_cpp/audio_source/src/daudio_ipc_callback.cpp @@ -28,8 +28,9 @@ namespace DistributedHardware { int32_t DAudioIpcCallback::OnNotifyRegResult(const std::string &devId, const std::string &dhId, const std::string &reqId, int32_t status, const std::string &resultData) { - DHLOGI("On notify the registration result, devId: %s, dhId: %s, status: %d, resultData: %s, reqId: %s", - GetAnonyString(devId).c_str(), dhId.c_str(), status, resultData.c_str(), reqId.c_str()); + DHLOGI("On notify the registration result, devId: %{public}s, dhId: %{public}s, status: %{public}d, " + "resultData: %{public}s, reqId: %{public}s", GetAnonyString(devId).c_str(), dhId.c_str(), + status, resultData.c_str(), reqId.c_str()); if (devId.length() > DAUDIO_MAX_DEVICE_ID_LEN || dhId.length() > DAUDIO_MAX_DEVICE_ID_LEN || reqId.length() > DAUDIO_MAX_DEVICE_ID_LEN) { @@ -49,8 +50,9 @@ int32_t DAudioIpcCallback::OnNotifyRegResult(const std::string &devId, const std int32_t DAudioIpcCallback::OnNotifyUnregResult(const std::string &devId, const std::string &dhId, const std::string &reqId, int32_t status, const std::string &resultData) { - DHLOGI("On notify the unregistration result, devId: %s, dhId: %s, status: %d, resultData: %s, reqId: %s", - GetAnonyString(devId).c_str(), dhId.c_str(), status, resultData.c_str(), reqId.c_str()); + DHLOGI("On notify the unregistration result, devId: %{public}s, dhId: %{public}s, status: %{public}d, " + "resultData: %{public}s, reqId: %{public}s", GetAnonyString(devId).c_str(), dhId.c_str(), + status, resultData.c_str(), reqId.c_str()); if (devId.length() > DAUDIO_MAX_DEVICE_ID_LEN || dhId.length() > DAUDIO_MAX_DEVICE_ID_LEN || reqId.length() > DAUDIO_MAX_DEVICE_ID_LEN) { @@ -69,14 +71,14 @@ int32_t DAudioIpcCallback::OnNotifyUnregResult(const std::string &devId, const s void DAudioIpcCallback::PushRegisterCallback(const std::string &reqId, const std::shared_ptr &callback) { - DHLOGD("Push register callback, reqId: %s", reqId.c_str()); + DHLOGD("Push register callback, reqId: %{public}s", reqId.c_str()); std::lock_guard registerLck(registerMapMtx_); registerCallbackMap_.emplace(reqId, callback); } void DAudioIpcCallback::PopRegisterCallback(const std::string &reqId) { - DHLOGD("Pop register callback, reqId: %s", reqId.c_str()); + DHLOGD("Pop register callback, reqId: %{public}s", reqId.c_str()); std::lock_guard registerLck(registerMapMtx_); registerCallbackMap_.erase(reqId); } @@ -84,14 +86,14 @@ void DAudioIpcCallback::PopRegisterCallback(const std::string &reqId) void DAudioIpcCallback::PushUnregisterCallback(const std::string &reqId, const std::shared_ptr &callback) { - DHLOGD("Push unregister callback, reqId: %s", reqId.c_str()); + DHLOGD("Push unregister callback, reqId: %{public}s", reqId.c_str()); std::lock_guard registerLck(unregisterMapMtx_); unregisterCallbackMap_.emplace(reqId, callback); } void DAudioIpcCallback::PopUnregisterCallback(const std::string &reqId) { - DHLOGD("Pop unregister callback, reqId: %s", reqId.c_str()); + DHLOGD("Pop unregister callback, reqId: %{public}s", reqId.c_str()); std::lock_guard registerLck(unregisterMapMtx_); unregisterCallbackMap_.erase(reqId); } diff --git a/interfaces/inner_kits/native_cpp/audio_source/src/daudio_ipc_callback_stub.cpp b/interfaces/inner_kits/native_cpp/audio_source/src/daudio_ipc_callback_stub.cpp index 35e183de..d4316544 100644 --- a/interfaces/inner_kits/native_cpp/audio_source/src/daudio_ipc_callback_stub.cpp +++ b/interfaces/inner_kits/native_cpp/audio_source/src/daudio_ipc_callback_stub.cpp @@ -32,7 +32,7 @@ DAudioIpcCallbackStub::DAudioIpcCallbackStub() : IRemoteStub(true) int32_t DAudioIpcCallbackStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { - DHLOGI("On remote request, code: %u", code); + DHLOGI("On remote request, code: %{public}u", code); std::u16string desc = DAudioIpcCallbackStub::GetDescriptor(); std::u16string remoteDesc = data.ReadInterfaceToken(); if (desc != remoteDesc) { diff --git a/interfaces/inner_kits/native_cpp/audio_source/src/daudio_source_handler.cpp b/interfaces/inner_kits/native_cpp/audio_source/src/daudio_source_handler.cpp index cc6ad072..679c5400 100644 --- a/interfaces/inner_kits/native_cpp/audio_source/src/daudio_source_handler.cpp +++ b/interfaces/inner_kits/native_cpp/audio_source/src/daudio_source_handler.cpp @@ -58,7 +58,7 @@ int32_t DAudioSourceHandler::InitSource(const std::string ¶ms) sptr loadCallback = new DAudioSourceLoadCallback(params); int32_t ret = samgr->LoadSystemAbility(DISTRIBUTED_HARDWARE_AUDIO_SOURCE_SA_ID, loadCallback); if (ret != ERR_OK) { - DHLOGE("Failed to Load systemAbility, ret code: %d", ret); + DHLOGE("Failed to Load systemAbility, ret code: %{public}d", ret); DAudioHisysevent::GetInstance().SysEventWriteFault(DAUDIO_INIT_FAIL, DISTRIBUTED_HARDWARE_AUDIO_SOURCE_SA_ID, ERR_DH_AUDIO_SA_LOAD_FAILED, "daudio source LoadSystemAbility call failed."); @@ -97,7 +97,8 @@ int32_t DAudioSourceHandler::ReleaseSource() int32_t DAudioSourceHandler::RegisterDistributedHardware(const std::string &devId, const std::string &dhId, const EnableParam ¶m, std::shared_ptr callback) { - DHLOGI("Register distributed hardware, devId: %s, dhId: %s.", GetAnonyString(devId).c_str(), dhId.c_str()); + DHLOGI("Register distributed hardware, devId: %{public}s, dhId: %{public}s.", + GetAnonyString(devId).c_str(), dhId.c_str()); std::lock_guard lock(sourceProxyMutex_); CHECK_NULL_RETURN(dAudioSourceProxy_, ERR_DH_AUDIO_SA_PROXY_NOT_INIT); CHECK_NULL_RETURN(dAudioIpcCallback_, ERR_DH_AUDIO_NULLPTR); @@ -113,7 +114,8 @@ int32_t DAudioSourceHandler::RegisterDistributedHardware(const std::string &devI int32_t DAudioSourceHandler::UnregisterDistributedHardware(const std::string &devId, const std::string &dhId, std::shared_ptr callback) { - DHLOGI("Unregister distributed hardware, devId: %s, dhId: %s.", GetAnonyString(devId).c_str(), dhId.c_str()); + DHLOGI("Unregister distributed hardware, devId: %{public}s, dhId: %{public}s.", + GetAnonyString(devId).c_str(), dhId.c_str()); std::lock_guard lock(sourceProxyMutex_); CHECK_NULL_RETURN(dAudioSourceProxy_, ERR_DH_AUDIO_SA_PROXY_NOT_INIT); CHECK_NULL_RETURN(dAudioIpcCallback_, ERR_DH_AUDIO_NULLPTR); @@ -129,7 +131,8 @@ int32_t DAudioSourceHandler::UnregisterDistributedHardware(const std::string &de int32_t DAudioSourceHandler::ConfigDistributedHardware(const std::string &devId, const std::string &dhId, const std::string &key, const std::string &value) { - DHLOGI("Config distributed hardware, devId: %s, dhId: %s.", GetAnonyString(devId).c_str(), dhId.c_str()); + DHLOGI("Config distributed hardware, devId: %{public}s, dhId: %{public}s.", + GetAnonyString(devId).c_str(), dhId.c_str()); std::lock_guard lock(sourceProxyMutex_); CHECK_NULL_RETURN(dAudioSourceProxy_, ERR_DH_AUDIO_SA_PROXY_NOT_INIT); if (devId.length() > DAUDIO_MAX_DEVICE_ID_LEN || dhId.length() > DAUDIO_MAX_DEVICE_ID_LEN) { diff --git a/interfaces/inner_kits/native_cpp/audio_source/src/daudio_source_load_callback.cpp b/interfaces/inner_kits/native_cpp/audio_source/src/daudio_source_load_callback.cpp index 134c18ef..c7b3c98b 100644 --- a/interfaces/inner_kits/native_cpp/audio_source/src/daudio_source_load_callback.cpp +++ b/interfaces/inner_kits/native_cpp/audio_source/src/daudio_source_load_callback.cpp @@ -27,14 +27,14 @@ namespace DistributedHardware { void DAudioSourceLoadCallback::OnLoadSystemAbilitySuccess(int32_t systemAbilityId, const sptr &remoteObject) { - DHLOGI("Load audio SA success, systemAbilityId: %d.", systemAbilityId); + DHLOGI("Load audio SA success, systemAbilityId: %{public}d.", systemAbilityId); CHECK_NULL_VOID(remoteObject); DAudioSourceHandler::GetInstance().FinishStartSA(params_, remoteObject); } void DAudioSourceLoadCallback::OnLoadSystemAbilityFail(int32_t systemAbilityId) { - DHLOGE("Load audio SA failed, systemAbilityId: %d", systemAbilityId); + DHLOGE("Load audio SA failed, systemAbilityId: %{public}d", systemAbilityId); DAudioHisysevent::GetInstance().SysEventWriteFault(DAUDIO_INIT_FAIL, "daudio source LoadSA call failed."); } } // namespace DistributedHardware diff --git a/services/audioclient/micclient/src/dmic_client.cpp b/services/audioclient/micclient/src/dmic_client.cpp index 17b33560..d917d3e4 100644 --- a/services/audioclient/micclient/src/dmic_client.cpp +++ b/services/audioclient/micclient/src/dmic_client.cpp @@ -51,7 +51,7 @@ void DMicClient::OnEngineTransEvent(const AVTransEvent &event) void DMicClient::OnEngineTransMessage(const std::shared_ptr &message) { CHECK_NULL_VOID(message); - DHLOGI("On Engine message, type : %s.", GetEventNameByType(message->type_).c_str()); + DHLOGI("On Engine message, type : %{public}s.", GetEventNameByType(message->type_).c_str()); DAudioSinkManager::GetInstance().HandleDAudioNotify(message->dstDevId_, message->dstDevId_, static_cast(message->type_), message->content_); } @@ -72,7 +72,7 @@ int32_t DMicClient::InitSenderEngine(IAVEngineProvider *providerPtr) int32_t DMicClient::OnStateChange(const AudioEventType type) { - DHLOGD("On state change type: %d.", type); + DHLOGD("On state change type: %{public}d.", type); AudioEvent event; cJSON *jParam = cJSON_CreateObject(); CHECK_NULL_RETURN(jParam, ERR_DH_AUDIO_NULLPTR); @@ -102,7 +102,7 @@ int32_t DMicClient::OnStateChange(const AudioEventType type) break; } default: - DHLOGE("Invalid parameter type: %d.", type); + DHLOGE("Invalid parameter type: %{public}d.", type); return ERR_DH_AUDIO_NOT_SUPPORT; } @@ -153,8 +153,8 @@ int32_t DMicClient::TransSetUp() int32_t DMicClient::SetUp(const AudioParam ¶m) { - DHLOGI("Set up mic client, param: {sampleRate: %d, bitFormat: %d," - "channelMask: %d, sourceType: %d, capturerFlags: %d, frameSize: %d}.", + DHLOGI("Set up mic client, param: {sampleRate: %{public}d, bitFormat: %{public}d," + "channelMask: %{public}d, sourceType: %{public}d, capturerFlags: %{public}d, frameSize: %{public}d}.", param.comParam.sampleRate, param.comParam.bitFormat, param.comParam.channelMask, param.captureOpts.sourceType, param.captureOpts.capturerFlags, param.comParam.frameSize); audioParam_ = param; @@ -167,7 +167,7 @@ int32_t DMicClient::SendMessage(uint32_t type, std::string content, std::string if (type != static_cast(NOTIFY_OPEN_MIC_RESULT) && type != static_cast(NOTIFY_CLOSE_MIC_RESULT) && type != static_cast(CLOSE_MIC)) { - DHLOGE("event type is not NOTIFY_OPEN_MIC or NOTIFY_CLOSE_MIC or CLOSE_MIC. type: %u", type); + DHLOGE("event type is not NOTIFY_OPEN_MIC or NOTIFY_CLOSE_MIC or CLOSE_MIC. type: %{public}u", type); return ERR_DH_AUDIO_NULLPTR; } CHECK_NULL_RETURN(micTrans_, ERR_DH_AUDIO_NULLPTR); @@ -181,7 +181,7 @@ int32_t DMicClient::Release() std::lock_guard lck(devMtx_); CHECK_NULL_RETURN(micTrans_, ERR_DH_AUDIO_SA_STATUS_ERR); if (clientStatus_ != AudioStatus::STATUS_READY && clientStatus_ != AudioStatus::STATUS_STOP) { - DHLOGE("Mic status is wrong, %d.", (int32_t)clientStatus_); + DHLOGE("Mic status is wrong, %{public}d.", (int32_t)clientStatus_); return ERR_DH_AUDIO_SA_STATUS_ERR; } bool isReleaseError = false; @@ -210,7 +210,7 @@ int32_t DMicClient::StartCapture() CHECK_NULL_RETURN(audioCapturer_, ERR_DH_AUDIO_NULLPTR); if (clientStatus_ != AudioStatus::STATUS_READY) { - DHLOGE("Audio capturer init failed or mic status wrong, status: %d.", (int32_t)clientStatus_); + DHLOGE("Audio capturer init failed or mic status wrong, status: %{public}d.", (int32_t)clientStatus_); DAudioHisysevent::GetInstance().SysEventWriteFault(DAUDIO_OPT_FAIL, ERR_DH_AUDIO_SA_STATUS_ERR, "daudio init failed or mic status wrong."); return ERR_DH_AUDIO_SA_STATUS_ERR; @@ -252,8 +252,8 @@ void DMicClient::AudioFwkCaptureData() } int64_t endTime = GetNowTimeUs(); if (IsOutDurationRange(startTime, endTime, lastCaptureStartTime_)) { - DHLOGE("This time capture spend: %" PRId64" us, The interval of capture this time and " - "the last time: %" PRId64" us", endTime - startTime, startTime - lastCaptureStartTime_); + DHLOGE("This time capture spend: %{public}" PRId64" us, The interval of capture this time and " + "the last time: %{public}" PRId64" us", endTime - startTime, startTime - lastCaptureStartTime_); } lastCaptureStartTime_ = startTime; } @@ -276,8 +276,9 @@ void DMicClient::AudioFwkCaptureData() } int64_t endTransTime = GetNowTimeUs(); if (IsOutDurationRange(startTransTime, endTransTime, lastTransStartTime_)) { - DHLOGE("This time send data spend: %" PRId64" us, The interval of send data this time and " - "the last time: %" PRId64" us", endTransTime - startTransTime, startTransTime - lastTransStartTime_); + DHLOGE("This time send data spend: %{public}" PRId64" us, The interval of send data this time and " + "the last time: %{public}" PRId64" us", + endTransTime - startTransTime, startTransTime - lastTransStartTime_); } lastTransStartTime_ = startTransTime; } @@ -314,8 +315,8 @@ void DMicClient::OnReadData(size_t length) if (audioData->Capacity() != bufDesc.bufLength) { uint64_t capacity = static_cast(audioData->Capacity()); uint64_t bufLength = static_cast(bufDesc.bufLength); - DHLOGE("Audio data length is not equal to buflength. datalength: %" PRIu64", bufLength: %" PRIu64, - capacity, bufLength); + DHLOGE("Audio data length is not equal to buflength. datalength: %{public}" PRIu64 + ", bufLength: %{public}" PRIu64, capacity, bufLength); } if (memcpy_s(audioData->Data(), audioData->Capacity(), bufDesc.buffer, bufDesc.bufLength) != EOK) { DHLOGE("Copy audio data failed."); @@ -333,7 +334,7 @@ int32_t DMicClient::StopCapture() DHLOGI("Stop capturer."); std::lock_guard lck(devMtx_); if (clientStatus_ != AudioStatus::STATUS_START) { - DHLOGE("Capturee is not start or mic status wrong, status: %d.", (int32_t)clientStatus_); + DHLOGE("Capturee is not start or mic status wrong, status: %{public}d.", (int32_t)clientStatus_); DAudioHisysevent::GetInstance().SysEventWriteFault(DAUDIO_OPT_FAIL, ERR_DH_AUDIO_SA_STATUS_ERR, "daudio capturer is not start or mic status wrong."); return ERR_DH_AUDIO_SA_STATUS_ERR; diff --git a/services/audioclient/spkclient/src/dspeaker_client.cpp b/services/audioclient/spkclient/src/dspeaker_client.cpp index 49eaf747..af8a381d 100644 --- a/services/audioclient/spkclient/src/dspeaker_client.cpp +++ b/services/audioclient/spkclient/src/dspeaker_client.cpp @@ -47,7 +47,7 @@ void DSpeakerClient::OnEngineTransEvent(const AVTransEvent &event) void DSpeakerClient::OnEngineTransMessage(const std::shared_ptr &message) { CHECK_NULL_VOID(message); - DHLOGI("On Engine message, type : %s.", GetEventNameByType(message->type_).c_str()); + DHLOGI("On Engine message, type : %{public}s.", GetEventNameByType(message->type_).c_str()); DAudioSinkManager::GetInstance().HandleDAudioNotify(message->dstDevId_, message->dstDevId_, static_cast(message->type_), message->content_); } @@ -74,8 +74,8 @@ int32_t DSpeakerClient::InitReceiverEngine(IAVEngineProvider *providerPtr) int32_t DSpeakerClient::CreateAudioRenderer(const AudioParam ¶m) { - DHLOGD("Set up spk client: {sampleRate: %d, bitFormat: %d, channelMask: %d," - "frameSize: %d, contentType: %d, renderFlags: %d, streamUsage: %d}.", + DHLOGD("Set up spk client: {sampleRate: %{public}d, bitFormat: %{public}d, channelMask: %{public}d," + "frameSize: %{public}d, contentType: %{public}d, renderFlags: %{public}d, streamUsage: %{public}d}.", param.comParam.sampleRate, param.comParam.bitFormat, param.comParam.channelMask, param.comParam.frameSize, param.renderOpts.contentType, param.renderOpts.renderFlags, param.renderOpts.streamUsage); audioParam_ = param; @@ -128,14 +128,14 @@ void DSpeakerClient::OnWriteData(size_t length) audioData = dataQueue_.front(); dataQueue_.pop(); uint64_t queueSize = static_cast(dataQueue_.size()); - DHLOGI("Pop spk data, dataQueue size: %" PRIu64, queueSize); + DHLOGI("Pop spk data, dataQueue size: %{public}" PRIu64, queueSize); } } if (audioData->Capacity() != bufDesc.bufLength) { uint64_t capacity = static_cast(audioData->Capacity()); uint64_t bufLength = static_cast(bufDesc.bufLength); - DHLOGE("Audio data length is not equal to buflength. datalength: %" PRIu64 - ", bufLength: %" PRIu64, capacity, bufLength); + DHLOGE("Audio data length is not equal to buflength. datalength: %{public}" PRIu64 + ", bufLength: %{public}" PRIu64, capacity, bufLength); } if (memcpy_s(bufDesc.buffer, bufDesc.bufLength, audioData->Data(), audioData->Capacity()) != EOK) { DHLOGE("Copy audio data failed."); @@ -177,7 +177,7 @@ int32_t DSpeakerClient::Release() DHLOGI("Release spk client."); std::lock_guard lck(devMtx_); if (clientStatus_ != AudioStatus::STATUS_READY && clientStatus_ != AudioStatus::STATUS_STOP) { - DHLOGE("Speaker status %d is wrong.", (int32_t)clientStatus_); + DHLOGE("Speaker status %{public}d is wrong.", (int32_t)clientStatus_); return ERR_DH_AUDIO_SA_STATUS_ERR; } bool isSucess = true; @@ -195,7 +195,7 @@ int32_t DSpeakerClient::Release() int32_t ret = AudioStandard::AudioSystemManager::GetInstance()->UnregisterVolumeKeyEventCallback(getpid()); if (ret != DH_SUCCESS) { - DHLOGE("Failed to unregister volume key event callback, error code %d.", ret); + DHLOGE("Failed to unregister volume key event callback, error code %{public}d.", ret); isSucess = false; } if (audioRenderer_ != nullptr && !audioRenderer_->Release()) { @@ -232,7 +232,7 @@ int32_t DSpeakerClient::StopRender() DHLOGI("Stop spk client."); std::lock_guard lck(devMtx_); if (clientStatus_ != AudioStatus::STATUS_START) { - DHLOGE("Renderer is not start or spk status wrong, status: %d.", (int32_t)clientStatus_); + DHLOGE("Renderer is not start or spk status wrong, status: %{public}d.", (int32_t)clientStatus_); DAudioHisysevent::GetInstance().SysEventWriteFault(DAUDIO_OPT_FAIL, ERR_DH_AUDIO_SA_STATUS_ERR, "daudio renderer is not start or spk status wrong."); return ERR_DH_AUDIO_SA_STATUS_ERR; @@ -287,7 +287,7 @@ void DSpeakerClient::PlayThreadRunning() audioData = dataQueue_.front(); dataQueue_.pop(); uint64_t queueSize = static_cast(dataQueue_.size()); - DHLOGD("Pop spk data, dataqueue size: %" PRIu64, queueSize); + DHLOGD("Pop spk data, dataqueue size: %{public}" PRIu64, queueSize); } #ifdef DUMP_DSPEAKERCLIENT_FILE if (DaudioSinkHidumper::GetInstance().QueryDumpDataFlag()) { @@ -299,7 +299,7 @@ void DSpeakerClient::PlayThreadRunning() int32_t writeLen = audioRenderer_->Write(audioData->Data() + writeOffSet, static_cast(audioData->Capacity()) - writeOffSet); uint64_t capacity = static_cast(audioData->Capacity()); - DHLOGD("Write audio render, write len: %d, raw len: %" PRIu64", offset: %d", + DHLOGD("Write audio render, write len: %{public}d, raw len: %{public}" PRIu64", offset: %{public}d", writeLen, capacity, writeOffSet); if (writeLen < 0) { break; @@ -308,8 +308,8 @@ void DSpeakerClient::PlayThreadRunning() } int64_t endTime = GetNowTimeUs(); if (IsOutDurationRange(startTime, endTime, lastPlayStartTime_)) { - DHLOGE("This time play spend: %" PRId64" us, The interval of play this time and " - "the last time: %" PRId64" us", endTime - startTime, startTime - lastPlayStartTime_); + DHLOGE("This time play spend: %{public}" PRId64" us, The interval of play this time and " + "the last time: %{public}" PRId64" us", endTime - startTime, startTime - lastPlayStartTime_); } lastPlayStartTime_ = startTime; } @@ -355,11 +355,11 @@ int32_t DSpeakerClient::OnDecodeTransDataDone(const std::shared_ptr & dataQueue_.push(audioData); dataQueueCond_.notify_all(); uint64_t queueSize = static_cast(dataQueue_.size()); - DHLOGI("Push new spk data, buf len: %" PRIu64, queueSize); + DHLOGI("Push new spk data, buf len: %{public}" PRIu64, queueSize); int64_t endTime = GetNowTimeUs(); if (IsOutDurationRange(startTime, endTime, lastReceiveStartTime_)) { - DHLOGE("This time receivce data spend: %" PRId64" us, Receivce data this time and " - "the last time: %" PRId64" us", endTime - startTime, startTime - lastReceiveStartTime_); + DHLOGE("This time receivce data spend: %{public}" PRId64" us, Receivce data this time and " + "the last time: %{public}" PRId64" us", endTime - startTime, startTime - lastReceiveStartTime_); } lastReceiveStartTime_ = startTime; return DH_SUCCESS; @@ -367,7 +367,7 @@ int32_t DSpeakerClient::OnDecodeTransDataDone(const std::shared_ptr & int32_t DSpeakerClient::OnStateChange(const AudioEventType type) { - DHLOGD("On state change. type: %d", type); + DHLOGD("On state change. type: %{public}d", type); AudioEvent event; switch (type) { case AudioEventType::DATA_OPENED: { @@ -381,7 +381,7 @@ int32_t DSpeakerClient::OnStateChange(const AudioEventType type) break; } default: - DHLOGE("Invalid parameter type: %d.", type); + DHLOGE("Invalid parameter type: %{public}d.", type); return ERR_DH_AUDIO_NOT_SUPPORT; } @@ -419,7 +419,7 @@ string DSpeakerClient::GetVolumeLevel() std::string str(jsonData); cJSON_Delete(jParam); cJSON_free(jsonData); - DHLOGD("Get the volume level result, event: %s.", str.c_str()); + DHLOGD("Get the volume level result, event: %{public}s.", str.c_str()); return str; } @@ -447,7 +447,7 @@ void DSpeakerClient::OnVolumeKeyEvent(AudioStandard::VolumeEvent volumeEvent) std::string str(jsonData); cJSON_Delete(jParam); cJSON_free(jsonData); - DHLOGD("Volume change notification result, event: %s.", str.c_str()); + DHLOGD("Volume change notification result, event: %{public}s.", str.c_str()); AudioEvent audioEvent(VOLUME_CHANGE, str); cbObj->NotifyEvent(audioEvent); @@ -476,7 +476,7 @@ void DSpeakerClient::OnInterrupt(const AudioStandard::InterruptEvent &interruptE std::string str(jsonData); cJSON_Delete(jParam); cJSON_free(jsonData); - DHLOGD("Audio focus oninterrupt notification result, event: %s.", str.c_str()); + DHLOGD("Audio focus oninterrupt notification result, event: %{public}s.", str.c_str()); AudioEvent audioEvent(AUDIO_FOCUS_CHANGE, str); cbObj->NotifyEvent(audioEvent); @@ -485,7 +485,7 @@ void DSpeakerClient::OnInterrupt(const AudioStandard::InterruptEvent &interruptE void DSpeakerClient::OnStateChange(const AudioStandard::RendererState state, const AudioStandard::StateChangeCmdType __attribute__((unused)) cmdType) { - DHLOGD("On render state change. state: %d", state); + DHLOGD("On render state change. state: %{public}d", state); std::shared_ptr cbObj = eventCallback_.lock(); CHECK_NULL_VOID(cbObj); @@ -504,7 +504,7 @@ void DSpeakerClient::OnStateChange(const AudioStandard::RendererState state, std::string str(jsonData); cJSON_Delete(jParam); cJSON_free(jsonData); - DHLOGD("Audio render state changes notification result, event: %s.", str.c_str()); + DHLOGD("Audio render state changes notification result, event: %{public}s.", str.c_str()); AudioEvent audioEvent(AUDIO_RENDER_STATE_CHANGE, str); cbObj->NotifyEvent(audioEvent); @@ -512,7 +512,7 @@ void DSpeakerClient::OnStateChange(const AudioStandard::RendererState state, int32_t DSpeakerClient::SetAudioParameters(const AudioEvent &event) { - DHLOGD("Set the volume, arg: %s.", event.content.c_str()); + DHLOGD("Set the volume, arg: %{public}s.", event.content.c_str()); int32_t audioVolumeType; int32_t ret = GetAudioParamInt(event.content, AUDIO_VOLUME_TYPE, audioVolumeType); @@ -521,7 +521,7 @@ int32_t DSpeakerClient::SetAudioParameters(const AudioEvent &event) return ret; } auto volumeType = static_cast(audioVolumeType); - DHLOGD("Audio volume type, volumeType = %d.", volumeType); + DHLOGD("Audio volume type, volumeType = %{public}d.", volumeType); if (event.type != VOLUME_SET) { DHLOGE("Invalid parameter."); return ERR_DH_AUDIO_CLIENT_PARAM_ERROR; @@ -533,7 +533,7 @@ int32_t DSpeakerClient::SetAudioParameters(const AudioEvent &event) DHLOGE("Get audio volume level failed."); return ret; } - DHLOGD("volume level = %d.", audioVolumeLevel); + DHLOGD("volume level = %{public}d.", audioVolumeLevel); ret = AudioStandard::AudioSystemManager::GetInstance()->SetVolume(volumeType, audioVolumeLevel); if (ret != DH_SUCCESS) { DHLOGE("Voloume set failed."); @@ -544,7 +544,7 @@ int32_t DSpeakerClient::SetAudioParameters(const AudioEvent &event) int32_t DSpeakerClient::SetMute(const AudioEvent &event) { - DHLOGD("Set mute, arg: %s.", event.content.c_str()); + DHLOGD("Set mute, arg: %{public}s.", event.content.c_str()); int32_t audioVolumeType; int32_t ret = GetAudioParamInt(event.content, AUDIO_VOLUME_TYPE, audioVolumeType); if (ret != DH_SUCCESS) { @@ -560,7 +560,7 @@ int32_t DSpeakerClient::SetMute(const AudioEvent &event) } auto volumeType = static_cast(audioVolumeType); - DHLOGD("Audio volume type, volumeType = %d.", volumeType); + DHLOGD("Audio volume type, volumeType = %{public}d.", volumeType); if (event.type != VOLUME_MUTE_SET) { DHLOGE("Invalid parameter."); return ERR_DH_AUDIO_CLIENT_PARAM_ERROR; @@ -619,7 +619,7 @@ int32_t DSpeakerClient::SendMessage(uint32_t type, std::string content, std::str type != static_cast(VOLUME_CHANGE) && type != static_cast(AUDIO_FOCUS_CHANGE) && type != static_cast(AUDIO_RENDER_STATE_CHANGE)) { - DHLOGE("event type is not NOTIFY_OPEN_SPK or NOTIFY_CLOSE_SPK. type:%u", type); + DHLOGE("event type is not NOTIFY_OPEN_SPK or NOTIFY_CLOSE_SPK. type:%{public}u", type); return ERR_DH_AUDIO_NULLPTR; } CHECK_NULL_RETURN(speakerTrans_, ERR_DH_AUDIO_NULLPTR); @@ -629,7 +629,7 @@ int32_t DSpeakerClient::SendMessage(uint32_t type, std::string content, std::str void DSpeakerClient::PlayStatusChange(const std::string &args) { - DHLOGI("Play status change, args: %s.", args.c_str()); + DHLOGI("Play status change, args: %{public}s.", args.c_str()); std::string changeType = ParseStringFromArgs(args, KEY_CHANGE_TYPE); if (changeType == AUDIO_EVENT_RESTART) { ReStart(); diff --git a/services/audiohdiproxy/src/daudio_hdf_operate.cpp b/services/audiohdiproxy/src/daudio_hdf_operate.cpp index f9e0f315..bd50688d 100644 --- a/services/audiohdiproxy/src/daudio_hdf_operate.cpp +++ b/services/audiohdiproxy/src/daudio_hdf_operate.cpp @@ -49,7 +49,7 @@ int32_t DaudioHdfOperate::LoadDaudioHDFImpl() ::OHOS::sptr listener( new DAudioHdfServStatListener(DAudioHdfServStatListener::StatusCallback([&](const ServiceStatus& status) { - DHLOGI("Load audio service status callback, serviceName: %s, status: %d", + DHLOGI("Load audio service status callback, serviceName: %{public}s, status: %{public}d", status.serviceName.c_str(), status.status); std::unique_lock lock(hdfOperateMutex_); if (status.serviceName == AUDIO_SERVICE_NAME) { @@ -97,7 +97,7 @@ int32_t DaudioHdfOperate::WaitLoadService(const uint16_t& servStatus, const std: }); if (servStatus != OHOS::HDI::ServiceManager::V1_0::SERVIE_STATUS_START) { - DHLOGE("Wait load service %s failed, status %d", servName.c_str(), servStatus); + DHLOGE("Wait load service %{public}s failed, status %{public}d", servName.c_str(), servStatus); return ERR_DH_AUDIO_FAILED; } @@ -112,11 +112,11 @@ int32_t DaudioHdfOperate::UnLoadDaudioHDFImpl() int32_t ret = devmgr_->UnloadDevice(AUDIO_SERVICE_NAME); if (ret != HDF_SUCCESS) { - DHLOGE("Unload audio service failed, ret: %d", ret); + DHLOGE("Unload audio service failed, ret: %{public}d", ret); } ret = devmgr_->UnloadDevice(AUDIOEXT_SERVICE_NAME); if (ret != HDF_SUCCESS) { - DHLOGE("Unload provider service failed, ret: %d", ret); + DHLOGE("Unload device failed, ret: %{public}d", ret); } audioServStatus_ = INVALID_VALUE; audioextServStatus_ = INVALID_VALUE; diff --git a/services/audiohdiproxy/src/daudio_hdi_handler.cpp b/services/audiohdiproxy/src/daudio_hdi_handler.cpp index bd010050..d986cb0c 100644 --- a/services/audiohdiproxy/src/daudio_hdi_handler.cpp +++ b/services/audiohdiproxy/src/daudio_hdi_handler.cpp @@ -58,7 +58,7 @@ int32_t DAudioHdiHandler::InitHdiHandler() DHLOGD("Load hdf driver start."); int32_t ret = DaudioHdfOperate::GetInstance().LoadDaudioHDFImpl(); if (ret != DH_SUCCESS) { - DHLOGE("Load hdf driver failed, ret: %d", ret); + DHLOGE("Load hdf driver failed, ret: %{public}d", ret); return ret; } DHLOGD("Load hdf driver end."); @@ -80,7 +80,7 @@ int32_t DAudioHdiHandler::UninitHdiHandler() int32_t ret = DaudioHdfOperate::GetInstance().UnLoadDaudioHDFImpl(); if (ret != DH_SUCCESS) { - DHLOGE("Unload hdf driver failed, ret: %d", ret); + DHLOGE("Unload hdf driver failed, ret: %{public}d", ret); return ret; } DHLOGI("Uninit hdi handler success."); @@ -90,7 +90,7 @@ int32_t DAudioHdiHandler::UninitHdiHandler() int32_t DAudioHdiHandler::RegisterAudioDevice(const std::string &devId, const int32_t dhId, const std::string &capability, const std::shared_ptr &callbackObjParam) { - DHLOGI("Register audio device, adpname: %s, dhId: %d", GetAnonyString(devId).c_str(), dhId); + DHLOGI("Register audio device, adpname: %{public}s, dhId: %{public}d", GetAnonyString(devId).c_str(), dhId); CHECK_NULL_RETURN(audioSrvHdf_, ERR_DH_AUDIO_NULLPTR); std::string searchKey; switch (GetDevTypeByDHId(dhId)) { @@ -125,7 +125,7 @@ int32_t DAudioHdiHandler::RegisterAudioDevice(const std::string &devId, const in auto iter = mapAudioMgrCallback_.find(searchKey); int32_t res = audioSrvHdf_->RegisterAudioDevice(devId, dhId, capability, iter->second); if (res != HDF_SUCCESS) { - DHLOGE("Call hdf proxy register failed, res: %d", res); + DHLOGE("Call hdf proxy register failed, res: %{public}d", res); return ERR_DH_AUDIO_HDI_CALL_FAILED; } return DH_SUCCESS; @@ -133,11 +133,11 @@ int32_t DAudioHdiHandler::RegisterAudioDevice(const std::string &devId, const in int32_t DAudioHdiHandler::UnRegisterAudioDevice(const std::string &devId, const int32_t dhId) { - DHLOGI("Unregister audio device, adpname: %s, dhId: %d", GetAnonyString(devId).c_str(), dhId); + DHLOGI("Unregister audio device, adpname: %{public}s, dhId: %{public}d", GetAnonyString(devId).c_str(), dhId); CHECK_NULL_RETURN(audioSrvHdf_, ERR_DH_AUDIO_NULLPTR); int32_t res = audioSrvHdf_->UnRegisterAudioDevice(devId, dhId); if (res != HDF_SUCCESS) { - DHLOGE("Call hdf proxy unregister failed, res: %d", res); + DHLOGE("Call hdf proxy unregister failed, res: %{public}d", res); return ERR_DH_AUDIO_HDI_CALL_FAILED; } @@ -145,7 +145,7 @@ int32_t DAudioHdiHandler::UnRegisterAudioDevice(const std::string &devId, const std::lock_guard devLck(devMapMtx_); auto iter = mapAudioMgrDhIds_.find(devId); if (iter == mapAudioMgrDhIds_.end()) { - DHLOGE("Can not find register devId. devId: %s", GetAnonyString(devId).c_str()); + DHLOGE("Can not find register devId. devId: %{public}s", GetAnonyString(devId).c_str()); return ERR_DH_AUDIO_SA_CALLBACK_NOT_FOUND; } @@ -202,7 +202,7 @@ void DAudioHdiHandler::ProcessEventMsg(const AudioEvent &audioEvent, DAudioEvent int32_t DAudioHdiHandler::NotifyEvent(const std::string &devId, const int32_t dhId, const AudioEvent &audioEvent) { - DHLOGD("Notify event adpname: %s, dhId: %d, event type: %d, event content: %s.", + DHLOGD("Notify event adpname: %{public}s, dhId: %{public}d, event type: %{public}d, event content: %{public}s.", GetAnonyString(devId).c_str(), dhId, audioEvent.type, audioEvent.content.c_str()); DAudioEvent newEvent = {AUDIO_EVENT_UNKNOWN, audioEvent.content}; ProcessEventMsg(audioEvent, newEvent); diff --git a/services/audiohdiproxy/src/daudio_manager_callback.cpp b/services/audiohdiproxy/src/daudio_manager_callback.cpp index d50f9f08..27cf8cbf 100644 --- a/services/audiohdiproxy/src/daudio_manager_callback.cpp +++ b/services/audiohdiproxy/src/daudio_manager_callback.cpp @@ -69,7 +69,7 @@ int32_t DAudioManagerCallback::GetAudioParamHDF(const AudioParameter& param, Aud paramHDF.bitFormat = AudioSampleFormat::SAMPLE_S24LE; break; default: - DHLOGE("Format [%" PRIu32"] does not support conversion.", param.format); + DHLOGE("Format [%{public}" PRIu32"] does not support conversion.", param.format); return HDF_FAILURE; } switch (static_cast(param.streamUsage)) { @@ -86,7 +86,7 @@ int32_t DAudioManagerCallback::GetAudioParamHDF(const AudioParameter& param, Aud paramHDF.streamUsage = StreamUsage::STREAM_USAGE_MEDIA; break; default: - DHLOGE("Stream usage [%" PRIu32"] does not support conversion.", param.streamUsage); + DHLOGE("Stream usage [%{public}" PRIu32"] does not support conversion.", param.streamUsage); return HDF_FAILURE; } paramHDF.frameSize = param.frameSize; @@ -94,10 +94,11 @@ int32_t DAudioManagerCallback::GetAudioParamHDF(const AudioParameter& param, Aud paramHDF.ext = param.ext; paramHDF.renderFlags = static_cast(param.renderFlags); paramHDF.capturerFlags = static_cast(param.capturerFlags); - DHLOGI("HDF Param: sample rate %d, channel %d, bit format %d, stream usage %d, frame size %" PRIu32 - ", period %" PRIu32", renderFlags %d, capturerFlags %d, ext {%s}.", paramHDF.sampleRate, paramHDF.channelMask, - paramHDF.bitFormat, paramHDF.streamUsage, paramHDF.frameSize, paramHDF.period, paramHDF.renderFlags, - paramHDF.capturerFlags, paramHDF.ext.c_str()); + DHLOGI("HDF Param: sample rate %{public}d, channel %{public}d, bit format %{public}d, stream " + "usage %{public}d, frame size %{public}" PRIu32", period %{public}" PRIu32 + ", renderFlags %{public}d, capturerFlags %{public}d, ext {%{public}s}.", paramHDF.sampleRate, + paramHDF.channelMask, paramHDF.bitFormat, paramHDF.streamUsage, paramHDF.frameSize, paramHDF.period, + paramHDF.renderFlags, paramHDF.capturerFlags, paramHDF.ext.c_str()); return HDF_SUCCESS; } @@ -169,7 +170,7 @@ int32_t DAudioManagerCallback::NotifyEvent(const std::string& adpName, int32_t d int32_t DAudioManagerCallback::WriteStreamData(const std::string &adpName, int32_t devId, const OHOS::HDI::DistributedAudio::Audioext::V1_0::AudioData &data) { - DHLOGD("Write Stream Data, audio data param frameSize is %d.", data.param.frameSize); + DHLOGD("Write Stream Data, audio data param frameSize is %{public}d.", data.param.frameSize); if (data.param.frameSize == 0 || data.param.frameSize > DEFAULT_AUDIO_DATA_SIZE) { DHLOGE("Audio data param frameSize is 0. or > 4096"); return HDF_FAILURE; @@ -178,7 +179,7 @@ int32_t DAudioManagerCallback::WriteStreamData(const std::string &adpName, int32 std::shared_ptr audioData = std::make_shared(data.param.frameSize); int32_t ret = memcpy_s(audioData->Data(), audioData->Capacity(), data.data.data(), data.data.size()); if (ret != EOK) { - DHLOGE("Copy audio data failed, error code %d.", ret); + DHLOGE("Copy audio data failed, error code %{public}d.", ret); return HDF_FAILURE; } diff --git a/services/audiomanager/managersink/src/daudio_sink_dev.cpp b/services/audiomanager/managersink/src/daudio_sink_dev.cpp index b1cc12af..95d44c5d 100644 --- a/services/audiomanager/managersink/src/daudio_sink_dev.cpp +++ b/services/audiomanager/managersink/src/daudio_sink_dev.cpp @@ -32,12 +32,12 @@ namespace DistributedHardware { DAudioSinkDev::DAudioSinkDev(const std::string &devId, const sptr &sinkCallback) : devId_(devId), ipcSinkCallback_(sinkCallback) { - DHLOGD("Distributed audio sink device constructed, devId: %s.", GetAnonyString(devId).c_str()); + DHLOGD("Distributed audio sink device constructed, devId: %{public}s.", GetAnonyString(devId).c_str()); } DAudioSinkDev::~DAudioSinkDev() { - DHLOGD("Distributed audio sink device destructed, devId: %s.", GetAnonyString(devId_).c_str()); + DHLOGD("Distributed audio sink device destructed, devId: %{public}s.", GetAnonyString(devId_).c_str()); } int32_t DAudioSinkDev::AwakeAudioDev() @@ -89,7 +89,7 @@ int32_t DAudioSinkDev::InitAVTransEngines(const ChannelState channelState, IAVEn void DAudioSinkDev::NotifyEvent(const AudioEvent &audioEvent) { - DHLOGD("Notify event, eventType: %d.", (int32_t)audioEvent.type); + DHLOGD("Notify event, eventType: %{public}d.", (int32_t)audioEvent.type); if ((int32_t)audioEvent.type == DISABLE_DEVICE) { TaskDisableDevice(audioEvent.content); return; @@ -116,7 +116,7 @@ int32_t DAudioSinkDev::TaskDisableDevice(const std::string &args) int32_t DAudioSinkDev::TaskOpenDSpeaker(const std::string &args) { - DHLOGI("Open speaker device, args = %s.", args.c_str()); + DHLOGI("Open speaker device, args = %{public}s.", args.c_str()); if (args.length() > DAUDIO_MAX_JSON_LEN || args.empty()) { return ERR_DH_AUDIO_SA_PARAM_INVALID; } @@ -129,7 +129,7 @@ int32_t DAudioSinkDev::TaskOpenDSpeaker(const std::string &args) } int32_t dhId = ConvertString2Int(std::string(cJSON_GetObjectItem(jParam, KEY_DH_ID)->valuestring)); CHECK_AND_FREE_RETURN_RET_LOG(dhId == -1, ERR_DH_AUDIO_NULLPTR, jParam, - "%s", "Parse dhId error."); + "%{public}s", "Parse dhId error."); std::shared_ptr speakerClient = nullptr; { std::lock_guard devLck(spkClientMutex_); @@ -139,14 +139,14 @@ int32_t DAudioSinkDev::TaskOpenDSpeaker(const std::string &args) AudioParam audioParam; int32_t ret = from_json(audioParamJson, audioParam); if (ret != DH_SUCCESS) { - DHLOGE("Get audio param from cjson failed, error code %d.", ret); + DHLOGE("Get audio param from cjson failed, error code %{public}d.", ret); cJSON_Delete(jParam); return ret; } CHECK_NULL_FREE_RETURN(speakerClient, ERR_DH_AUDIO_NULLPTR, jParam); ret = speakerClient->SetUp(audioParam); CHECK_AND_FREE_RETURN_RET_LOG(ret != DH_SUCCESS, ret, jParam, - "Setup speaker failed, ret: %d.", ret); + "Setup speaker failed, ret: %{public}d.", ret); isSpkInUse_.store(true); cJSON_Delete(jParam); return ret; @@ -166,11 +166,11 @@ int32_t DAudioSinkDev::TaskCloseDSpeaker(const std::string &args) int32_t ret = speakerClient->StopRender(); if (ret != DH_SUCCESS) { - DHLOGE("Stop speaker client failed, ret: %d.", ret); + DHLOGE("Stop speaker client failed, ret: %{public}d.", ret); } ret = speakerClient->Release(); if (ret != DH_SUCCESS) { - DHLOGE("Release speaker client failed, ret: %d.", ret); + DHLOGE("Release speaker client failed, ret: %{public}d.", ret); } spkClientMap_.erase(dhId); DHLOGI("Close speaker device task excute success."); @@ -179,7 +179,7 @@ int32_t DAudioSinkDev::TaskCloseDSpeaker(const std::string &args) int32_t DAudioSinkDev::ParseDhidFromEvent(std::string args) { - DHLOGI("ParseDhidFrom args : %s", args.c_str()); + DHLOGI("ParseDhidFrom args : %{public}s", args.c_str()); cJSON *jParam = cJSON_Parse(args.c_str()); CHECK_NULL_RETURN(jParam, ERR_DH_AUDIO_FAILED); @@ -196,7 +196,7 @@ int32_t DAudioSinkDev::ParseDhidFromEvent(std::string args) } int32_t dhId = ConvertString2Int(std::string(dhIdItem->valuestring)); cJSON_Delete(jParam); - DHLOGI("Parsed dhId is: %d.", dhId); + DHLOGI("Parsed dhId is: %{public}d.", dhId); return dhId; } @@ -216,7 +216,7 @@ int32_t DAudioSinkDev::TaskStartRender(const std::string &args) int32_t ret = speakerClient->StartRender(); CHECK_AND_RETURN_RET_LOG(ret != DH_SUCCESS, ret, - "Start render failed. ret: %d.", ret); + "Start render failed. ret: %{public}d.", ret); DHLOGI("Start render success."); return DH_SUCCESS; } @@ -238,15 +238,15 @@ int32_t DAudioSinkDev::TaskOpenDMic(const std::string &args) cJSON *audioParamJson = cJSON_GetObjectItem(jParam, KEY_AUDIO_PARAM); int32_t ret = from_json(audioParamJson, audioParam); if (ret != DH_SUCCESS) { - DHLOGE("Get audio param from cjson failed, error code %d.", ret); + DHLOGE("Get audio param from cjson failed, error code %{public}d.", ret); cJSON_Delete(jParam); return ret; } CHECK_AND_FREE_RETURN_RET_LOG(ret != DH_SUCCESS, ret, jParam, - "Get audio param from cjson failed, error code %d.", ret); + "Get audio param from cjson failed, error code %{public}d.", ret); int32_t dhId = ParseDhidFromEvent(args); CHECK_AND_FREE_RETURN_RET_LOG(dhId == -1, ERR_DH_AUDIO_NULLPTR, jParam, - "%s", "Parse dhId error."); + "%{public}s", "Parse dhId error."); micDhId_ = std::to_string(dhId); std::shared_ptr micClient = nullptr; { @@ -256,10 +256,10 @@ int32_t DAudioSinkDev::TaskOpenDMic(const std::string &args) CHECK_NULL_FREE_RETURN(micClient, ERR_DH_AUDIO_NULLPTR, jParam); ret = micClient->SetUp(audioParam); CHECK_AND_FREE_RETURN_RET_LOG(ret != DH_SUCCESS, ERR_DH_AUDIO_FAILED, jParam, - "Set up mic failed, ret: %d.", ret); + "Set up mic failed, ret: %{public}d.", ret); ret = micClient->StartCapture(); CHECK_AND_FREE_RETURN_RET_LOG(ret != DH_SUCCESS, ERR_DH_AUDIO_FAILED, jParam, - "Start capture failed, ret: %d.", ret); + "Start capture failed, ret: %{public}d.", ret); PullUpPage(); isMicInUse_.store(true); cJSON_Delete(jParam); @@ -279,9 +279,9 @@ int32_t DAudioSinkDev::TaskCloseDMic(const std::string &args) CHECK_NULL_RETURN(micClient, DH_SUCCESS); int32_t ret = micClient->StopCapture(); - CHECK_AND_LOG(ret != DH_SUCCESS, "Stop mic client failed, ret: %d.", ret); + CHECK_AND_LOG(ret != DH_SUCCESS, "Stop mic client failed, ret: %{public}d.", ret); ret = micClient->Release(); - CHECK_AND_LOG(ret != DH_SUCCESS, "Release mic client failed, ret: %d.", ret); + CHECK_AND_LOG(ret != DH_SUCCESS, "Release mic client failed, ret: %{public}d.", ret); micClientMap_.erase(dhId); if (isPageStatus_.load()) { bool isSensitive = false; @@ -330,7 +330,7 @@ int32_t DAudioSinkDev::TaskSetVolume(const std::string &args) AudioEvent event(AudioEventType::VOLUME_SET, args); int32_t ret = speakerClient->SetAudioParameters(event); CHECK_AND_RETURN_RET_LOG(ret != DH_SUCCESS, ret, - "Volume set failed, ret: %d.", ret); + "Volume set failed, ret: %{public}d.", ret); DHLOGD("Set audio volume success."); return DH_SUCCESS; } @@ -353,7 +353,7 @@ int32_t DAudioSinkDev::TaskSetMute(const std::string &args) AudioEvent event(AudioEventType::VOLUME_MUTE_SET, args); int32_t ret = speakerClient->SetMute(event); CHECK_AND_RETURN_RET_LOG(ret != DH_SUCCESS, ret, - "Set mute failed, ret: %d.", ret); + "Set mute failed, ret: %{public}d.", ret); DHLOGD("Set mute success."); return DH_SUCCESS; } @@ -381,7 +381,7 @@ int32_t DAudioSinkDev::TaskRenderStateChange(const std::string &args) int32_t DAudioSinkDev::TaskPlayStatusChange(const std::string &args) { - DHLOGD("Play status change, content: %s.", args.c_str()); + DHLOGD("Play status change, content: %{public}s.", args.c_str()); int32_t dhId = ParseDhidFromEvent(args); if (dhId < 0) { DHLOGE("Failed to parse dhardware id."); @@ -417,7 +417,7 @@ int32_t DAudioSinkDev::SendAudioEventToRemote(const AudioEvent &event) int32_t ret = speakerClient->SendMessage(static_cast(event.type), event.content, devId_); CHECK_AND_RETURN_RET_LOG(ret != DH_SUCCESS, ERR_DH_AUDIO_NULLPTR, - "%s", "Task send message to remote failed."); + "%{public}s", "Task send message to remote failed."); return DH_SUCCESS; } @@ -425,7 +425,7 @@ void DAudioSinkDev::JudgeDeviceStatus() { DHLOGI("Checking device's status."); if (isSpkInUse_.load() || isMicInUse_.load()) { - DHLOGI("Device contain periperials in using, speaker status: %d, mic status: %d.", + DHLOGI("Device contain periperials in using, speaker status: %{public}d, mic status: %{public}d.", isSpkInUse_.load(), isMicInUse_.load()); return; } @@ -435,7 +435,7 @@ void DAudioSinkDev::JudgeDeviceStatus() int32_t DAudioSinkDev::ConvertString2Int(std::string val) { if (!CheckIsNum(val)) { - DHLOGE("String is not number. str:%s.", val.c_str()); + DHLOGE("String is not number. str:%{public}s.", val.c_str()); return -1; } return std::stoi(val); @@ -461,7 +461,7 @@ void DAudioSinkDev::NotifySourceDev(const AudioEventType type, const std::string cJSON_AddNumberToObject(jEvent, KEY_EVENT_TYPE, static_cast(type)); cJSON_AddStringToObject(jEvent, KEY_RANDOM_TASK_CODE, std::to_string(randomTaskCode).c_str()); - DHLOGD("Notify source dev, new engine, random task code:%s", std::to_string(randomTaskCode).c_str()); + DHLOGD("Notify source dev, new engine, random task code:%{public}s", std::to_string(randomTaskCode).c_str()); if (type == NOTIFY_OPEN_CTRL_RESULT || type == NOTIFY_CLOSE_CTRL_RESULT) { DHLOGE("In new engine mode, ctrl is not allowed."); cJSON_Delete(jEvent); @@ -515,23 +515,23 @@ int32_t DAudioSinkDev::GetCJsonObjectItems(const cJSON *j, AudioParam &audioPara { int32_t ret = 0; ret = GetParamValue(j, KEY_SAMPLING_RATE, reinterpret_cast(audioParam.comParam.sampleRate)); - CHECK_AND_RETURN_RET_LOG(ret != DH_SUCCESS, ret, "%s", "Get param value error."); + CHECK_AND_RETURN_RET_LOG(ret != DH_SUCCESS, ret, "%{public}s", "Get param value error."); ret = GetParamValue(j, KEY_CHANNELS, reinterpret_cast(audioParam.comParam.channelMask)); - CHECK_AND_RETURN_RET_LOG(ret != DH_SUCCESS, ret, "%s", "Get param value error."); + CHECK_AND_RETURN_RET_LOG(ret != DH_SUCCESS, ret, "%{public}s", "Get param value error."); ret = GetParamValue(j, KEY_FORMAT, reinterpret_cast(audioParam.comParam.bitFormat)); - CHECK_AND_RETURN_RET_LOG(ret != DH_SUCCESS, ret, "%s", "Get param value error."); + CHECK_AND_RETURN_RET_LOG(ret != DH_SUCCESS, ret, "%{public}s", "Get param value error."); ret = GetParamValue(j, KEY_FRAMESIZE, reinterpret_cast(audioParam.comParam.frameSize)); - CHECK_AND_RETURN_RET_LOG(ret != DH_SUCCESS, ret, "%s", "Get param value error."); + CHECK_AND_RETURN_RET_LOG(ret != DH_SUCCESS, ret, "%{public}s", "Get param value error."); ret = GetParamValue(j, KEY_SOURCE_TYPE, reinterpret_cast(audioParam.captureOpts.sourceType)); - CHECK_AND_RETURN_RET_LOG(ret != DH_SUCCESS, ret, "%s", "Get param value error."); + CHECK_AND_RETURN_RET_LOG(ret != DH_SUCCESS, ret, "%{public}s", "Get param value error."); ret = GetParamValue(j, KEY_CONTENT_TYPE, reinterpret_cast(audioParam.renderOpts.contentType)); - CHECK_AND_RETURN_RET_LOG(ret != DH_SUCCESS, ret, "%s", "Get param value error."); + CHECK_AND_RETURN_RET_LOG(ret != DH_SUCCESS, ret, "%{public}s", "Get param value error."); ret = GetParamValue(j, KEY_STREAM_USAGE, reinterpret_cast(audioParam.renderOpts.streamUsage)); - CHECK_AND_RETURN_RET_LOG(ret != DH_SUCCESS, ret, "%s", "Get param value error."); + CHECK_AND_RETURN_RET_LOG(ret != DH_SUCCESS, ret, "%{public}s", "Get param value error."); ret = GetParamValue(j, KEY_RENDER_FLAGS, reinterpret_cast(audioParam.renderOpts.renderFlags)); - CHECK_AND_RETURN_RET_LOG(ret != DH_SUCCESS, ret, "%s", "Get param value error."); + CHECK_AND_RETURN_RET_LOG(ret != DH_SUCCESS, ret, "%{public}s", "Get param value error."); ret = GetParamValue(j, KEY_CAPTURE_FLAGS, reinterpret_cast(audioParam.captureOpts.capturerFlags)); - CHECK_AND_RETURN_RET_LOG(ret != DH_SUCCESS, ret, "%s", "Get param value error."); + CHECK_AND_RETURN_RET_LOG(ret != DH_SUCCESS, ret, "%{public}s", "Get param value error."); return ret; } @@ -586,7 +586,7 @@ void DAudioSinkDev::SinkEventHandler::ProcessEvent(const AppExecFwk::InnerEvent: { auto iter = mapEventFuncs_.find(event->GetInnerEventId()); if (iter == mapEventFuncs_.end()) { - DHLOGE("Event Id is invaild. %d", event->GetInnerEventId()); + DHLOGE("Event Id is invaild. %{public}d", event->GetInnerEventId()); return; } SinkEventFunc &func = iter->second; @@ -631,11 +631,11 @@ void DAudioSinkDev::SinkEventHandler::NotifyOpenSpeaker(const AppExecFwk::InnerE CHECK_NULL_VOID(sinkDevObj); int32_t dhId = sinkDevObj->ParseDhidFromEvent(eventParam); - CHECK_AND_RETURN_LOG(dhId == -1, "%s", "Parse dhId error."); + CHECK_AND_RETURN_LOG(dhId == -1, "%{public}s", "Parse dhId error."); int32_t ret = sinkDevObj->TaskOpenDSpeaker(eventParam); sinkDevObj->NotifySourceDev(NOTIFY_OPEN_SPEAKER_RESULT, std::to_string(dhId), ret); - DHLOGI("Open speaker device task end, notify source ret %d.", ret); - CHECK_AND_RETURN_LOG(ret != DH_SUCCESS, "%s", "Open speaker failed."); + DHLOGI("Open speaker device task end, notify source ret %{public}d.", ret); + CHECK_AND_RETURN_LOG(ret != DH_SUCCESS, "%{public}s", "Open speaker failed."); } void DAudioSinkDev::SinkEventHandler::NotifyCloseSpeaker(const AppExecFwk::InnerEvent::Pointer &event) @@ -648,7 +648,7 @@ void DAudioSinkDev::SinkEventHandler::NotifyCloseSpeaker(const AppExecFwk::Inner auto sinkDevObj = sinkDev_.lock(); CHECK_NULL_VOID(sinkDevObj); CHECK_AND_RETURN_LOG(sinkDevObj->TaskCloseDSpeaker(eventParam) != DH_SUCCESS, - "%s", "close speaker failed."); + "%{public}s", "close speaker failed."); } void DAudioSinkDev::SinkEventHandler::NotifySpeakerOpened(const AppExecFwk::InnerEvent::Pointer &event) @@ -662,9 +662,9 @@ void DAudioSinkDev::SinkEventHandler::NotifySpeakerOpened(const AppExecFwk::Inne auto sinkDevObj = sinkDev_.lock(); CHECK_NULL_VOID(sinkDevObj); CHECK_AND_RETURN_LOG(sinkDevObj->TaskStartRender(eventParam) != DH_SUCCESS, - "%s", "Speaker client start failed."); + "%{public}s", "Speaker client start failed."); CHECK_AND_RETURN_LOG(sinkDevObj->TaskVolumeChange(eventParam) != DH_SUCCESS, - "%s", "Notify pimary volume to source device failed."); + "%{public}s", "Notify pimary volume to source device failed."); } void DAudioSinkDev::SinkEventHandler::NotifySpeakerClosed(const AppExecFwk::InnerEvent::Pointer &event) @@ -677,7 +677,7 @@ void DAudioSinkDev::SinkEventHandler::NotifySpeakerClosed(const AppExecFwk::Inne auto sinkDevObj = sinkDev_.lock(); CHECK_NULL_VOID(sinkDevObj); CHECK_AND_RETURN_LOG(sinkDevObj->TaskCloseDSpeaker(eventParam) != DH_SUCCESS, - "%s", "Close speaker failed."); + "%{public}s", "Close speaker failed."); } void DAudioSinkDev::SinkEventHandler::NotifyOpenMic(const AppExecFwk::InnerEvent::Pointer &event) @@ -700,8 +700,8 @@ void DAudioSinkDev::SinkEventHandler::NotifyOpenMic(const AppExecFwk::InnerEvent int32_t ret = sinkDevObj->TaskOpenDMic(eventParam); sinkDevObj->NotifySourceDev(NOTIFY_OPEN_MIC_RESULT, std::string(cJSON_GetObjectItem(jParam, KEY_DH_ID)->valuestring), ret); - DHLOGI("Open mic device task end, notify source ret %d.", ret); - CHECK_AND_FREE_RETURN_LOG(ret != DH_SUCCESS, jParam, "%s", "Open mic failed."); + DHLOGI("Open mic device task end, notify source ret %{public}d.", ret); + CHECK_AND_FREE_RETURN_LOG(ret != DH_SUCCESS, jParam, "%{public}s", "Open mic failed."); cJSON_Delete(jParam); } @@ -715,7 +715,7 @@ void DAudioSinkDev::SinkEventHandler::NotifyCloseMic(const AppExecFwk::InnerEven auto sinkDevObj = sinkDev_.lock(); CHECK_NULL_VOID(sinkDevObj); CHECK_AND_RETURN_LOG(sinkDevObj->TaskCloseDMic(eventParam) != DH_SUCCESS, - "%s", "Close mic failed."); + "%{public}s", "Close mic failed."); } void DAudioSinkDev::SinkEventHandler::NotifyMicOpened(const AppExecFwk::InnerEvent::Pointer &event) @@ -734,7 +734,7 @@ void DAudioSinkDev::SinkEventHandler::NotifyMicClosed(const AppExecFwk::InnerEve auto sinkDevObj = sinkDev_.lock(); CHECK_NULL_VOID(sinkDevObj); CHECK_AND_RETURN_LOG(sinkDevObj->TaskCloseDMic(eventParam) != DH_SUCCESS, - "%s", "Close mic failed."); + "%{public}s", "Close mic failed."); } void DAudioSinkDev::SinkEventHandler::NotifySetVolume(const AppExecFwk::InnerEvent::Pointer &event) @@ -747,7 +747,7 @@ void DAudioSinkDev::SinkEventHandler::NotifySetVolume(const AppExecFwk::InnerEve auto sinkDevObj = sinkDev_.lock(); CHECK_NULL_VOID(sinkDevObj); CHECK_AND_RETURN_LOG(sinkDevObj->TaskSetVolume(eventParam) != DH_SUCCESS, - "%s", "Set volume failed."); + "%{public}s", "Set volume failed."); } void DAudioSinkDev::SinkEventHandler::NotifyVolumeChange(const AppExecFwk::InnerEvent::Pointer &event) @@ -760,7 +760,7 @@ void DAudioSinkDev::SinkEventHandler::NotifyVolumeChange(const AppExecFwk::Inner auto sinkDevObj = sinkDev_.lock(); CHECK_NULL_VOID(sinkDevObj); CHECK_AND_RETURN_LOG(sinkDevObj->TaskVolumeChange(eventParam) != DH_SUCCESS, - "%s", "Notify volume change status to source device failed."); + "%{public}s", "Notify volume change status to source device failed."); } void DAudioSinkDev::SinkEventHandler::NotifySetParam(const AppExecFwk::InnerEvent::Pointer &event) @@ -773,7 +773,7 @@ void DAudioSinkDev::SinkEventHandler::NotifySetParam(const AppExecFwk::InnerEven auto sinkDevObj = sinkDev_.lock(); CHECK_NULL_VOID(sinkDevObj); CHECK_AND_RETURN_LOG(sinkDevObj->TaskSetParameter(eventParam) != DH_SUCCESS, - "%s", "Set parameters failed."); + "%{public}s", "Set parameters failed."); } void DAudioSinkDev::SinkEventHandler::NotifySetMute(const AppExecFwk::InnerEvent::Pointer &event) @@ -786,7 +786,7 @@ void DAudioSinkDev::SinkEventHandler::NotifySetMute(const AppExecFwk::InnerEvent auto sinkDevObj = sinkDev_.lock(); CHECK_NULL_VOID(sinkDevObj); CHECK_AND_RETURN_LOG(sinkDevObj->TaskSetMute(eventParam) != DH_SUCCESS, - "%s", "Set mute failed."); + "%{public}s", "Set mute failed."); } void DAudioSinkDev::SinkEventHandler::NotifyFocusChange(const AppExecFwk::InnerEvent::Pointer &event) @@ -799,7 +799,7 @@ void DAudioSinkDev::SinkEventHandler::NotifyFocusChange(const AppExecFwk::InnerE auto sinkDevObj = sinkDev_.lock(); CHECK_NULL_VOID(sinkDevObj); CHECK_AND_RETURN_LOG(sinkDevObj->TaskFocusChange(eventParam) != DH_SUCCESS, - "%s", "Handle focus change event failed."); + "%{public}s", "Handle focus change event failed."); } void DAudioSinkDev::SinkEventHandler::NotifyRenderStateChange(const AppExecFwk::InnerEvent::Pointer &event) @@ -812,7 +812,7 @@ void DAudioSinkDev::SinkEventHandler::NotifyRenderStateChange(const AppExecFwk:: auto sinkDevObj = sinkDev_.lock(); CHECK_NULL_VOID(sinkDevObj); CHECK_AND_RETURN_LOG(sinkDevObj->TaskRenderStateChange(eventParam) != DH_SUCCESS, - "%s", "Handle render state change failed."); + "%{public}s", "Handle render state change failed."); } void DAudioSinkDev::SinkEventHandler::NotifyPlayStatusChange(const AppExecFwk::InnerEvent::Pointer &event) @@ -825,7 +825,7 @@ void DAudioSinkDev::SinkEventHandler::NotifyPlayStatusChange(const AppExecFwk::I auto sinkDevObj = sinkDev_.lock(); CHECK_NULL_VOID(sinkDevObj); CHECK_AND_RETURN_LOG(sinkDevObj->TaskPlayStatusChange(eventParam) != DH_SUCCESS, - "%s", "Handle play status change event failed."); + "%{public}s", "Handle play status change event failed."); } int32_t DAudioSinkDev::SinkEventHandler::GetEventParam(const AppExecFwk::InnerEvent::Pointer &event, @@ -850,7 +850,7 @@ int32_t DAudioSinkDev::PauseDistributedHardware(const std::string &networkId) CHECK_NULL_RETURN(micClient, ERR_DH_AUDIO_NULLPTR); int32_t ret = micClient->PauseCapture(); - CHECK_AND_LOG(ret != DH_SUCCESS, "Pause mic client failed, ret: %d.", ret); + CHECK_AND_LOG(ret != DH_SUCCESS, "Pause mic client failed, ret: %{public}d.", ret); return ret; } @@ -866,7 +866,7 @@ int32_t DAudioSinkDev::ResumeDistributedHardware(const std::string &networkId) CHECK_NULL_RETURN(micClient, ERR_DH_AUDIO_NULLPTR); int32_t ret = micClient->ResumeCapture(); - CHECK_AND_LOG(ret != DH_SUCCESS, "Resume mic client failed, ret: %d.", ret); + CHECK_AND_LOG(ret != DH_SUCCESS, "Resume mic client failed, ret: %{public}d.", ret); return ret; } diff --git a/services/audiomanager/managersink/src/daudio_sink_manager.cpp b/services/audiomanager/managersink/src/daudio_sink_manager.cpp index b180b0f2..358e9969 100644 --- a/services/audiomanager/managersink/src/daudio_sink_manager.cpp +++ b/services/audiomanager/managersink/src/daudio_sink_manager.cpp @@ -66,9 +66,9 @@ int32_t DAudioSinkManager::Init(const sptr &sinkCallback initCallback_ = std::make_shared(); ipcSinkCallback_ = sinkCallback; CHECK_AND_RETURN_RET_LOG(GetLocalDeviceNetworkId(localNetworkId_) != DH_SUCCESS, - ERR_DH_AUDIO_FAILED, "%s", "Get local network id failed."); + ERR_DH_AUDIO_FAILED, "%{public}s", "Get local network id failed."); CHECK_AND_RETURN_RET_LOG(LoadAVReceiverEngineProvider() != DH_SUCCESS, - ERR_DH_AUDIO_FAILED, "%s", "Load av receiver engine failed."); + ERR_DH_AUDIO_FAILED, "%{public}s", "Load av receiver engine failed."); CHECK_NULL_RETURN(rcvProviderPtr_, ERR_DH_AUDIO_FAILED); providerListener_ = std::make_shared(); if (rcvProviderPtr_->RegisterProviderCallback(providerListener_) != DH_SUCCESS) { @@ -87,7 +87,7 @@ int32_t DAudioSinkManager::Init(const sptr &sinkCallback return ERR_DH_AUDIO_FAILED; } CHECK_AND_RETURN_RET_LOG(sendProviderPtr_->RegisterProviderCallback(providerListener_) != DH_SUCCESS, - ERR_DH_AUDIO_FAILED, "%s", "Register av sender engine callback failed."); + ERR_DH_AUDIO_FAILED, "%{public}s", "Register av sender engine callback failed."); DHLOGI("Load av sender engine success."); return DH_SUCCESS; } @@ -119,7 +119,7 @@ int32_t DAudioSinkManager::UnInit() void DAudioSinkManager::OnSinkDevReleased(const std::string &devId) { - DHLOGI("Release audio device devId: %s.", GetAnonyString(devId).c_str()); + DHLOGI("Release audio device devId: %{public}s.", GetAnonyString(devId).c_str()); if (devClearThread_.joinable()) { devClearThread_.join(); } @@ -132,7 +132,7 @@ void DAudioSinkManager::OnSinkDevReleased(const std::string &devId) int32_t DAudioSinkManager::HandleDAudioNotify(const std::string &devId, const std::string &dhId, const int32_t eventType, const std::string &eventContent) { - DHLOGD("Receive audio event from devId: %s, event type: %d. event content: %s.", + DHLOGD("Receive audio event from devId: %{public}s, event type: %{public}d. event content: %{public}s.", GetAnonyString(devId).c_str(), eventType, eventContent.c_str()); if (eventContent.length() > DAUDIO_MAX_JSON_LEN || eventContent.empty() @@ -143,7 +143,7 @@ int32_t DAudioSinkManager::HandleDAudioNotify(const std::string &devId, const st // now ctrl channel is also goto here, please sure here not crash. cJSON *jParam = cJSON_Parse(eventContent.c_str()); if (CJsonParamCheck(jParam, { KEY_RANDOM_TASK_CODE })) { - DHLOGD("Receive audio notify from source, random task code: %s", + DHLOGD("Receive audio notify from source, random task code: %{public}s", cJSON_GetObjectItemCaseSensitive(jParam, KEY_RANDOM_TASK_CODE)->valuestring); } bool isDevExisted = false; @@ -152,7 +152,7 @@ int32_t DAudioSinkManager::HandleDAudioNotify(const std::string &devId, const st isDevExisted = audioDevMap_.find(devId) != audioDevMap_.end(); } if (!isDevExisted) { - DHLOGE("Device is not exist, devId: %s, dhId: %s.", GetAnonyString(devId).c_str(), + DHLOGE("Device is not exist, devId: %{public}s, dhId: %{public}s.", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); cJSON_Delete(jParam); return ERR_DH_AUDIO_FAILED; @@ -169,7 +169,7 @@ int32_t DAudioSinkManager::CreateAudioDevice(const std::string &devId) { std::lock_guard lock(devMapMutex_); if (audioDevMap_.find(devId) != audioDevMap_.end()) { - DHLOGI("Audio sink dev in map. devId: %s.", GetAnonyString(devId).c_str()); + DHLOGI("Audio sink dev in map. devId: %{public}s.", GetAnonyString(devId).c_str()); dev = audioDevMap_[devId]; } else { dev = std::make_shared(devId, ipcSinkCallback_); @@ -202,7 +202,7 @@ int32_t DAudioSinkManager::CreateAudioDevice(const std::string &devId) int32_t DAudioSinkManager::DAudioNotify(const std::string &devId, const std::string &dhId, const int32_t eventType, const std::string &eventContent) { - DHLOGD("Distributed audio notify, devId: %s, dhId: %s, eventType: %d.", + DHLOGD("Distributed audio notify, devId: %{public}s, dhId: %{public}s, eventType: %{public}d.", GetAnonyString(devId).c_str(), dhId.c_str(), eventType); { @@ -236,9 +236,9 @@ void DAudioSinkManager::NotifyEvent(const std::string &devId, const int32_t even { AudioEvent audioEvent(eventType, eventContent); std::lock_guard lock(devMapMutex_); - DHLOGI("Notify event, devId: %s.", GetAnonyString(devId).c_str()); + DHLOGI("Notify event, devId: %{public}s.", GetAnonyString(devId).c_str()); CHECK_AND_RETURN_LOG(audioDevMap_.find(devId) == audioDevMap_.end(), - "%s", "Notify event error, dev not exist."); + "%{public}s", "Notify event error, dev not exist."); CHECK_NULL_VOID(audioDevMap_[devId]); audioDevMap_[devId]->NotifyEvent(audioEvent); } @@ -271,7 +271,7 @@ int32_t DAudioSinkManager::LoadAVReceiverEngineProvider() AVTransProviderClass getEngineFactoryFunc = (AVTransProviderClass)dlsym(pRHandler_, GET_RECEIVER_PROVIDER_FUNC.c_str()); if (getEngineFactoryFunc == nullptr) { - DHLOGE("av transport engine factory function handler is null, failed reason : %s", dlerror()); + DHLOGE("av transport engine factory function handler is null, failed reason : %{public}s", dlerror()); dlclose(pRHandler_); pRHandler_ = nullptr; return ERR_DH_AUDIO_NULLPTR; @@ -306,7 +306,7 @@ int32_t DAudioSinkManager::LoadAVSenderEngineProvider() AVTransProviderClass getEngineFactoryFunc = (AVTransProviderClass)dlsym(pSHandler_, GET_SENDER_PROVIDER_FUNC.c_str()); if (getEngineFactoryFunc == nullptr) { - DHLOGE("av transport engine factory function handler is null, failed reason : %s", dlerror()); + DHLOGE("av transport engine factory function handler is null, failed reason : %{public}s", dlerror()); dlclose(pSHandler_); pSHandler_ = nullptr; return ERR_DH_AUDIO_NULLPTR; @@ -327,7 +327,7 @@ int32_t DAudioSinkManager::UnloadAVSenderEngineProvider() void DAudioSinkManager::SetChannelState(const std::string &content) { - DHLOGI("The channel state belong to %s.", content.c_str()); + DHLOGI("The channel state belong to %{public}s.", content.c_str()); if (content.find(OWNER_NAME_D_SPEAKER) != content.npos) { channelState_ = ChannelState::SPK_CONTROL_OPENED; } else if (content.find(OWNER_NAME_D_MIC) != content.npos) { @@ -337,14 +337,14 @@ void DAudioSinkManager::SetChannelState(const std::string &content) int32_t EngineProviderListener::OnProviderEvent(const AVTransEvent &event) { - DHLOGI("On provider event :%d, eventContent: %s.", event.type, event.content.c_str()); + DHLOGI("On event :%{public}d, eventContent: %{public}s.", event.type, event.content.c_str()); if (event.type == EventType::EVENT_CHANNEL_OPENED) { - DHLOGI("Received control channel opened event, create audio device for peerDevId=%s, content=%s.", - GetAnonyString(event.peerDevId).c_str(), event.content.c_str()); + DHLOGI("Received control channel opened event, create audio device for peerDevId=%{public}s, " + "content=%{public}s.", GetAnonyString(event.peerDevId).c_str(), event.content.c_str()); DAudioSinkManager::GetInstance().SetChannelState(event.content); DAudioSinkManager::GetInstance().CreateAudioDevice(event.peerDevId); } else if (event.type == EventType::EVENT_CHANNEL_CLOSED) { - DHLOGI("Received control channel closed event, clear audio device for peerDevId=%s", + DHLOGI("Received control channel closed event, clear audio device for peerDevId=%{public}s", GetAnonyString(event.peerDevId).c_str()); std::string eventStr = event.content; DAudioSinkManager::GetInstance().NotifyEvent(event.peerDevId, DISABLE_DEVICE, eventStr); @@ -358,7 +358,7 @@ int32_t DAudioSinkManager::PauseDistributedHardware(const std::string &networkId { std::lock_guard lock(devMapMutex_); if (audioDevMap_.find(networkId) != audioDevMap_.end()) { - DHLOGI("Audio sink dev in map. devId: %s.", GetAnonyString(networkId).c_str()); + DHLOGI("Audio sink dev in map. devId: %{public}s.", GetAnonyString(networkId).c_str()); audioDevMap_[networkId]->PauseDistributedHardware(networkId); } return DH_SUCCESS; @@ -368,7 +368,7 @@ int32_t DAudioSinkManager::ResumeDistributedHardware(const std::string &networkI { std::lock_guard lock(devMapMutex_); if (audioDevMap_.find(networkId) != audioDevMap_.end()) { - DHLOGI("Audio sink dev in map. devId: %s.", GetAnonyString(networkId).c_str()); + DHLOGI("Audio sink dev in map. devId: %{public}s.", GetAnonyString(networkId).c_str()); audioDevMap_[networkId]->ResumeDistributedHardware(networkId); } return DH_SUCCESS; @@ -378,7 +378,7 @@ int32_t DAudioSinkManager::StopDistributedHardware(const std::string &networkId) { std::lock_guard lock(devMapMutex_); if (audioDevMap_.find(networkId) != audioDevMap_.end()) { - DHLOGI("Audio sink dev in map. devId: %s.", GetAnonyString(networkId).c_str()); + DHLOGI("Audio sink dev in map. devId: %{public}s.", GetAnonyString(networkId).c_str()); audioDevMap_[networkId]->StopDistributedHardware(networkId); } return DH_SUCCESS; @@ -386,7 +386,8 @@ int32_t DAudioSinkManager::StopDistributedHardware(const std::string &networkId) bool DAudioSinkManager::CheckDeviceSecurityLevel(const std::string &srcDeviceId, const std::string &dstDeviceId) { - DHLOGI("CheckDeviceSecurityLevel srcDeviceId %s, dstDeviceId %s.", srcDeviceId.c_str(), dstDeviceId.c_str()); + DHLOGI("CheckDeviceSecurityLevel srcDeviceId %{public}s, dstDeviceId %{public}s.", + srcDeviceId.c_str(), dstDeviceId.c_str()); std::string srcUdid = GetUdidByNetworkId(srcDeviceId); if (srcUdid.empty()) { DHLOGE("src udid is empty"); @@ -397,11 +398,11 @@ bool DAudioSinkManager::CheckDeviceSecurityLevel(const std::string &srcDeviceId, DHLOGE("dst udid is empty"); return false; } - DHLOGI("CheckDeviceSecurityLevel srcUdid %s, dstUdid %s.", srcUdid.c_str(), dstUdid.c_str()); + DHLOGI("CheckDeviceSecurityLevel srcUdid %{public}s, dstUdid %{public}s.", srcUdid.c_str(), dstUdid.c_str()); int32_t srcDeviceSecurityLevel = GetDeviceSecurityLevel(srcUdid); int32_t dstDeviceSecurityLevel = GetDeviceSecurityLevel(dstUdid); - DHLOGI("SrcDeviceSecurityLevel, level is %d", srcDeviceSecurityLevel); - DHLOGI("dstDeviceSecurityLevel, level is %d", dstDeviceSecurityLevel); + DHLOGI("SrcDeviceSecurityLevel, level is %{public}d", srcDeviceSecurityLevel); + DHLOGI("dstDeviceSecurityLevel, level is %{public}d", dstDeviceSecurityLevel); if (srcDeviceSecurityLevel == DEFAULT_DEVICE_SECURITY_LEVEL || srcDeviceSecurityLevel < dstDeviceSecurityLevel) { DHLOGE("The device security of source device is lower."); @@ -416,24 +417,24 @@ int32_t DAudioSinkManager::GetDeviceSecurityLevel(const std::string &udid) devIdentify.length = DEVICE_ID_MAX_LEN; int32_t ret = memcpy_s(devIdentify.identity, DEVICE_ID_MAX_LEN, udid.c_str(), DEVICE_ID_MAX_LEN); if (ret != DH_SUCCESS) { - DHLOGE("Str copy failed %d", ret); + DHLOGE("Str copy failed %{public}d", ret); return DEFAULT_DEVICE_SECURITY_LEVEL; } DeviceSecurityInfo *info = nullptr; ret = RequestDeviceSecurityInfo(&devIdentify, nullptr, &info); if (ret != DH_SUCCESS) { - DHLOGE("Request device security info failed %d", ret); + DHLOGE("Request device security info failed %{public}d", ret); FreeDeviceSecurityInfo(info); info = nullptr; return DEFAULT_DEVICE_SECURITY_LEVEL; } int32_t level = 0; ret = GetDeviceSecurityLevelValue(info, &level); - DHLOGE("Get device security level, level is %d", level); + DHLOGE("Get device security level, level is %{public}d", level); FreeDeviceSecurityInfo(info); info = nullptr; if (ret != DH_SUCCESS) { - DHLOGE("Get device security level failed %d", ret); + DHLOGE("Get device security level failed %{public}d", ret); return DEFAULT_DEVICE_SECURITY_LEVEL; } return level; @@ -447,12 +448,12 @@ std::string DAudioSinkManager::GetUdidByNetworkId(const std::string &networkId) } int32_t ret = DeviceManager::GetInstance().InitDeviceManager(PKG_NAME, initCallback_); if (ret != ERR_OK) { - DHLOGE("InitDeviceManager failed ret = %d", ret); + DHLOGE("InitDeviceManager failed ret = %{public}d", ret); } std::string udid = ""; ret = DeviceManager::GetInstance().GetUdidByNetworkId(PKG_NAME, networkId, udid); if (ret != ERR_OK) { - DHLOGE("GetUdidByNetworkId failed ret = %d", ret); + DHLOGE("GetUdidByNetworkId failed ret = %{public}d", ret); return ""; } return udid; @@ -464,10 +465,10 @@ int32_t DAudioSinkManager::VerifySecurityLevel(const std::string &devId) int32_t ret = ipcSinkCallback_->OnNotifyResourceInfo(ResourceEventType::EVENT_TYPE_QUERY_RESOURCE, subType, devId, isSensitive_, isSameAccount_); if (ret != DH_SUCCESS) { - DHLOGE("Query resource failed, ret: %d", ret); + DHLOGE("Query resource failed, ret: %{public}d", ret); return ret; } - DHLOGI("VerifySecurityLevel isSensitive: %d, isSameAccount: %d", isSensitive_, isSameAccount_); + DHLOGI("VerifySecurityLevel isSensitive: %{public}d, isSameAccount: %{public}d", isSensitive_, isSameAccount_); if (isSensitive_ && !isSameAccount_) { DHLOGE("Privacy resource must be logged in with same account."); return ERR_DH_AUDIO_FAILED; @@ -476,7 +477,7 @@ int32_t DAudioSinkManager::VerifySecurityLevel(const std::string &devId) std::string sinkDevId = ""; ret = GetLocalDeviceNetworkId(sinkDevId); if (ret != DH_SUCCESS) { - DHLOGE("GetLocalDeviceNetworkId failed, ret: %d", ret); + DHLOGE("GetLocalDeviceNetworkId failed, ret: %{public}d", ret); return ret; } if (isSensitive_ && !CheckDeviceSecurityLevel(devId, sinkDevId)) { diff --git a/services/audiomanager/managersource/src/daudio_source_dev.cpp b/services/audiomanager/managersource/src/daudio_source_dev.cpp index e3021c43..ec9b47cf 100644 --- a/services/audiomanager/managersource/src/daudio_source_dev.cpp +++ b/services/audiomanager/managersource/src/daudio_source_dev.cpp @@ -109,7 +109,7 @@ void DAudioSourceDev::SleepAudioDev() int32_t DAudioSourceDev::EnableDAudio(const std::string &dhId, const std::string &attrs) { - DHLOGI("Enable audio device, dhId: %s.", dhId.c_str()); + DHLOGI("Enable audio device, dhId: %{public}s.", dhId.c_str()); isRpcOpen_.store(true); CHECK_NULL_RETURN(handler_, ERR_DH_AUDIO_NULLPTR); @@ -166,7 +166,7 @@ int32_t DAudioSourceDev::DisableDAudioInner(const std::string &dhId) int32_t DAudioSourceDev::DisableDAudio(const std::string &dhId) { - DHLOGI("Disable audio device, dhId: %s.", dhId.c_str()); + DHLOGI("Disable audio device, dhId: %{public}s.", dhId.c_str()); isRpcOpen_.store(false); cJSON *jParamClose = cJSON_CreateObject(); @@ -180,7 +180,7 @@ int32_t DAudioSourceDev::DisableDAudio(const std::string &dhId) } AudioEvent event(AudioEventType::EVENT_UNKNOWN, std::string(data)); int32_t dhIdNum = ConvertString2Int(dhId); - CHECK_AND_FREECHAR_RETURN_RET_LOG(dhIdNum == -1, ERR_DH_AUDIO_NOT_SUPPORT, data, "%s", "Parse dhId error."); + CHECK_AND_FREECHAR_RETURN_RET_LOG(dhIdNum == -1, ERR_DH_AUDIO_NOT_SUPPORT, data, "%{public}s", "Parse dhId error."); switch (GetDevTypeByDHId(dhIdNum)) { case AUDIO_DEVICE_TYPE_SPEAKER: event.type = CLOSE_SPEAKER; @@ -193,14 +193,14 @@ int32_t DAudioSourceDev::DisableDAudio(const std::string &dhId) default: cJSON_Delete(jParamClose); cJSON_free(data); - DHLOGE("Unknown audio device. dhId: %d.", dhIdNum); + DHLOGE("Unknown audio device. dhId: %{public}d.", dhIdNum); return ERR_DH_AUDIO_NOT_SUPPORT; } cJSON_Delete(jParamClose); cJSON_free(data); int32_t ret = DisableDAudioInner(dhId); if (ret != DH_SUCCESS) { - DHLOGE("Failed to disable audio device, result is: %d.", ret); + DHLOGE("Failed to disable audio device, result is: %{public}d.", ret); return ret; } DHLOGI("Disable audio task generate successfully."); @@ -243,10 +243,10 @@ void DAudioSourceDev::SetThreadStatusFlag() void DAudioSourceDev::NotifyEvent(const AudioEvent &event) { - DHLOGD("Notify event, eventType: %d.", event.type); + DHLOGD("Notify event, eventType: %{public}d.", event.type); std::map::iterator iter = memberFuncMap_.find(event.type); if (iter == memberFuncMap_.end()) { - DHLOGE("Invalid eventType: %d.", event.type); + DHLOGE("Invalid eventType: %{public}d.", event.type); return; } DAudioSourceDevFunc &func = iter->second; @@ -291,7 +291,7 @@ int32_t DAudioSourceDev::HandleDSpeakerOpened(const AudioEvent &event) int32_t DAudioSourceDev::HandleDSpeakerClosed(const AudioEvent &event) { - DHLOGI("Speaker device closed, event.content = %s.", event.content.c_str()); + DHLOGI("Speaker device closed, event.content = %{public}s.", event.content.c_str()); int32_t dhId = ParseDhidFromEvent(event.content); if (dhId < 0) { DHLOGE("Failed to parse dhardware id."); @@ -355,7 +355,7 @@ int32_t DAudioSourceDev::HandleDMicOpened(const AudioEvent &event) int32_t DAudioSourceDev::HandleDMicClosed(const AudioEvent &event) { - DHLOGI("Dmic device closed, event.content = %s.", event.content.c_str()); + DHLOGI("Dmic device closed, event.content = %{public}s.", event.content.c_str()); CHECK_NULL_RETURN(handler_, ERR_DH_AUDIO_NULLPTR); auto eventParam = std::make_shared(event); auto msgEvent = AppExecFwk::InnerEvent::Get(EVENT_DMIC_CLOSED, eventParam, 0); @@ -388,7 +388,7 @@ int32_t DAudioSourceDev::HandleNotifyRPC(const AudioEvent &event) } rpcResult_ = cJSON_GetObjectItem(jParam, KEY_RESULT)->valueint; - DHLOGD("Notify RPC event: %d, result: %d.", event.type, rpcResult_); + DHLOGD("Notify RPC event: %{public}d, result: %{public}d.", event.type, rpcResult_); std::map::iterator iter = eventNotifyMap_.find(event.type); if (iter == eventNotifyMap_.end()) { DHLOGE("Invalid eventType."); @@ -459,7 +459,7 @@ int32_t DAudioSourceDev::HandleRenderStateChange(const AudioEvent &event) int32_t DAudioSourceDev::HandlePlayStatusChange(const AudioEvent &event) { - DHLOGD("Play status change, content: %s.", event.content.c_str()); + DHLOGD("Play status change, content: %{public}s.", event.content.c_str()); CHECK_NULL_RETURN(handler_, ERR_DH_AUDIO_NULLPTR); auto eventParam = std::make_shared(event); auto msgEvent = AppExecFwk::InnerEvent::Get(EVENT_CHANGE_PLAY_STATUS, eventParam, 0); @@ -473,7 +473,7 @@ int32_t DAudioSourceDev::HandlePlayStatusChange(const AudioEvent &event) int32_t DAudioSourceDev::HandleSpkMmapStart(const AudioEvent &event) { - DHLOGI("Spk mmap start, content: %s.", event.content.c_str()); + DHLOGI("Spk mmap start, content: %{public}s.", event.content.c_str()); CHECK_NULL_RETURN(handler_, ERR_DH_AUDIO_NULLPTR); auto eventParam = std::make_shared(event); auto msgEvent = AppExecFwk::InnerEvent::Get(EVENT_MMAP_SPK_START, eventParam, 0); @@ -487,7 +487,7 @@ int32_t DAudioSourceDev::HandleSpkMmapStart(const AudioEvent &event) int32_t DAudioSourceDev::HandleSpkMmapStop(const AudioEvent &event) { - DHLOGI("Spk mmap stop, content: %s.", event.content.c_str()); + DHLOGI("Spk mmap stop, content: %{public}s.", event.content.c_str()); CHECK_NULL_RETURN(handler_, ERR_DH_AUDIO_NULLPTR); auto eventParam = std::make_shared(event); auto msgEvent = AppExecFwk::InnerEvent::Get(EVENT_MMAP_SPK_STOP, eventParam, 0); @@ -501,7 +501,7 @@ int32_t DAudioSourceDev::HandleSpkMmapStop(const AudioEvent &event) int32_t DAudioSourceDev::HandleMicMmapStart(const AudioEvent &event) { - DHLOGI("Mic mmap start, content: %s.", event.content.c_str()); + DHLOGI("Mic mmap start, content: %{public}s.", event.content.c_str()); CHECK_NULL_RETURN(handler_, ERR_DH_AUDIO_NULLPTR); auto eventParam = std::make_shared(event); auto msgEvent = AppExecFwk::InnerEvent::Get(EVENT_MMAP_MIC_START, eventParam, 0); @@ -515,7 +515,7 @@ int32_t DAudioSourceDev::HandleMicMmapStart(const AudioEvent &event) int32_t DAudioSourceDev::HandleMicMmapStop(const AudioEvent &event) { - DHLOGI("Mic mmap stop, content: %s.", event.content.c_str()); + DHLOGI("Mic mmap stop, content: %{public}s.", event.content.c_str()); CHECK_NULL_RETURN(handler_, ERR_DH_AUDIO_NULLPTR); auto eventParam = std::make_shared(event); auto msgEvent = AppExecFwk::InnerEvent::Get(EVENT_MMAP_MIC_STOP, eventParam, 0); @@ -530,7 +530,7 @@ int32_t DAudioSourceDev::HandleMicMmapStop(const AudioEvent &event) int32_t DAudioSourceDev::WaitForRPC(const AudioEventType type) { std::unique_lock lck(rpcWaitMutex_); - DHLOGI("Wait sink device notify type: %d.", type); + DHLOGI("Wait sink device notify type: %{public}d.", type); auto status = rpcWaitCond_.wait_for(lck, std::chrono::seconds(RPC_WAIT_SECONDS), [this, type]() { switch (type) { case AudioEventType::NOTIFY_OPEN_SPEAKER_RESULT: @@ -550,7 +550,7 @@ int32_t DAudioSourceDev::WaitForRPC(const AudioEventType type) } }); if (!status) { - DHLOGE("RPC notify wait timeout(%ds).", RPC_WAIT_SECONDS); + DHLOGE("RPC notify wait timeout(%{public}ds).", RPC_WAIT_SECONDS); return ERR_DH_AUDIO_SA_WAIT_TIMEOUT; } if (rpcResult_ != DH_SUCCESS) { @@ -559,7 +559,7 @@ int32_t DAudioSourceDev::WaitForRPC(const AudioEventType type) } rpcNotify_ = 0; rpcResult_ = ERR_DH_AUDIO_FAILED; - DHLOGD("Receive sink device notify type: %d.", type); + DHLOGD("Receive sink device notify type: %{public}d.", type); return DH_SUCCESS; } @@ -598,7 +598,7 @@ int32_t DAudioSourceDev::TaskEnableDAudio(const std::string &args) result = EnableDMic(dhId, attrsStr); break; default: - DHLOGE("Unknown audio device. dhId: %d.", dhId); + DHLOGE("Unknown audio device. dhId: %{public}d.", dhId); result = ERR_DH_AUDIO_NOT_SUPPORT; } cJSON_Delete(jParam); @@ -668,16 +668,16 @@ int32_t DAudioSourceDev::TaskDisableDAudio(const std::string &args) CHECK_NULL_RETURN(jParam, ERR_DH_AUDIO_NULLPTR); int32_t dhId = ParseDhidFromEvent(args); CHECK_AND_FREE_RETURN_RET_LOG(dhId == -1, ERR_DH_AUDIO_NULLPTR, jParam, - "%s", "Parse dhId error."); + "%{public}s", "Parse dhId error."); cJSON_Delete(jParam); - DHLOGI("Parsed dhId = %d", dhId); + DHLOGI("Parsed dhId = %{public}d", dhId); switch (GetDevTypeByDHId(dhId)) { case AUDIO_DEVICE_TYPE_SPEAKER: return DisableDSpeaker(dhId); case AUDIO_DEVICE_TYPE_MIC: return DisableDMic(dhId); default: - DHLOGE("Unknown audio device. hdId: %d.", dhId); + DHLOGE("Unknown audio device. hdId: %{public}d.", dhId); return ERR_DH_AUDIO_NOT_SUPPORT; } } @@ -729,7 +729,7 @@ void DAudioSourceDev::OnDisableTaskResult(int32_t resultCode, const std::string int32_t DAudioSourceDev::TaskOpenDSpeaker(const std::string &args) { DAudioHitrace trace("DAudioSourceDev::TaskOpenDSpeaker"); - DHLOGI("Task open speaker args: %s.", args.c_str()); + DHLOGI("Task open speaker args: %{public}s.", args.c_str()); if (args.length() > DAUDIO_MAX_JSON_LEN || args.empty()) { DHLOGE("args length error. 0 or max."); return ERR_DH_AUDIO_SA_PARAM_INVALID; @@ -747,7 +747,7 @@ int32_t DAudioSourceDev::TaskOpenDSpeaker(const std::string &args) } int32_t ret = speaker->InitSenderEngine(DAudioSourceManager::GetInstance().getSenderProvider()); if (ret != DH_SUCCESS) { - DHLOGE("Speaker init sender Engine, error code %d.", ret); + DHLOGE("Speaker init sender Engine, error code %{public}d.", ret); NotifyHDF(NOTIFY_OPEN_SPEAKER_RESULT, HDF_EVENT_INIT_ENGINE_FAILED, dhId); return ret; } @@ -758,7 +758,7 @@ int32_t DAudioSourceDev::TaskOpenDSpeaker(const std::string &args) std::string dhIdString = std::to_string(dhId); ret = NotifySinkDev(OPEN_SPEAKER, jAudioParam, dhIdString); if (ret != DH_SUCCESS) { - DHLOGE("Notify sink open speaker failed, error code %d.", ret); + DHLOGE("Notify sink open speaker failed, error code %{public}d.", ret); cJSON_Delete(jAudioParam); NotifyHDF(NOTIFY_OPEN_SPEAKER_RESULT, HDF_EVENT_NOTIFY_SINK_FAILED, dhId); return ret; @@ -766,7 +766,7 @@ int32_t DAudioSourceDev::TaskOpenDSpeaker(const std::string &args) ret = OpenDSpeakerInner(speaker, dhId); if (ret != DH_SUCCESS) { cJSON_Delete(jAudioParam); - DHLOGE("Task Open DSpeaker Execute failed, error code %d.", ret); + DHLOGE("Task Open DSpeaker Execute failed, error code %{public}d.", ret); return ret; } cJSON_Delete(jAudioParam); @@ -775,7 +775,7 @@ int32_t DAudioSourceDev::TaskOpenDSpeaker(const std::string &args) int32_t DAudioSourceDev::ParseDhidFromEvent(std::string args) { - DHLOGI("ParseDhidFrom args : %s", args.c_str()); + DHLOGI("ParseDhidFrom args : %{public}s", args.c_str()); cJSON *jParam = cJSON_Parse(args.c_str()); CHECK_NULL_RETURN(jParam, ERR_DH_AUDIO_FAILED); if (!CJsonParamCheck(jParam, { KEY_DH_ID })) { @@ -791,14 +791,14 @@ int32_t DAudioSourceDev::ParseDhidFromEvent(std::string args) } int32_t dhId = ConvertString2Int(std::string(dhIdItem->valuestring)); cJSON_Delete(jParam); - DHLOGI("Parsed dhId is: %d.", dhId); + DHLOGI("Parsed dhId is: %{public}d.", dhId); return dhId; } int32_t DAudioSourceDev::ConvertString2Int(std::string val) { if (!CheckIsNum(val)) { - DHLOGE("String is not number. str:%s.", val.c_str()); + DHLOGE("String is not number. str:%{public}s.", val.c_str()); return ERR_DH_AUDIO_FAILED; } return std::stoi(val); @@ -808,13 +808,13 @@ int32_t DAudioSourceDev::OpenDSpeakerInner(std::shared_ptr &speaker { int32_t ret = speaker->SetUp(); if (ret != DH_SUCCESS) { - DHLOGE("Speaker setup failed, error code %d.", ret); + DHLOGE("Speaker setup failed, error code %{public}d.", ret); NotifyHDF(NOTIFY_OPEN_SPEAKER_RESULT, HDF_EVENT_TRANS_SETUP_FAILED, dhId); return ret; } ret = speaker->Start(); if (ret != DH_SUCCESS) { - DHLOGE("Speaker start failed, error code %d.", ret); + DHLOGE("Speaker start failed, error code %{public}d.", ret); speaker->Stop(); speaker->Release(); NotifyHDF(NOTIFY_OPEN_SPEAKER_RESULT, HDF_EVENT_TRANS_START_FAILED, dhId); @@ -830,7 +830,7 @@ int32_t DAudioSourceDev::CloseSpkNew(const std::string &args) cJSON *jAudioParam = nullptr; int32_t dhId = ParseDhidFromEvent(args); CHECK_AND_RETURN_RET_LOG(dhId == -1, ERR_DH_AUDIO_NULLPTR, - "%s", "Parse dhId error."); + "%{public}s", "Parse dhId error."); NotifySinkDev(CLOSE_SPEAKER, jAudioParam, std::to_string(dhId)); bool closeStatus = true; auto speaker = FindIoDevImpl(args); @@ -851,7 +851,7 @@ int32_t DAudioSourceDev::CloseSpkNew(const std::string &args) int32_t DAudioSourceDev::TaskCloseDSpeaker(const std::string &args) { - DHLOGI("Task close speaker, args: %s.", args.c_str()); + DHLOGI("Task close speaker, args: %{public}s.", args.c_str()); int32_t dhId = ParseDhidFromEvent(args); if (dhId < 0) { DHLOGE("Failed to parse dhardware id."); @@ -880,12 +880,12 @@ int32_t DAudioSourceDev::TaskCloseDSpeaker(const std::string &args) int32_t DAudioSourceDev::TaskOpenDMic(const std::string &args) { - DHLOGI("Task open mic, args: %s.", args.c_str()); + DHLOGI("Task open mic, args: %{public}s.", args.c_str()); if (args.length() > DAUDIO_MAX_JSON_LEN || args.empty()) { return ERR_DH_AUDIO_SA_PARAM_INVALID; } int32_t dhId = ParseDhidFromEvent(args); - CHECK_AND_RETURN_RET_LOG(dhId < 0, ERR_DH_AUDIO_FAILED, "%s", "Failed to parse dhardware id."); + CHECK_AND_RETURN_RET_LOG(dhId < 0, ERR_DH_AUDIO_FAILED, "%{public}s", "Failed to parse dhardware id."); auto mic = FindIoDevImpl(args); if (mic == nullptr) { DHLOGE("Mic device not init"); @@ -910,7 +910,7 @@ int32_t DAudioSourceDev::TaskOpenDMic(const std::string &args) to_json(jAudioParam, mic->GetAudioParam()); ret = NotifySinkDev(OPEN_MIC, jAudioParam, std::to_string(dhId)); if (ret != DH_SUCCESS) { - DHLOGE("Notify sink open mic failed, error code %d.", ret); + DHLOGE("Notify sink open mic failed, error code %{public}d.", ret); mic->Release(); NotifyHDF(NOTIFY_OPEN_MIC_RESULT, HDF_EVENT_NOTIFY_SINK_FAILED, dhId); cJSON_Delete(jAudioParam); @@ -919,7 +919,7 @@ int32_t DAudioSourceDev::TaskOpenDMic(const std::string &args) ret = mic->Start(); if (ret != DH_SUCCESS) { - DHLOGE("Mic start failed, error code %d.", ret); + DHLOGE("Mic start failed, error code %{public}d.", ret); mic->Stop(); mic->Release(); NotifyHDF(NOTIFY_OPEN_MIC_RESULT, HDF_EVENT_TRANS_START_FAILED, dhId); @@ -937,7 +937,7 @@ int32_t DAudioSourceDev::CloseMicNew(const std::string &args) cJSON *jAudioParam = nullptr; int32_t dhId = ParseDhidFromEvent(args); CHECK_AND_RETURN_RET_LOG(dhId == -1, ERR_DH_AUDIO_NULLPTR, - "%s", "Parse dhId error."); + "%{public}s", "Parse dhId error."); NotifySinkDev(CLOSE_MIC, jAudioParam, std::to_string(dhId)); auto mic = FindIoDevImpl(args); @@ -950,7 +950,7 @@ int32_t DAudioSourceDev::CloseMicNew(const std::string &args) int32_t DAudioSourceDev::TaskCloseDMic(const std::string &args) { - DHLOGI("Task close mic, args: %s.", args.c_str()); + DHLOGI("Task close mic, args: %{public}s.", args.c_str()); if (args.length() > DAUDIO_MAX_JSON_LEN || args.empty()) { DHLOGE("Args length err. 0 or max."); return ERR_DH_AUDIO_SA_PARAM_INVALID; @@ -978,7 +978,7 @@ int32_t DAudioSourceDev::TaskCloseDMic(const std::string &args) int32_t DAudioSourceDev::TaskDMicClosed(const std::string &args) { - DHLOGI("Task dmic closed, args: %s.", args.c_str()); + DHLOGI("Task dmic closed, args: %{public}s.", args.c_str()); if (args.length() > DAUDIO_MAX_JSON_LEN || args.empty()) { DHLOGE("Args length err. 0 or max."); return ERR_DH_AUDIO_SA_PARAM_INVALID; @@ -996,14 +996,14 @@ int32_t DAudioSourceDev::TaskDMicClosed(const std::string &args) int32_t DAudioSourceDev::TaskSetVolume(const std::string &args) { - DHLOGD("Task set volume, args: %s.", args.c_str()); + DHLOGD("Task set volume, args: %{public}s.", args.c_str()); AudioEvent event(getEventTypeFromArgs(args), args); return SendAudioEventToRemote(event); } int32_t DAudioSourceDev::TaskChangeVolume(const std::string &args) { - DHLOGD("Task change volume, args: %s.", args.c_str()); + DHLOGD("Task change volume, args: %{public}s.", args.c_str()); cJSON *jParam = cJSON_Parse(args.c_str()); CHECK_NULL_RETURN(jParam, ERR_DH_AUDIO_NULLPTR); if (!CJsonParamCheck(jParam, { KEY_DH_ID })) { @@ -1024,7 +1024,7 @@ int32_t DAudioSourceDev::TaskChangeVolume(const std::string &args) int32_t DAudioSourceDev::TaskChangeFocus(const std::string &args) { - DHLOGD("Task change focus, args: %s.", args.c_str()); + DHLOGD("Task change focus, args: %{public}s.", args.c_str()); int32_t dhId = ParseDhidFromEvent(args); if (dhId < 0) { DHLOGE("Failed to parse dhardware id."); @@ -1035,7 +1035,7 @@ int32_t DAudioSourceDev::TaskChangeFocus(const std::string &args) int32_t DAudioSourceDev::TaskChangeRenderState(const std::string &args) { - DHLOGD("Task change render state, args: %s.", args.c_str()); + DHLOGD("Task change render state, args: %{public}s.", args.c_str()); cJSON *jParam = cJSON_Parse(args.c_str()); CHECK_NULL_RETURN(jParam, ERR_DH_AUDIO_NULLPTR); @@ -1057,7 +1057,7 @@ int32_t DAudioSourceDev::TaskChangeRenderState(const std::string &args) int32_t DAudioSourceDev::TaskPlayStatusChange(const std::string &args) { - DHLOGD("Task play status change, content: %s.", args.c_str()); + DHLOGD("Task play status change, content: %{public}s.", args.c_str()); AudioEvent audioEvent(CHANGE_PLAY_STATUS, args); if (SendAudioEventToRemote(audioEvent) != DH_SUCCESS) { DHLOGE("Task Play status change failed."); @@ -1111,19 +1111,19 @@ int32_t DAudioSourceDev::SendAudioEventToRemote(const AudioEvent &event) int32_t DAudioSourceDev::TaskSpkMmapStart(const std::string &args) { - DHLOGI("Task spk mmap start, content: %s.", args.c_str()); + DHLOGI("Task spk mmap start, content: %{public}s.", args.c_str()); auto speaker = FindIoDevImpl(args); CHECK_NULL_RETURN(speaker, ERR_DH_AUDIO_NULLPTR); int32_t ret = speaker->MmapStart(); if (ret != DH_SUCCESS) { - DHLOGE("Task spk mmap start fail, error code: %d.", ret); + DHLOGE("Task spk mmap start fail, error code: %{public}d.", ret); } return ret; } int32_t DAudioSourceDev::TaskSpkMmapStop(const std::string &args) { - DHLOGI("Task spk mmap stop, content: %s.", args.c_str()); + DHLOGI("Task spk mmap stop, content: %{public}s.", args.c_str()); auto speaker = FindIoDevImpl(args); CHECK_NULL_RETURN(speaker, ERR_DH_AUDIO_NULLPTR); speaker->MmapStop(); @@ -1132,19 +1132,19 @@ int32_t DAudioSourceDev::TaskSpkMmapStop(const std::string &args) int32_t DAudioSourceDev::TaskMicMmapStart(const std::string &args) { - DHLOGI("Task mic mmap start, content: %s.", args.c_str()); + DHLOGI("Task mic mmap start, content: %{public}s.", args.c_str()); auto mic = FindIoDevImpl(args); CHECK_NULL_RETURN(mic, ERR_DH_AUDIO_NULLPTR); int32_t ret = mic->MmapStart(); if (ret != DH_SUCCESS) { - DHLOGE("Task mic mmap start fail, error code: %d.", ret); + DHLOGE("Task mic mmap start fail, error code: %{public}d.", ret); } return ret; } int32_t DAudioSourceDev::TaskMicMmapStop(const std::string &args) { - DHLOGI("Task mic mmap stop, content: %s.", args.c_str()); + DHLOGI("Task mic mmap stop, content: %{public}s.", args.c_str()); auto mic = FindIoDevImpl(args); CHECK_NULL_RETURN(mic, ERR_DH_AUDIO_NULLPTR); mic->MmapStop(); @@ -1156,7 +1156,7 @@ void DAudioSourceDev::OnTaskResult(int32_t resultCode, const std::string &result (void)resultCode; (void)result; (void)funcName; - DHLOGD("OnTaskResult. resultcode: %d, result: %s, funcName: %s", resultCode, result.c_str(), + DHLOGD("OnTaskResult. resultcode: %{public}d, result: %{public}s, funcName: %{public}s", resultCode, result.c_str(), funcName.c_str()); } @@ -1177,12 +1177,12 @@ int32_t DAudioSourceDev::NotifySinkDev(const AudioEventType type, const cJSON *P cJSON *jParamCopy = cJSON_Duplicate(Param, 1); cJSON_AddItemToObject(jParam, KEY_AUDIO_PARAM, jParamCopy); cJSON_AddStringToObject(jParam, KEY_RANDOM_TASK_CODE, std::to_string(randomTaskCode).c_str()); - DHLOGD("Notify sink dev, new engine, random task code:%s", std::to_string(randomTaskCode).c_str()); + DHLOGD("Notify sink dev, new engine, random task code:%{public}s", std::to_string(randomTaskCode).c_str()); std::lock_guard devLck(ioDevMtx_); int32_t dhIdInt = ConvertString2Int(dhId); if (deviceMap_.find(dhIdInt) == deviceMap_.end()) { - DHLOGE("speaker or mic dev is null. find index: %d.", dhIdInt); + DHLOGE("speaker or mic dev is null. find index: %{public}d.", dhIdInt); cJSON_Delete(jParam); return ERR_DH_AUDIO_NULLPTR; } @@ -1212,10 +1212,10 @@ int32_t DAudioSourceDev::NotifySinkDev(const AudioEventType type, const cJSON *P int32_t DAudioSourceDev::NotifyHDF(const AudioEventType type, const std::string result, const int32_t dhId) { - DHLOGI("Notify HDF framework the result, event type: %d; result: %s.", type, result.c_str()); + DHLOGI("Notify HDF framework the result, event type: %{public}d; result: %{public}s.", type, result.c_str()); std::lock_guard devLck(ioDevMtx_); if (deviceMap_.find(dhId) == deviceMap_.end()) { - DHLOGE("Speaker or mic dev is null. dhId: %d", dhId); + DHLOGE("Speaker or mic dev is null. dhId: %{public}d", dhId); return ERR_DH_AUDIO_NULLPTR; } auto ioDev = deviceMap_[dhId]; @@ -1289,7 +1289,7 @@ void DAudioSourceDev::SourceEventHandler::ProcessEvent(const AppExecFwk::InnerEv { auto iter = mapEventFuncs_.find(event->GetInnerEventId()); if (iter == mapEventFuncs_.end()) { - DHLOGE("Event Id is invaild. %d", event->GetInnerEventId()); + DHLOGE("Event Id is invaild. %{public}d", event->GetInnerEventId()); return; } SourceEventFunc &func = iter->second; diff --git a/services/audiomanager/managersource/src/daudio_source_manager.cpp b/services/audiomanager/managersource/src/daudio_source_manager.cpp index 1cefdd98..43692e73 100644 --- a/services/audiomanager/managersource/src/daudio_source_manager.cpp +++ b/services/audiomanager/managersource/src/daudio_source_manager.cpp @@ -161,8 +161,8 @@ static bool CheckParams(const std::string &devId, const std::string &dhId) int32_t DAudioSourceManager::EnableDAudio(const std::string &devId, const std::string &dhId, const std::string &version, const std::string &attrs, const std::string &reqId) { - DHLOGI("Enable distributed audio, devId: %s, dhId: %s, version: %s, reqId: %s.", GetAnonyString(devId).c_str(), - dhId.c_str(), version.c_str(), reqId.c_str()); + DHLOGI("Enable distributed audio, devId: %{public}s, dhId: %{public}s, version: %{public}s, reqId: %{public}s.", + GetAnonyString(devId).c_str(), dhId.c_str(), version.c_str(), reqId.c_str()); CHECK_NULL_RETURN(handler_, ERR_DH_AUDIO_NULLPTR); cJSON *jParam = cJSON_CreateObject(); @@ -199,7 +199,7 @@ int32_t DAudioSourceManager::DoEnableDAudio(const std::string &args) std::string version = ParseStringFromArgs(args, KEY_VERSION); std::string attrs = ParseStringFromArgs(args, KEY_ATTRS); std::string reqId = ParseStringFromArgs(args, KEY_REQID); - DHLOGI("Do Enable distributed audio, devId: %s, dhId: %s, version:%s, reqId:%s.", + DHLOGI("Do Enable distributed audio, devId: %{public}s, dhId: %{public}s, version:%{public}s, reqId:%{public}s.", GetAnonyString(devId).c_str(), dhId.c_str(), version.c_str(), reqId.c_str()); if (!CheckParams(devId, dhId) || attrs.empty()) { DHLOGE("Enable params are incorrect."); @@ -224,8 +224,8 @@ int32_t DAudioSourceManager::DoEnableDAudio(const std::string &args) int32_t DAudioSourceManager::DisableDAudio(const std::string &devId, const std::string &dhId, const std::string &reqId) { - DHLOGI("Disable distributed audio, devId: %s, dhId: %s, reqId: %s.", GetAnonyString(devId).c_str(), dhId.c_str(), - reqId.c_str()); + DHLOGI("Disable distributed audio, devId: %{public}s, dhId: %{public}s, reqId: %{public}s.", + GetAnonyString(devId).c_str(), dhId.c_str(), reqId.c_str()); CHECK_NULL_RETURN(handler_, ERR_DH_AUDIO_NULLPTR); cJSON *jParam = cJSON_CreateObject(); CHECK_NULL_RETURN(jParam, ERR_DH_AUDIO_NULLPTR); @@ -257,7 +257,7 @@ int32_t DAudioSourceManager::DoDisableDAudio(const std::string &args) std::string devId = ParseStringFromArgs(args, KEY_DEV_ID); std::string dhId = ParseStringFromArgs(args, KEY_DH_ID); std::string reqId = ParseStringFromArgs(args, KEY_REQID); - DHLOGI("Do Disable distributed audio, devId: %s, dhId: %s, reqId:%s.", + DHLOGI("Do Disable distributed audio, devId: %{public}s, dhId: %{public}s, reqId:%{public}s.", GetAnonyString(devId).c_str(), dhId.c_str(), reqId.c_str()); if (!CheckParams(devId, dhId)) { DHLOGE("Disable params are incorrect."); @@ -283,7 +283,7 @@ int32_t DAudioSourceManager::DoDisableDAudio(const std::string &args) int32_t DAudioSourceManager::HandleDAudioNotify(const std::string &devId, const std::string &dhId, const int32_t eventType, const std::string &eventContent) { - DHLOGD("Receive audio event from devId: %s, event type: %d. event content: %s.", + DHLOGD("Receive audio event from devId: %{public}s, event type: %{public}d. event content: %{public}s.", GetAnonyString(devId).c_str(), eventType, eventContent.c_str()); if (eventContent.length() > DAUDIO_MAX_JSON_LEN || eventContent.empty()) { return ERR_DH_AUDIO_FAILED; @@ -292,7 +292,7 @@ int32_t DAudioSourceManager::HandleDAudioNotify(const std::string &devId, const // now ctrl channel is also goto here, please sure here not crash. cJSON *jParam = cJSON_Parse(eventContent.c_str()); if (CJsonParamCheck(jParam, { KEY_RANDOM_TASK_CODE })) { - DHLOGD("Receive audio notify from sink, random task code: %s", + DHLOGD("Receive audio notify from sink, random task code: %{public}s", cJSON_GetObjectItemCaseSensitive(jParam, KEY_RANDOM_TASK_CODE)->valuestring); } @@ -317,8 +317,8 @@ int32_t DAudioSourceManager::HandleDAudioNotify(const std::string &devId, const int32_t DAudioSourceManager::DAudioNotify(const std::string &devId, const std::string &dhId, const int32_t eventType, const std::string &eventContent) { - DHLOGD("Distributed audio notify, devId: %s, dhId: %s, eventType: %d.", GetAnonyString(devId).c_str(), - dhId.c_str(), eventType); + DHLOGD("Distributed audio notify, devId: %{public}s, dhId: %{public}s, eventType: %{public}d.", + GetAnonyString(devId).c_str(), dhId.c_str(), eventType); { std::lock_guard lck(remoteSvrMutex_); auto sinkProxy = sinkServiceMap_.find(devId); @@ -346,8 +346,8 @@ int32_t DAudioSourceManager::DAudioNotify(const std::string &devId, const std::s int32_t DAudioSourceManager::OnEnableDAudio(const std::string &devId, const std::string &dhId, const int32_t result) { - DHLOGI("On enable distributed audio devId: %s, dhId: %s, ret: %d.", GetAnonyString(devId).c_str(), dhId.c_str(), - result); + DHLOGI("On enable distributed audio devId: %{public}s, dhId: %{public}s, ret: %{public}d.", + GetAnonyString(devId).c_str(), dhId.c_str(), result); std::string reqId = GetRequestId(devId, dhId); if (reqId.empty()) { return ERR_DH_AUDIO_FAILED; @@ -362,8 +362,8 @@ int32_t DAudioSourceManager::OnEnableDAudio(const std::string &devId, const std: int32_t DAudioSourceManager::OnDisableDAudio(const std::string &devId, const std::string &dhId, const int32_t result) { - DHLOGI("On disable distributed audio devId: %s, dhId: %s, ret: %d.", GetAnonyString(devId).c_str(), dhId.c_str(), - result); + DHLOGI("On disable distributed audio devId: %{public}s, dhId: %{public}s, ret: %{public}d.", + GetAnonyString(devId).c_str(), dhId.c_str(), result); std::string reqId = GetRequestId(devId, dhId); if (reqId.empty()) { return ERR_DH_AUDIO_FAILED; @@ -391,7 +391,7 @@ int32_t DAudioSourceManager::CreateAudioDevice(const std::string &devId) void DAudioSourceManager::DeleteAudioDevice(const std::string &devId, const std::string &dhId) { - DHLOGI("Delete audio device, devId = %s, dhId = %s.", devId.c_str(), dhId.c_str()); + DHLOGI("Delete audio device, devId = %{public}s, dhId = %{public}s.", devId.c_str(), dhId.c_str()); { std::lock_guard lock(devMapMtx_); audioDevMap_[devId].ports.erase(dhId); @@ -428,7 +428,7 @@ std::string DAudioSourceManager::GetRequestId(const std::string &devId, const st void DAudioSourceManager::ClearAudioDev(const std::string &devId) { - DHLOGI("ClearAudioDev, devId = %s.", GetAnonyString(devId).c_str()); + DHLOGI("ClearAudioDev, devId = %{public}s.", GetAnonyString(devId).c_str()); std::lock_guard lock(devMapMtx_); if (audioDevMap_[devId].ports.empty()) { DHLOGI("audioDevMap_[devId].ports is empty."); @@ -488,7 +488,7 @@ int32_t DAudioSourceManager::LoadAVSenderEngineProvider() AVTransProviderClass getEngineFactoryFunc = (AVTransProviderClass)dlsym(pSHandler_, GET_SENDER_PROVIDER_FUNC.c_str()); if (getEngineFactoryFunc == nullptr) { - DHLOGE("av transport engine factory function handler is null, failed reason : %s", dlerror()); + DHLOGE("av transport engine factory function handler is null, failed reason : %{public}s", dlerror()); dlclose(pSHandler_); pSHandler_ = nullptr; return ERR_DH_AUDIO_NULLPTR; @@ -523,7 +523,7 @@ int32_t DAudioSourceManager::LoadAVReceiverEngineProvider() AVTransProviderClass getEngineFactoryFunc = (AVTransProviderClass)dlsym(pRHandler_, GET_RECEIVER_PROVIDER_FUNC.c_str()); if (getEngineFactoryFunc == nullptr) { - DHLOGE("av transport engine factory function handler is null, failed reason : %s", dlerror()); + DHLOGE("av transport engine factory function handler is null, failed reason : %{public}s", dlerror()); dlclose(pRHandler_); pRHandler_ = nullptr; return ERR_DH_AUDIO_NULLPTR; @@ -567,7 +567,7 @@ void DAudioSourceManager::SourceManagerHandler::ProcessEvent(const AppExecFwk::I { auto iter = mapEventFuncs_.find(event->GetInnerEventId()); if (iter == mapEventFuncs_.end()) { - DHLOGE("Event Id is invalid. %d.", event->GetInnerEventId()); + DHLOGE("Event Id is invalid. %{public}d.", event->GetInnerEventId()); return; } SourceManagerFunc &func = iter->second; @@ -582,7 +582,7 @@ void DAudioSourceManager::SourceManagerHandler::EnableDAudioCallback(const AppEx DHLOGE("Failed to get event parameters."); return; } - DHLOGI("Enable audio device, param:%s.", eventParam.c_str()); + DHLOGI("Enable audio device, param:%{public}s.", eventParam.c_str()); DAudioSourceManager::GetInstance().DoEnableDAudio(eventParam); } @@ -594,7 +594,7 @@ void DAudioSourceManager::SourceManagerHandler::DisableDAudioCallback(const AppE DHLOGE("Failed to get event parameters."); return; } - DHLOGI("Disable audio device, param:%s.", eventParam.c_str()); + DHLOGI("Disable audio device, param:%{public}s.", eventParam.c_str()); DAudioSourceManager::GetInstance().DoDisableDAudio(eventParam); } diff --git a/services/audiomanager/managersource/src/dmic_dev.cpp b/services/audiomanager/managersource/src/dmic_dev.cpp index 8b5779a9..fc7f8545 100644 --- a/services/audiomanager/managersource/src/dmic_dev.cpp +++ b/services/audiomanager/managersource/src/dmic_dev.cpp @@ -49,7 +49,7 @@ void DMicDev::OnEngineTransEvent(const AVTransEvent &event) void DMicDev::OnEngineTransMessage(const std::shared_ptr &message) { CHECK_NULL_VOID(message); - DHLOGI("On Engine message, type : %s.", GetEventNameByType(message->type_).c_str()); + DHLOGI("On Engine message, type : %{public}s.", GetEventNameByType(message->type_).c_str()); DAudioSourceManager::GetInstance().HandleDAudioNotify(message->dstDevId_, message->dstDevId_, message->type_, message->content_); } @@ -87,10 +87,10 @@ int32_t DMicDev::InitSenderEngine(IAVEngineProvider *providerPtr) int32_t DMicDev::EnableDevice(const int32_t dhId, const std::string &capability) { - DHLOGI("Enable IO device, device pin: %d.", dhId); + DHLOGI("Enable IO device, device pin: %{public}d.", dhId); int32_t ret = DAudioHdiHandler::GetInstance().RegisterAudioDevice(devId_, dhId, capability, shared_from_this()); if (ret != DH_SUCCESS) { - DHLOGE("Register device failed, ret: %d.", ret); + DHLOGE("Register device failed, ret: %{public}d.", ret); DAudioHisysevent::GetInstance().SysEventWriteFault(DAUDIO_REGISTER_FAIL, devId_, std::to_string(dhId), ret, "daudio register device failed."); return ret; @@ -101,10 +101,10 @@ int32_t DMicDev::EnableDevice(const int32_t dhId, const std::string &capability) int32_t DMicDev::DisableDevice(const int32_t dhId) { - DHLOGI("Disable IO device, device pin: %d.", dhId); + DHLOGI("Disable IO device, device pin: %{public}d.", dhId); int32_t ret = DAudioHdiHandler::GetInstance().UnRegisterAudioDevice(devId_, dhId); if (ret != DH_SUCCESS) { - DHLOGE("UnRegister failed, ret: %d.", ret); + DHLOGE("UnRegister failed, ret: %{public}d.", ret); DAudioHisysevent::GetInstance().SysEventWriteFault(DAUDIO_UNREGISTER_FAIL, devId_, std::to_string(dhId), ret, "daudio unregister device failed."); return ret; @@ -114,7 +114,7 @@ int32_t DMicDev::DisableDevice(const int32_t dhId) int32_t DMicDev::OpenDevice(const std::string &devId, const int32_t dhId) { - DHLOGI("Open mic device devId: %s, dhId: %d.", GetAnonyString(devId).c_str(), dhId); + DHLOGI("Open mic device devId: %{public}s, dhId: %{public}d.", GetAnonyString(devId).c_str(), dhId); std::shared_ptr cbObj = audioEventCallback_.lock(); CHECK_NULL_RETURN(cbObj, ERR_DH_AUDIO_NULLPTR); @@ -139,7 +139,7 @@ int32_t DMicDev::OpenDevice(const std::string &devId, const int32_t dhId) int32_t DMicDev::CloseDevice(const std::string &devId, const int32_t dhId) { - DHLOGI("Close mic device devId: %s, dhId: %d.", GetAnonyString(devId).c_str(), dhId); + DHLOGI("Close mic device devId: %{public}s, dhId: %{public}d.", GetAnonyString(devId).c_str(), dhId); std::shared_ptr cbObj = audioEventCallback_.lock(); CHECK_NULL_RETURN(cbObj, ERR_DH_AUDIO_NULLPTR); @@ -165,10 +165,9 @@ int32_t DMicDev::CloseDevice(const std::string &devId, const int32_t dhId) int32_t DMicDev::SetParameters(const std::string &devId, const int32_t dhId, const AudioParamHDF ¶m) { - DHLOGD("Set mic parameters {samplerate: %d, channelmask: %d, format: %d, period: %d, " - "framesize: %d, ext{%s}}.", - param.sampleRate, param.channelMask, param.bitFormat, param.period, param.frameSize, - param.ext.c_str()); + DHLOGD("Set mic parameters {samplerate: %{public}d, channelmask: %{public}d, format: %{public}d, " + "period: %{public}d, framesize: %{public}d, ext{%{public}s}}.", param.sampleRate, + param.channelMask, param.bitFormat, param.period, param.frameSize, param.ext.c_str()); curPort_ = dhId; paramHDF_ = param; @@ -184,7 +183,7 @@ int32_t DMicDev::SetParameters(const std::string &devId, const int32_t dhId, con int32_t DMicDev::NotifyEvent(const std::string &devId, const int32_t dhId, const AudioEvent &event) { - DHLOGD("Notify mic event, type: %d.", event.type); + DHLOGD("Notify mic event, type: %{public}d.", event.type); std::shared_ptr cbObj = audioEventCallback_.lock(); CHECK_NULL_RETURN(cbObj, ERR_DH_AUDIO_NULLPTR); switch (event.type) { @@ -210,7 +209,7 @@ int32_t DMicDev::SetUp() CHECK_NULL_RETURN(micTrans_, ERR_DH_AUDIO_NULLPTR); int32_t ret = micTrans_->SetUp(param_, param_, shared_from_this(), CAP_MIC); if (ret != DH_SUCCESS) { - DHLOGE("Mic trans set up failed. ret: %d.", ret); + DHLOGE("Mic trans set up failed. ret: %{public}d.", ret); return ret; } return DH_SUCCESS; @@ -222,14 +221,14 @@ int32_t DMicDev::Start() CHECK_NULL_RETURN(micTrans_, ERR_DH_AUDIO_NULLPTR); int32_t ret = micTrans_->Start(); if (ret != DH_SUCCESS) { - DHLOGE("Mic trans start failed, ret: %d.", ret); + DHLOGE("Mic trans start failed, ret: %{public}d.", ret); return ret; } std::unique_lock lck(channelWaitMutex_); auto status = channelWaitCond_.wait_for(lck, std::chrono::seconds(CHANNEL_WAIT_SECONDS), [this]() { return isTransReady_.load(); }); if (!status) { - DHLOGE("Wait channel open timeout(%ds).", CHANNEL_WAIT_SECONDS); + DHLOGE("Wait channel open timeout(%{public}ds).", CHANNEL_WAIT_SECONDS); return ERR_DH_AUDIO_SA_WAIT_TIMEOUT; } isOpened_.store(true); @@ -256,7 +255,7 @@ int32_t DMicDev::Stop() isTransReady_.store(false); int32_t ret = micTrans_->Stop(); if (ret != DH_SUCCESS) { - DHLOGE("Stop mic trans failed, ret: %d.", ret); + DHLOGE("Stop mic trans failed, ret: %{public}d.", ret); } return DH_SUCCESS; } @@ -274,7 +273,7 @@ int32_t DMicDev::Release() int32_t ret = micTrans_->Release(); if (ret != DH_SUCCESS) { - DHLOGE("Release mic trans failed, ret: %d.", ret); + DHLOGE("Release mic trans failed, ret: %{public}d.", ret); return ret; } dumpFlag_.store(false); @@ -306,11 +305,11 @@ int32_t DMicDev::ReadStreamData(const std::string &devId, const int32_t dhId, st if (insertFrameCnt_ >= queSize || queSize == 0) { ++insertFrameCnt_; isExistedEmpty_.store(true); - DHLOGD("Data queue is empty, count :%u.", insertFrameCnt_); + DHLOGD("Data queue is empty, count :%{public}u.", insertFrameCnt_); data = std::make_shared(param_.comParam.frameSize); } else { while (insertFrameCnt_ > 0) { - DHLOGD("Data discard, count: %u", insertFrameCnt_); + DHLOGD("Data discard, count: %{public}u", insertFrameCnt_); dataQueue_.pop(); --insertFrameCnt_; } @@ -329,8 +328,8 @@ int32_t DMicDev::ReadStreamData(const std::string &devId, const int32_t dhId, st #endif int64_t endTime = GetNowTimeUs(); if (IsOutDurationRange(startTime, endTime, lastReadStartTime_)) { - DHLOGE("This time read data spend: %" PRId64" us, The interval of read data this time and " - "the last time: %" PRId64" us", endTime - startTime, startTime - lastReadStartTime_); + DHLOGE("This time read data spend: %{public}" PRId64" us, The interval of read data this time and " + "the last time: %{public}" PRId64" us", endTime - startTime, startTime - lastReadStartTime_); } lastReadStartTime_ = startTime; return DH_SUCCESS; @@ -339,7 +338,7 @@ int32_t DMicDev::ReadStreamData(const std::string &devId, const int32_t dhId, st int32_t DMicDev::ReadMmapPosition(const std::string &devId, const int32_t dhId, uint64_t &frames, CurrentTimeHDF &time) { - DHLOGD("Read mmap position. frames: %" PRIu64", tvsec: %" PRId64", tvNSec:%" PRId64, + DHLOGD("Read mmap position. frames: %{public}" PRIu64", tvsec: %{public}" PRId64", tvNSec:%{public}" PRId64, writeNum_, writeTvSec_, writeTvNSec_); frames = writeNum_; time.tvSec = writeTvSec_; @@ -350,7 +349,8 @@ int32_t DMicDev::ReadMmapPosition(const std::string &devId, const int32_t dhId, int32_t DMicDev::RefreshAshmemInfo(const std::string &devId, const int32_t dhId, int32_t fd, int32_t ashmemLength, int32_t lengthPerTrans) { - DHLOGD("RefreshAshmemInfo: fd:%d, ashmemLength: %d, lengthPerTrans: %d", fd, ashmemLength, lengthPerTrans); + DHLOGD("RefreshAshmemInfo: fd:%{public}d, ashmemLength: %{public}d, lengthPerTrans: %{public}d", + fd, ashmemLength, lengthPerTrans); if (param_.captureOpts.capturerFlags == MMAP_MODE) { DHLOGD("DMic dev low-latency mode"); if (ashmem_ != nullptr) { @@ -359,7 +359,7 @@ int32_t DMicDev::RefreshAshmemInfo(const std::string &devId, const int32_t dhId, ashmem_ = new Ashmem(fd, ashmemLength); ashmemLength_ = ashmemLength; lengthPerTrans_ = lengthPerTrans; - DHLOGD("Create ashmem success. fd:%d, ashmem length: %d, lengthPreTrans: %d", + DHLOGD("Create ashmem success. fd:%{public}d, ashmem length: %{public}d, lengthPreTrans: %{public}d", fd, ashmemLength_, lengthPerTrans_); bool mapRet = ashmem_->MapReadAndWriteAshmem(); if (!mapRet) { @@ -388,12 +388,12 @@ void DMicDev::EnqueueThread() { writeIndex_ = 0; writeNum_ = 0; - DHLOGD("Enqueue thread start, lengthPerWrite length: %d.", lengthPerTrans_); + DHLOGD("Enqueue thread start, lengthPerWrite length: %{public}d.", lengthPerTrans_); FillJitterQueue(); while (ashmem_ != nullptr && isEnqueueRunning_.load()) { int64_t timeOffset = UpdateTimeOffset(frameIndex_, LOW_LATENCY_INTERVAL_NS, startTime_); - DHLOGD("Write frameIndex: %" PRId64", timeOffset: %" PRId64, frameIndex_, timeOffset); + DHLOGD("Write frameIndex: %{public}" PRId64", timeOffset: %{public}" PRId64, frameIndex_, timeOffset); std::shared_ptr audioData = nullptr; { std::lock_guard lock(dataQueueMtx_); @@ -412,7 +412,8 @@ void DMicDev::EnqueueThread() #endif bool writeRet = ashmem_->WriteToAshmem(audioData->Data(), audioData->Size(), writeIndex_); if (writeRet) { - DHLOGD("Write to ashmem success! write index: %d, writeLength: %d.", writeIndex_, lengthPerTrans_); + DHLOGD("Write to ashmem success! write index: %{public}d, writeLength: %{public}d.", + writeIndex_, lengthPerTrans_); } else { DHLOGE("Write data to ashmem failed."); } @@ -461,14 +462,14 @@ int32_t DMicDev::NotifyHdfAudioEvent(const AudioEvent &event, const int32_t port { int32_t ret = DAudioHdiHandler::GetInstance().NotifyEvent(devId_, portId, event); if (ret != DH_SUCCESS) { - DHLOGE("Notify event: %d, result: %s.", event.type, event.content.c_str()); + DHLOGE("Notify event: %{public}d, result: %{public}s.", event.type, event.content.c_str()); } return DH_SUCCESS; } int32_t DMicDev::OnStateChange(const AudioEventType type) { - DHLOGD("On mic device state change, type: %d", type); + DHLOGD("On mic device state change, type: %{public}d", type); AudioEvent event; switch (type) { case AudioEventType::DATA_OPENED: @@ -494,7 +495,7 @@ int32_t DMicDev::SendMessage(uint32_t type, std::string content, std::string dst { DHLOGI("Send message to remote."); if (type != static_cast(OPEN_MIC) && type != static_cast(CLOSE_MIC)) { - DHLOGE("Send message to remote. not OPEN_MIC or CLOSE_MIC. type: %u", type); + DHLOGE("Send message to remote. not OPEN_MIC or CLOSE_MIC. type: %{public}u", type); return ERR_DH_AUDIO_NULLPTR; } CHECK_NULL_RETURN(micTrans_, ERR_DH_AUDIO_NULLPTR); @@ -515,12 +516,12 @@ int32_t DMicDev::OnDecodeTransDataDone(const std::shared_ptr &audioDa uint64_t queueSize; while (dataQueue_.size() > dataQueSize_) { queueSize = static_cast(dataQueue_.size()); - DHLOGD("Data queue overflow. buf current size: %" PRIu64, queueSize); + DHLOGD("Data queue overflow. buf current size: %{public}" PRIu64, queueSize); dataQueue_.pop(); } dataQueue_.push(audioData); queueSize = static_cast(dataQueue_.size()); - DHLOGD("Push new mic data, buf len: %" PRIu64, queueSize); + DHLOGD("Push new mic data, buf len: %{public}" PRIu64, queueSize); return DH_SUCCESS; } } // DistributedHardware diff --git a/services/audiomanager/managersource/src/dspeaker_dev.cpp b/services/audiomanager/managersource/src/dspeaker_dev.cpp index fb83e5c3..08ccfc7f 100644 --- a/services/audiomanager/managersource/src/dspeaker_dev.cpp +++ b/services/audiomanager/managersource/src/dspeaker_dev.cpp @@ -38,10 +38,10 @@ namespace OHOS { namespace DistributedHardware { int32_t DSpeakerDev::EnableDevice(const int32_t dhId, const std::string &capability) { - DHLOGI("Enable IO device, device pin: %d.", dhId); + DHLOGI("Enable IO device, device pin: %{public}d.", dhId); int32_t ret = DAudioHdiHandler::GetInstance().RegisterAudioDevice(devId_, dhId, capability, shared_from_this()); if (ret != DH_SUCCESS) { - DHLOGE("Register device failed, ret: %d.", ret); + DHLOGE("Register device failed, ret: %{public}d.", ret); DAudioHisysevent::GetInstance().SysEventWriteFault(DAUDIO_REGISTER_FAIL, devId_, std::to_string(dhId), ret, "daudio register device failed."); return ret; @@ -52,10 +52,10 @@ int32_t DSpeakerDev::EnableDevice(const int32_t dhId, const std::string &capabil int32_t DSpeakerDev::DisableDevice(const int32_t dhId) { - DHLOGI("Disable IO device, device pin: %d.", dhId); + DHLOGI("Disable IO device, device pin: %{public}d.", dhId); int32_t ret = DAudioHdiHandler::GetInstance().UnRegisterAudioDevice(devId_, dhId); if (ret != DH_SUCCESS) { - DHLOGE("UnRegister failed, ret: %d.", ret); + DHLOGE("UnRegister failed, ret: %{public}d.", ret); DAudioHisysevent::GetInstance().SysEventWriteFault(DAUDIO_UNREGISTER_FAIL, devId_, std::to_string(dhId), ret, "daudio unregister device failed."); return ret; @@ -101,14 +101,14 @@ void DSpeakerDev::OnEngineTransEvent(const AVTransEvent &event) void DSpeakerDev::OnEngineTransMessage(const std::shared_ptr &message) { CHECK_NULL_VOID(message); - DHLOGI("On Engine message, type : %s.", GetEventNameByType(message->type_).c_str()); + DHLOGI("On Engine message, type : %{public}s.", GetEventNameByType(message->type_).c_str()); DAudioSourceManager::GetInstance().HandleDAudioNotify(message->dstDevId_, message->dstDevId_, message->type_, message->content_); } int32_t DSpeakerDev::OpenDevice(const std::string &devId, const int32_t dhId) { - DHLOGI("Open speaker device devId: %s, dhId: %d.", GetAnonyString(devId).c_str(), dhId); + DHLOGI("Open speaker device devId: %{public}s, dhId: %{public}d.", GetAnonyString(devId).c_str(), dhId); std::shared_ptr cbObj = audioEventCallback_.lock(); CHECK_NULL_RETURN(cbObj, ERR_DH_AUDIO_NULLPTR); @@ -133,7 +133,7 @@ int32_t DSpeakerDev::OpenDevice(const std::string &devId, const int32_t dhId) int32_t DSpeakerDev::CloseDevice(const std::string &devId, const int32_t dhId) { - DHLOGI("Close speaker device devId: %s, dhId: %d.", GetAnonyString(devId).c_str(), dhId); + DHLOGI("Close speaker device devId: %{public}s, dhId: %{public}d.", GetAnonyString(devId).c_str(), dhId); std::shared_ptr cbObj = audioEventCallback_.lock(); CHECK_NULL_RETURN(cbObj, ERR_DH_AUDIO_NULLPTR); @@ -159,10 +159,10 @@ int32_t DSpeakerDev::CloseDevice(const std::string &devId, const int32_t dhId) int32_t DSpeakerDev::SetParameters(const std::string &devId, const int32_t dhId, const AudioParamHDF ¶m) { - DHLOGD("Set speaker parameters {samplerate: %d, channelmask: %d, format: %d, streamusage: %d, period: %d, " - "framesize: %d, renderFlags: %d, ext{%s}}.", - param.sampleRate, param.channelMask, param.bitFormat, param.streamUsage, param.period, param.frameSize, - param.renderFlags, param.ext.c_str()); + DHLOGD("Set speaker parameters {samplerate: %{public}d, channelmask: %{public}d, format: %{public}d, " + "streamusage: %{public}d, period: %{public}d, framesize: %{public}d, renderFlags: %{public}d, " + "ext{%{public}s}}.", param.sampleRate, param.channelMask, param.bitFormat, param.streamUsage, + param.period, param.frameSize, param.renderFlags, param.ext.c_str()); curPort_ = dhId; paramHDF_ = param; @@ -194,7 +194,7 @@ int32_t DSpeakerDev::SetUp() int32_t ret = speakerTrans_->SetUp(param_, param_, shared_from_this(), CAP_SPK); if (ret != DH_SUCCESS) { - DHLOGE("Speaker trans set up failed. ret:%d", ret); + DHLOGE("Speaker trans set up failed. ret:%{public}d", ret); return ret; } return DH_SUCCESS; @@ -206,14 +206,14 @@ int32_t DSpeakerDev::Start() CHECK_NULL_RETURN(speakerTrans_, ERR_DH_AUDIO_NULLPTR); int32_t ret = speakerTrans_->Start(); if (ret != DH_SUCCESS) { - DHLOGE("Speaker trans start failed, ret: %d.", ret); + DHLOGE("Speaker trans start failed, ret: %{public}d.", ret); return ret; } std::unique_lock lck(channelWaitMutex_); auto status = channelWaitCond_.wait_for(lck, std::chrono::seconds(CHANNEL_WAIT_SECONDS), [this]() { return isTransReady_.load(); }); if (!status) { - DHLOGE("Wait channel open timeout(%ds).", CHANNEL_WAIT_SECONDS); + DHLOGE("Wait channel open timeout(%{public}ds).", CHANNEL_WAIT_SECONDS); return ERR_DH_AUDIO_SA_WAIT_TIMEOUT; } isOpened_.store(true); @@ -228,7 +228,7 @@ int32_t DSpeakerDev::Stop() isTransReady_.store(false); int32_t ret = speakerTrans_->Stop(); if (ret != DH_SUCCESS) { - DHLOGE("Stop speaker trans failed, ret: %d.", ret); + DHLOGE("Stop speaker trans failed, ret: %{public}d.", ret); return ret; } return DH_SUCCESS; @@ -246,7 +246,7 @@ int32_t DSpeakerDev::Release() CHECK_NULL_RETURN(speakerTrans_, DH_SUCCESS); int32_t ret = speakerTrans_->Release(); if (ret != DH_SUCCESS) { - DHLOGE("Release speaker trans failed, ret: %d.", ret); + DHLOGE("Release speaker trans failed, ret: %{public}d.", ret); } dumpFlag_.store(false); return DH_SUCCESS; @@ -258,7 +258,7 @@ int32_t DSpeakerDev::Pause() CHECK_NULL_RETURN(speakerTrans_, ERR_DH_AUDIO_NULLPTR); int32_t ret = speakerTrans_->Pause(); if (ret != DH_SUCCESS) { - DHLOGE("Pause speaker trans failed, ret: %d.", ret); + DHLOGE("Pause speaker trans failed, ret: %{public}d.", ret); return ret; } DHLOGI("Pause success."); @@ -271,7 +271,7 @@ int32_t DSpeakerDev::Restart() CHECK_NULL_RETURN(speakerTrans_, ERR_DH_AUDIO_NULLPTR); int32_t ret = speakerTrans_->Restart(param_, param_); if (ret != DH_SUCCESS) { - DHLOGE("Restart speaker trans failed, ret: %d.", ret); + DHLOGE("Restart speaker trans failed, ret: %{public}d.", ret); return ret; } DHLOGI("Restart success."); @@ -294,7 +294,7 @@ int32_t DSpeakerDev::ReadStreamData(const std::string &devId, const int32_t dhId int32_t DSpeakerDev::WriteStreamData(const std::string &devId, const int32_t dhId, std::shared_ptr &data) { - DHLOGD("Write stream data, dhId:%d", dhId); + DHLOGD("Write stream data, dhId:%{public}d", dhId); int64_t startTime = GetNowTimeUs(); CHECK_NULL_RETURN(speakerTrans_, ERR_DH_AUDIO_NULLPTR); #ifdef DUMP_DSPEAKERDEV_FILE @@ -309,13 +309,13 @@ int32_t DSpeakerDev::WriteStreamData(const std::string &devId, const int32_t dhI #endif int32_t ret = speakerTrans_->FeedAudioData(data); if (ret != DH_SUCCESS) { - DHLOGE("Write stream data failed, ret: %d.", ret); + DHLOGE("Write stream data failed, ret: %{public}d.", ret); return ret; } int64_t endTime = GetNowTimeUs(); if (IsOutDurationRange(startTime, endTime, lastwriteStartTime_)) { - DHLOGE("This time write data spend: %" PRId64" us, The interval of write data this time and " - "the last time: %" PRId64" us", endTime - startTime, startTime - lastwriteStartTime_); + DHLOGE("This time write data spend: %{public}" PRId64" us, The interval of write data this time and " + "the last time: %{public}" PRId64" us", endTime - startTime, startTime - lastwriteStartTime_); } lastwriteStartTime_ = startTime; return DH_SUCCESS; @@ -324,7 +324,7 @@ int32_t DSpeakerDev::WriteStreamData(const std::string &devId, const int32_t dhI int32_t DSpeakerDev::ReadMmapPosition(const std::string &devId, const int32_t dhId, uint64_t &frames, CurrentTimeHDF &time) { - DHLOGD("Read mmap position. frames: %" PRIu64", tvsec: %" PRId64", tvNSec:%" PRId64, + DHLOGD("Read mmap position. frames: %{public}" PRIu64", tvsec: %{public}" PRId64", tvNSec:%{public}" PRId64, readNum_, readTvSec_, readTvNSec_); frames = readNum_; time.tvSec = readTvSec_; @@ -335,7 +335,8 @@ int32_t DSpeakerDev::ReadMmapPosition(const std::string &devId, const int32_t dh int32_t DSpeakerDev::RefreshAshmemInfo(const std::string &devId, const int32_t dhId, int32_t fd, int32_t ashmemLength, int32_t lengthPerTrans) { - DHLOGD("RefreshAshmemInfo: fd:%d, ashmemLength: %d, lengthPerTrans: %d", fd, ashmemLength, lengthPerTrans); + DHLOGD("RefreshAshmemInfo: fd:%{public}d, ashmemLength: %{public}d, lengthPerTrans: %{public}d", + fd, ashmemLength, lengthPerTrans); if (param_.renderOpts.renderFlags == MMAP_MODE) { DHLOGI("DSpeaker dev low-latency mode"); if (ashmem_ != nullptr) { @@ -344,7 +345,7 @@ int32_t DSpeakerDev::RefreshAshmemInfo(const std::string &devId, const int32_t d ashmem_ = new Ashmem(fd, ashmemLength); ashmemLength_ = ashmemLength; lengthPerTrans_ = lengthPerTrans; - DHLOGI("Create ashmem success. fd:%d, ashmem length: %d, lengthPreTrans: %d", + DHLOGI("Create ashmem success. fd:%{public}d, ashmem length: %{public}d, lengthPreTrans: %{public}d", fd, ashmemLength_, lengthPerTrans_); bool mapRet = ashmem_->MapReadAndWriteAshmem(); if (!mapRet) { @@ -371,13 +372,14 @@ void DSpeakerDev::EnqueueThread() readIndex_ = 0; readNum_ = 0; frameIndex_ = 0; - DHLOGI("Enqueue thread start, lengthPerRead length: %d.", lengthPerTrans_); + DHLOGI("Enqueue thread start, lengthPerRead length: %{public}d.", lengthPerTrans_); while (ashmem_ != nullptr && isEnqueueRunning_.load()) { int64_t timeOffset = UpdateTimeOffset(frameIndex_, LOW_LATENCY_INTERVAL_NS, startTime_); - DHLOGD("Read frameIndex: %" PRId64", timeOffset: %" PRId64, frameIndex_, timeOffset); + DHLOGD("Read frameIndex: %{public}" PRId64", timeOffset: %{public}" PRId64, frameIndex_, timeOffset); auto readData = ashmem_->ReadFromAshmem(lengthPerTrans_, readIndex_); - DHLOGI("Read from ashmem success! read index: %d, readLength: %d.", readIndex_, lengthPerTrans_); + DHLOGI("Read from ashmem success! read index: %{public}d, readLength: %{public}d.", + readIndex_, lengthPerTrans_); std::shared_ptr audioData = std::make_shared(lengthPerTrans_); if (readData != nullptr) { const uint8_t *readAudioData = reinterpret_cast(readData); @@ -393,7 +395,7 @@ void DSpeakerDev::EnqueueThread() #endif int32_t ret = speakerTrans_->FeedAudioData(audioData); if (ret != DH_SUCCESS) { - DHLOGE("Speaker enqueue thread, write stream data failed, ret: %d.", ret); + DHLOGE("Speaker enqueue thread, write stream data failed, ret: %{public}d.", ret); } readIndex_ += lengthPerTrans_; if (readIndex_ >= ashmemLength_) { @@ -427,7 +429,7 @@ int32_t DSpeakerDev::SendMessage(uint32_t type, std::string content, std::string if (type != static_cast(OPEN_SPEAKER) && type != static_cast(CLOSE_SPEAKER) && type != static_cast(CHANGE_PLAY_STATUS) && type != static_cast(VOLUME_SET) && type != static_cast(VOLUME_MUTE_SET)) { - DHLOGE("Send message to remote. not OPEN_SPK or CLOSE_SPK. type: %u", type); + DHLOGE("Send message to remote. not OPEN_SPK or CLOSE_SPK. type: %{public}u", type); return ERR_DH_AUDIO_NULLPTR; } CHECK_NULL_RETURN(speakerTrans_, ERR_DH_AUDIO_NULLPTR); @@ -439,14 +441,14 @@ int32_t DSpeakerDev::NotifyHdfAudioEvent(const AudioEvent &event, const int32_t { int32_t ret = DAudioHdiHandler::GetInstance().NotifyEvent(devId_, portId, event); if (ret != DH_SUCCESS) { - DHLOGE("Notify event: %d, result: %s.", event.type, event.content.c_str()); + DHLOGE("Notify event: %{public}d, result: %{public}s.", event.type, event.content.c_str()); } return DH_SUCCESS; } int32_t DSpeakerDev::OnStateChange(const AudioEventType type) { - DHLOGI("On speaker device state change, type: %d.", type); + DHLOGI("On speaker device state change, type: %{public}d.", type); AudioEvent event; switch (type) { case AudioEventType::DATA_OPENED: diff --git a/services/audiomanager/servicesink/src/daudio_sink_hidumper.cpp b/services/audiomanager/servicesink/src/daudio_sink_hidumper.cpp index 0b4b1c3c..f2a2bdd8 100644 --- a/services/audiomanager/servicesink/src/daudio_sink_hidumper.cpp +++ b/services/audiomanager/servicesink/src/daudio_sink_hidumper.cpp @@ -55,9 +55,9 @@ bool DaudioSinkHidumper::Dump(const std::vector &args, std::string { result.clear(); int32_t argsSize = static_cast(args.size()); - DHLOGI("Distributed audio hidumper dump args.size():%d", argsSize); + DHLOGI("Distributed audio hidumper dump args.size():%{public}d", argsSize); for (int32_t i = 0; i < argsSize; i++) { - DHLOGI("Distributed audio hidumper dump args[%d]: %s.", i, args.at(i).c_str()); + DHLOGI("Distributed audio hidumper dump args[%{public}d]: %{public}s.", i, args.at(i).c_str()); } if (args.empty()) { diff --git a/services/audiomanager/servicesink/src/daudio_sink_service.cpp b/services/audiomanager/servicesink/src/daudio_sink_service.cpp index d8afb8bb..1f5cafbb 100644 --- a/services/audiomanager/servicesink/src/daudio_sink_service.cpp +++ b/services/audiomanager/servicesink/src/daudio_sink_service.cpp @@ -87,7 +87,7 @@ int32_t DAudioSinkService::ReleaseSink() CHECK_NULL_RETURN(systemAbilityMgr, ERR_DH_AUDIO_NULLPTR); int32_t ret = systemAbilityMgr->UnloadSystemAbility(DISTRIBUTED_HARDWARE_AUDIO_SINK_SA_ID); if (ret != DH_SUCCESS) { - DHLOGE("Sink systemabilitymgr unloadsystemability failed, ret: %d", ret); + DHLOGE("Sink systemabilitymgr unloadsystemability failed, ret: %{public}d", ret); return ERR_DH_AUDIO_SA_LOAD_FAILED; } DHLOGI("Sink systemabilitymgr unloadsystemability successfully!"); @@ -109,7 +109,7 @@ int32_t DAudioSinkService::UnsubscribeLocalHardware(const std::string &dhId) void DAudioSinkService::DAudioNotify(const std::string &devId, const std::string &dhId, const int32_t eventType, const std::string &eventContent) { - DHLOGI("DAudioNotify devId:%s, dhId:%s, eventType:%d.", GetAnonyString(devId).c_str(), + DHLOGI("DAudioNotify devId:%{public}s, dhId:%{public}s, eventType:%{public}d.", GetAnonyString(devId).c_str(), dhId.c_str(), eventType); DAudioSinkManager::GetInstance().HandleDAudioNotify(devId, dhId, eventType, eventContent); } @@ -128,7 +128,7 @@ int DAudioSinkService::Dump(int32_t fd, const std::vector &args) return ERR_DH_AUDIO_BAD_VALUE; } - int ret = dprintf(fd, "%s\n", result.c_str()); + int ret = dprintf(fd, "%{public}s\n", result.c_str()); if (ret < 0) { DHLOGE("Dprintf error"); return ERR_DH_AUDIO_BAD_VALUE; @@ -139,21 +139,21 @@ int DAudioSinkService::Dump(int32_t fd, const std::vector &args) int32_t DAudioSinkService::PauseDistributedHardware(const std::string &networkId) { - DHLOGI("PauseDistributedHardware networkId:%s.", GetAnonyString(networkId).c_str()); + DHLOGI("PauseDistributedHardware networkId:%{public}s.", GetAnonyString(networkId).c_str()); DAudioSinkManager::GetInstance().PauseDistributedHardware(networkId); return DH_SUCCESS; } int32_t DAudioSinkService::ResumeDistributedHardware(const std::string &networkId) { - DHLOGI("ResumeDistributedHardware networkId:%s.", GetAnonyString(networkId).c_str()); + DHLOGI("ResumeDistributedHardware networkId:%{public}s.", GetAnonyString(networkId).c_str()); DAudioSinkManager::GetInstance().ResumeDistributedHardware(networkId); return DH_SUCCESS; } int32_t DAudioSinkService::StopDistributedHardware(const std::string &networkId) { - DHLOGI("StopDistributedHardware networkId:%s.", GetAnonyString(networkId).c_str()); + DHLOGI("StopDistributedHardware networkId:%{public}s.", GetAnonyString(networkId).c_str()); DAudioSinkManager::GetInstance().StopDistributedHardware(networkId); return DH_SUCCESS; } diff --git a/services/audiomanager/servicesink/src/daudio_sink_stub.cpp b/services/audiomanager/servicesink/src/daudio_sink_stub.cpp index 3b777504..6173afc8 100644 --- a/services/audiomanager/servicesink/src/daudio_sink_stub.cpp +++ b/services/audiomanager/servicesink/src/daudio_sink_stub.cpp @@ -58,7 +58,7 @@ DAudioSinkStub::~DAudioSinkStub() int32_t DAudioSinkStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { - DHLOGD("On remote request, code: %d.", code); + DHLOGD("On remote request, code: %{public}d.", code); std::u16string desc = DAudioSinkStub::GetDescriptor(); std::u16string remoteDesc = data.ReadInterfaceToken(); if (desc != remoteDesc) { diff --git a/services/audiomanager/servicesource/src/daudio_source_service.cpp b/services/audiomanager/servicesource/src/daudio_source_service.cpp index 69eaffe9..f77bbdb0 100644 --- a/services/audiomanager/servicesource/src/daudio_source_service.cpp +++ b/services/audiomanager/servicesource/src/daudio_source_service.cpp @@ -87,7 +87,7 @@ int32_t DAudioSourceService::ReleaseSource() CHECK_NULL_RETURN(systemAbilityMgr, ERR_DH_AUDIO_NULLPTR); int32_t ret = systemAbilityMgr->UnloadSystemAbility(DISTRIBUTED_HARDWARE_AUDIO_SOURCE_SA_ID); if (ret != DH_SUCCESS) { - DHLOGE("Source systemabilitymgr unloadsystemability failed, ret: %d", ret); + DHLOGE("Source systemabilitymgr unloadsystemability failed, ret: %{public}d", ret); return ERR_DH_AUDIO_SA_LOAD_FAILED; } DHLOGI("Source systemabilitymgr unloadsystemability successfully!"); @@ -97,7 +97,7 @@ int32_t DAudioSourceService::ReleaseSource() int32_t DAudioSourceService::RegisterDistributedHardware(const std::string &devId, const std::string &dhId, const EnableParam ¶m, const std::string &reqId) { - DHLOGI("Register distributed audio device, devId: %s, dhId: %s.", GetAnonyString(devId).c_str(), + DHLOGI("Register distributed audio device, devId: %{public}s, dhId: %{public}s.", GetAnonyString(devId).c_str(), dhId.c_str()); std::string version = param.sinkVersion; std::string attrs = param.sinkAttrs; @@ -107,7 +107,7 @@ int32_t DAudioSourceService::RegisterDistributedHardware(const std::string &devI int32_t DAudioSourceService::UnregisterDistributedHardware(const std::string &devId, const std::string &dhId, const std::string &reqId) { - DHLOGI("Unregister distributed audio device, devId: %s, dhId: %s.", GetAnonyString(devId).c_str(), + DHLOGI("Unregister distributed audio device, devId: %{public}s, dhId: %{public}s.", GetAnonyString(devId).c_str(), dhId.c_str()); return DAudioSourceManager::GetInstance().DisableDAudio(devId, dhId, reqId); } @@ -115,7 +115,7 @@ int32_t DAudioSourceService::UnregisterDistributedHardware(const std::string &de int32_t DAudioSourceService::ConfigDistributedHardware(const std::string &devId, const std::string &dhId, const std::string &key, const std::string &value) { - DHLOGI("Config distributed audio device, devId: %s, dhId: %s.", GetAnonyString(devId).c_str(), + DHLOGI("Config distributed audio device, devId: %{public}s, dhId: %{public}s.", GetAnonyString(devId).c_str(), dhId.c_str()); return DH_SUCCESS; } @@ -123,7 +123,7 @@ int32_t DAudioSourceService::ConfigDistributedHardware(const std::string &devId, void DAudioSourceService::DAudioNotify(const std::string &devId, const std::string &dhId, const int32_t eventType, const std::string &eventContent) { - DHLOGD("Notify distributed audio device, devId: %s, dhId: %s.", GetAnonyString(devId).c_str(), + DHLOGD("Notify distributed audio device, devId: %{public}s, dhId: %{public}s.", GetAnonyString(devId).c_str(), dhId.c_str()); DAudioSourceManager::GetInstance().HandleDAudioNotify(devId, dhId, eventType, eventContent); } @@ -142,7 +142,7 @@ int DAudioSourceService::Dump(int32_t fd, const std::vector& arg return ERR_DH_AUDIO_BAD_VALUE; } - int ret = dprintf(fd, "%s\n", result.c_str()); + int ret = dprintf(fd, "%{public}s\n", result.c_str()); if (ret < 0) { DHLOGE("Dprintf error"); return ERR_DH_AUDIO_BAD_VALUE; diff --git a/services/audiotransport/receiverengine/src/av_receiver_engine_adapter.cpp b/services/audiotransport/receiverengine/src/av_receiver_engine_adapter.cpp index a92fee7a..bcf555da 100644 --- a/services/audiotransport/receiverengine/src/av_receiver_engine_adapter.cpp +++ b/services/audiotransport/receiverengine/src/av_receiver_engine_adapter.cpp @@ -80,7 +80,7 @@ int32_t AVTransReceiverAdapter::SetParameter(const AVTransTag &tag, const std::s int32_t AVTransReceiverAdapter::CreateControlChannel(const std::string &peerDevId) { - DHLOGI("Create control channel, peerDevId:%s.", GetAnonyString(peerDevId).c_str()); + DHLOGI("Create control channel, peerDevId:%{public}s.", GetAnonyString(peerDevId).c_str()); if (chnCreateSuccess_.load()) { DHLOGI("Receiver channel already created."); return DH_SUCCESS; @@ -91,12 +91,12 @@ int32_t AVTransReceiverAdapter::CreateControlChannel(const std::string &peerDevI int32_t ret = receiverEngine_->CreateControlChannel(dstDevIds, ChannelAttribute{TransStrategy::LOW_LATANCY_STRATEGY}); if (ret != DH_SUCCESS) { - DHLOGE("Create av receiver channel failed, ret: %d", ret); + DHLOGE("Create av receiver channel failed, ret: %{public}d", ret); return ERR_DH_AV_TRANS_CREATE_CHANNEL_FAILED; } ret = WaitForChannelCreated(); if (ret != DH_SUCCESS) { - DHLOGE("Wait create sender channel failed, ret: %d", ret); + DHLOGE("Wait create sender channel failed, ret: %{public}d", ret); return ERR_DH_AV_TRANS_CREATE_CHANNEL_FAILED; } return DH_SUCCESS; @@ -135,7 +135,7 @@ int32_t AVTransReceiverAdapter::WaitForChannelCreated() int32_t AVTransReceiverAdapter::OnReceiverEvent(const AVTransEvent &event) { - DHLOGI("On receive event, type: %d", event.type); + DHLOGI("On receive event, type: %{public}d", event.type); switch (event.type) { case EventType::EVENT_CHANNEL_OPEN_FAIL: case EventType::EVENT_CHANNEL_OPENED: { diff --git a/services/audiotransport/receiverengine/src/av_receiver_engine_transport.cpp b/services/audiotransport/receiverengine/src/av_receiver_engine_transport.cpp index 5f0de401..6849ae29 100644 --- a/services/audiotransport/receiverengine/src/av_receiver_engine_transport.cpp +++ b/services/audiotransport/receiverengine/src/av_receiver_engine_transport.cpp @@ -105,7 +105,7 @@ int32_t AVTransReceiverTransport::FeedAudioData(std::shared_ptr &audi int32_t AVTransReceiverTransport::SendMessage(uint32_t type, std::string content, std::string dstDevId) { - DHLOGI("Send message to remote. type: %u, content: %s.", type, content.c_str()); + DHLOGI("Send message to remote. type: %{public}u, content: %{public}s.", type, content.c_str()); CHECK_NULL_RETURN(receiverAdapter_, ERR_DH_AUDIO_NULLPTR); auto message = std::make_shared(type, content, dstDevId); return receiverAdapter_->SendMessageToRemote(message); @@ -132,7 +132,7 @@ void AVTransReceiverTransport::OnEngineDataAvailable(const std::shared_ptr audioData = std::make_shared(bufferData->GetSize()); int32_t ret = memcpy_s(audioData->Data(), audioData->Capacity(), bufferData->GetAddress(), bufferData->GetSize()); if (ret != EOK) { - DHLOGE("Copy audio data failed, error code %d.", ret); + DHLOGE("Copy audio data failed, error code %{public}d.", ret); return; } CHECK_NULL_VOID(transCallback_); diff --git a/services/audiotransport/senderengine/src/av_sender_engine_adapter.cpp b/services/audiotransport/senderengine/src/av_sender_engine_adapter.cpp index c9228661..dbfe12c7 100644 --- a/services/audiotransport/senderengine/src/av_sender_engine_adapter.cpp +++ b/services/audiotransport/senderengine/src/av_sender_engine_adapter.cpp @@ -75,7 +75,7 @@ int32_t AVTransSenderAdapter::Stop() int32_t AVTransSenderAdapter::CreateControlChannel(const std::string &peerDevId) { - DHLOGI("Create control channel,peerDevId:%s", GetAnonyString(peerDevId).c_str()); + DHLOGI("Create control channel,peerDevId:%{public}s", GetAnonyString(peerDevId).c_str()); if (chnCreateSuccess_.load()) { DHLOGI("Channel already created."); return DH_SUCCESS; @@ -86,12 +86,12 @@ int32_t AVTransSenderAdapter::CreateControlChannel(const std::string &peerDevId) int32_t ret = senderEngine_->CreateControlChannel(dstDevIds, ChannelAttribute{TransStrategy::LOW_LATANCY_STRATEGY}); if (ret != DH_SUCCESS) { - DHLOGI("Create control channel failed, ret: %d", ret); + DHLOGI("Create control channel failed, ret: %{public}d", ret); return ERR_DH_AV_TRANS_CREATE_CHANNEL_FAILED; } ret = WaitForChannelCreated(); if (ret != DH_SUCCESS) { - DHLOGE("Wait for create av transport sender channel failed ret: %d", ret); + DHLOGE("Wait for create av transport sender channel failed ret: %{public}d", ret); return ERR_DH_AV_TRANS_CREATE_CHANNEL_FAILED; } return DH_SUCCESS; @@ -148,7 +148,7 @@ int32_t AVTransSenderAdapter::WaitForChannelCreated() int32_t AVTransSenderAdapter::OnSenderEvent(const AVTransEvent &event) { - DHLOGI("On sender event, type: %d", event.type); + DHLOGI("On sender event, type: %{public}d", event.type); switch (event.type) { case EventType::EVENT_CHANNEL_OPEN_FAIL: case EventType::EVENT_CHANNEL_OPENED: { diff --git a/services/audiotransport/senderengine/src/av_sender_engine_transport.cpp b/services/audiotransport/senderengine/src/av_sender_engine_transport.cpp index 8493465a..0875d800 100644 --- a/services/audiotransport/senderengine/src/av_sender_engine_transport.cpp +++ b/services/audiotransport/senderengine/src/av_sender_engine_transport.cpp @@ -104,7 +104,7 @@ int32_t AVTransSenderTransport::FeedAudioData(std::shared_ptr &audioD int32_t AVTransSenderTransport::SendMessage(uint32_t type, std::string content, std::string dstDevId) { - DHLOGI("Send message, msg type: %u, msg content: %s.", type, content.c_str()); + DHLOGI("Send message, msg type: %{public}u, msg content: %{public}s.", type, content.c_str()); CHECK_NULL_RETURN(senderAdapter_, ERR_DH_AUDIO_NULLPTR); auto message = std::make_shared(type, content, dstDevId); return senderAdapter_->SendMessageToRemote(message); diff --git a/services/hdfaudioclient/include/daudio_attribute_internal.h b/services/hdfaudioclient/include/daudio_attribute_internal.h index 17532a38..6463f97a 100644 --- a/services/hdfaudioclient/include/daudio_attribute_internal.h +++ b/services/hdfaudioclient/include/daudio_attribute_internal.h @@ -88,7 +88,7 @@ int32_t AudioAttributeInternal::SetSampleAttributes(AudioHandle handle, .sampleRate = attrs->sampleRate, .channelCount = attrs->channelCount, }; - DHLOGD("AttrsHal.format = %u", attrsHal.format); + DHLOGD("AttrsHal.format = %{public}u", attrsHal.format); return (context == nullptr || context->proxy_ == nullptr) ? ERR_DH_AUDIO_HDI_INVALID_PARAM : context->proxy_->SetSampleAttributes(attrsHal); } diff --git a/services/hdfaudioclient/src/daudio_adapter_internal.cpp b/services/hdfaudioclient/src/daudio_adapter_internal.cpp index 9ad676ba..a014fa13 100644 --- a/services/hdfaudioclient/src/daudio_adapter_internal.cpp +++ b/services/hdfaudioclient/src/daudio_adapter_internal.cpp @@ -88,7 +88,7 @@ static int32_t CreateRenderInternal(struct AudioAdapter *adapter, const struct : *render = &renderContext->instance_; renderContext->proxy_ = renderProxy; renderContext->descHal_ = descHal; - DHLOGI("The render ID: %u.", renderId); + DHLOGI("The render ID: %{public}u.", renderId); { std::lock_guard lock(context->mtx_); context->renders_.push_back(std::make_pair(renderId, std::move(renderContext))); @@ -149,7 +149,7 @@ static int32_t CreateCaptureInternal(struct AudioAdapter *adapter, const struct *capture = &captureContext->instance_; captureContext->proxy_ = captureProxy; captureContext->descHal_ = descHal; - DHLOGI("The capture ID: %u.", captureId); + DHLOGI("The capture ID: %{public}u.", captureId); { std::lock_guard lock(context->mtx_); context->captures_.push_back(std::make_pair(captureId, std::move(captureContext))); @@ -200,11 +200,11 @@ static int32_t GetPassthroughModeInternal(struct AudioAdapter *adapter, const st static int32_t InitAudioPortCapability(std::unique_ptr<::AudioPortCapability> &capInternal, AudioPortCapability &capabilityHal) { - DHLOGI("Init audio port capability internal, formatNum: %" PRIu32, capabilityHal.formatNum); + DHLOGI("Init audio port capability internal, formatNum: %{public}" PRIu32, capabilityHal.formatNum); constexpr uint32_t maxFormatNum = 100; constexpr uint32_t minFormatNum = 1; if (capabilityHal.formatNum < minFormatNum || capabilityHal.formatNum > maxFormatNum) { - DHLOGE("Init audio port capability, formatNum: %" PRIu32, capabilityHal.formatNum); + DHLOGE("Init audio port capability, formatNum: %{public}" PRIu32, capabilityHal.formatNum); return ERR_DH_AUDIO_HDI_INVALID_PARAM; } ::AudioFormat *audioFormats = (::AudioFormat *)malloc(capabilityHal.formatNum * sizeof(::AudioFormat)); @@ -300,8 +300,8 @@ static void ConvertAudioRouteNodeToHAL(const ::AudioRouteNode &node, AudioRouteN halNode.portId = node.portId; halNode.role = static_cast(node.role); halNode.type = static_cast(node.type); - DHLOGD("Convert audio route node To HAL, portId: %d role: %d type: %d.", halNode.portId, halNode.role, - halNode.type); + DHLOGD("Convert audio route node To HAL, portId: %{public}d role: %{public}d type: %{public}d.", + halNode.portId, halNode.role, halNode.type); switch (node.type) { case AUDIO_PORT_UNASSIGNED_TYPE: @@ -321,13 +321,14 @@ static void ConvertAudioRouteNodeToHAL(const ::AudioRouteNode &node, AudioRouteN halNode.ext.mix.moduleId = node.ext.mix.moduleId; halNode.ext.mix.streamId = node.ext.mix.streamId; - DHLOGD("Convert audio route node To HAL, [Mix] moduleId: %d streamId: %d.", + DHLOGD("Convert audio route node To HAL, [Mix] moduleId: %{public}d streamId: %{public}d.", halNode.ext.mix.moduleId, halNode.ext.mix.streamId); break; } case AUDIO_PORT_SESSION_TYPE: { halNode.ext.session.sessionType = static_cast(node.ext.session.sessionType); - DHLOGD("Convert audio route node To HAL, [Session] sessionType: %d.", halNode.ext.session.sessionType); + DHLOGD("Convert audio route node To HAL, [Session] sessionType: %{public}d.", + halNode.ext.session.sessionType); break; } default : @@ -392,7 +393,7 @@ static int32_t GetExtraParamsInternal(struct AudioAdapter *adapter, enum ::Audio } ret = strcpy_s(value, length, valueHal.c_str()); if (ret != EOK) { - DHLOGE("Strcpy_s failed!, ret: %d", ret); + DHLOGE("Strcpy_s failed!, ret: %{public}d", ret); return ERR_DH_AUDIO_HDI_CALL_FAILED; } return DH_SUCCESS; diff --git a/services/hdfaudioclient/src/daudio_capture_internal.cpp b/services/hdfaudioclient/src/daudio_capture_internal.cpp index 8091c438..c478f6d1 100644 --- a/services/hdfaudioclient/src/daudio_capture_internal.cpp +++ b/services/hdfaudioclient/src/daudio_capture_internal.cpp @@ -71,7 +71,7 @@ static int32_t CaptureFrameInternal(struct AudioCapture *capture, void *frame, u ret = memcpy_s(uframe, requestBytes, frameHal.data(), requestBytes); if (ret != EOK) { - DHLOGE("Copy capture frame failed, error code %d.", ret); + DHLOGE("Copy capture frame failed, error code %{public}d.", ret); return ERR_DH_AUDIO_HDI_CALL_FAILED; } *replyBytes = requestBytes; diff --git a/services/hdfaudioclient/src/daudio_render_internal.cpp b/services/hdfaudioclient/src/daudio_render_internal.cpp index f1839a0b..c0dfc25e 100644 --- a/services/hdfaudioclient/src/daudio_render_internal.cpp +++ b/services/hdfaudioclient/src/daudio_render_internal.cpp @@ -53,7 +53,7 @@ static int32_t RenderFrameInternal(struct AudioRender *render, const void *frame std::vector frameHal(requestBytes); int32_t ret = memcpy_s(frameHal.data(), requestBytes, uframe, requestBytes); if (ret != EOK) { - DHLOGE("Copy render frame failed, error code %d.", ret); + DHLOGE("Copy render frame failed, error code %{public}d.", ret); return ERR_DH_AUDIO_HDI_CALL_FAILED; } return context->proxy_->RenderFrame(frameHal, *replyBytes); diff --git a/services/hdfaudioclient/src/distributed_audio_client.cpp b/services/hdfaudioclient/src/distributed_audio_client.cpp index e4df6a37..ef8efce8 100644 --- a/services/hdfaudioclient/src/distributed_audio_client.cpp +++ b/services/hdfaudioclient/src/distributed_audio_client.cpp @@ -81,13 +81,13 @@ static int32_t InitDescriptorPort(const AudioAdapterDescriptor &desc, ::AudioAda static int32_t InitAudioAdapterDescriptor(AudioManagerContext *context, std::vector &descriptors) { - DHLOGI("Init audio adapters descriptor, size is: %zu.", descriptors.size()); + DHLOGI("Init audio adapters descriptor, size is: %{public}zu.", descriptors.size()); constexpr uint32_t maxAdapterNameLen = 1000; constexpr uint32_t maxPortNum = 100; constexpr uint32_t minPortNum = 1; for (auto desc : descriptors) { if (desc.ports.size() < minPortNum || desc.ports.size() > maxPortNum) { - DHLOGE("The descriptor ports size: %zu.", desc.ports.size()); + DHLOGE("The descriptor ports size: %{public}zu.", desc.ports.size()); continue; } if (desc.adapterName.length() >= maxAdapterNameLen) { diff --git a/services/test_example/distributedaudiotest.cpp b/services/test_example/distributedaudiotest.cpp index fc67c3b9..91fde3a8 100644 --- a/services/test_example/distributedaudiotest.cpp +++ b/services/test_example/distributedaudiotest.cpp @@ -265,7 +265,7 @@ static void Play() std::vector frameHal(RENDER_FRAME_SIZE); int32_t ret = memcpy_s(frameHal.data(), RENDER_FRAME_SIZE, renderData[g_frameIndex], RENDER_FRAME_SIZE); if (ret != EOK) { - DHLOGE("Copy render frame failed, error code %d.", ret); + DHLOGE("Copy render frame failed, error code %{public}d.", ret); return; } ret = g_render->RenderFrame(frameHal, size); -- Gitee