diff --git a/hdf_service/distributed_audio/hdi_service/audio/v1_0/BUILD.gn b/hdf_service/distributed_audio/hdi_service/audio/v1_0/BUILD.gn index a387c5fb3b902a66d1553d954c2b10b03b6db9e2..7fdbfe6fe44a5a094dc3142041189d745a609a87 100644 --- a/hdf_service/distributed_audio/hdi_service/audio/v1_0/BUILD.gn +++ b/hdf_service/distributed_audio/hdi_service/audio/v1_0/BUILD.gn @@ -63,6 +63,13 @@ ohos_shared_library("libaudio_manager_daudio_primary_service_1.0") { "LOG_DOMAIN=0xD004100", ] + if (build_variant == "root") { + defines += [ + "DUMP_CAPTURE_FILE", + "DUMP_RENDER_FILE", + ] + } + install_images = [ chipset_base_dir ] subsystem_name = "distributedhardware" part_name = "drivers_peripheral_distributed_audio" diff --git a/hdf_service/distributed_audio/hdi_service/audio/v1_0/src/audio_capture_interface_impl.cpp b/hdf_service/distributed_audio/hdi_service/audio/v1_0/src/audio_capture_interface_impl.cpp index a3722366ce4219e815fad2f1b957e01d0dd877ff..603208fb65874f7076c130396a0668437aceef3e 100644 --- a/hdf_service/distributed_audio/hdi_service/audio/v1_0/src/audio_capture_interface_impl.cpp +++ b/hdf_service/distributed_audio/hdi_service/audio/v1_0/src/audio_capture_interface_impl.cpp @@ -84,9 +84,11 @@ int32_t AudioCaptureInterfaceImpl::CaptureFrame(std::vector &frame, uint DHLOGE("Read stream data failed."); return HDF_FAILURE; } +#ifdef DUMP_CAPTURE_FILE if (dumpFlag_) { SaveFile(FILE_NAME, reinterpret_cast(audioData.data.data()), audioData.data.size()); } +#endif frame.resize(devAttrs_.frameSize); ret = memcpy_s(frame.data(), frame.size(), audioData.data.data(), audioData.data.size()); if (ret != EOK) { diff --git a/hdf_service/distributed_audio/hdi_service/audio/v1_0/src/audio_render_interface_impl.cpp b/hdf_service/distributed_audio/hdi_service/audio/v1_0/src/audio_render_interface_impl.cpp index 7b1b9f9f0db7a5896ad1f06fba4a75246b866373..cb4c219f21bf280dfb1a9e8a1763af760ad4c0ac 100644 --- a/hdf_service/distributed_audio/hdi_service/audio/v1_0/src/audio_render_interface_impl.cpp +++ b/hdf_service/distributed_audio/hdi_service/audio/v1_0/src/audio_render_interface_impl.cpp @@ -101,9 +101,11 @@ int32_t AudioRenderInterfaceImpl::RenderFrame(const std::vector &frame, AudioParameter param = { devAttrs_.format, devAttrs_.channelCount, devAttrs_.sampleRate, 0, devAttrs_.frameSize}; AudioData data = { param, frame }; +#ifdef DUMP_RENDER_FILE if (dumpFlag_) { SaveFile(FILE_NAME, reinterpret_cast(data.data.data()), frame.size()); } +#endif FadeInProcess(DURATION_FRAMES, data.data.data(), frame.size()); if (audioExtCallback_ == nullptr) { DHLOGE("Callback is nullptr."); diff --git a/services/audioclient/micclient/src/dmic_client.cpp b/services/audioclient/micclient/src/dmic_client.cpp index 5932838ed976f75a6150f40c5ffc805c687c2f1a..99d89382854ccae115b04067b9bbade19d94f627 100644 --- a/services/audioclient/micclient/src/dmic_client.cpp +++ b/services/audioclient/micclient/src/dmic_client.cpp @@ -509,9 +509,11 @@ void DMicClient::AudioFwkCaptureData() DHLOGE("Bytes read failed."); return; } +#ifdef DUMP_DMICCLIENT_FILE if (DaudioSinkHidumper::GetInstance().GetFlagStatus()) { SaveFile(FILE_NAME, const_cast(audioData->Data()), audioData->Size()); } +#endif int64_t startTransTime = GetNowTimeUs(); int32_t ret = micTrans_->FeedAudioData(audioData); if (ret != DH_SUCCESS) { diff --git a/services/audioclient/spkclient/src/dspeaker_client.cpp b/services/audioclient/spkclient/src/dspeaker_client.cpp index fb20060818083007f50bfa036a0bef53fad7be28..ee90de6af78675a430b8ee8f552206cce2f17911 100644 --- a/services/audioclient/spkclient/src/dspeaker_client.cpp +++ b/services/audioclient/spkclient/src/dspeaker_client.cpp @@ -291,9 +291,11 @@ void DSpeakerClient::PlayThreadRunning() dataQueue_.pop(); DHLOGD("Pop spk data, dataqueue size: %d.", dataQueue_.size()); } +#ifdef DUMP_DSPEAKERCLIENT_FILE if (DaudioSinkHidumper::GetInstance().GetFlagStatus()) { SaveFile(FILE_NAME, const_cast(audioData->Data()), audioData->Size()); } +#endif int32_t writeOffSet = 0; while (writeOffSet < static_cast(audioData->Capacity())) { int32_t writeLen = audioRenderer_->Write(audioData->Data() + writeOffSet, diff --git a/services/audiomanager/managersource/src/dmic_dev.cpp b/services/audiomanager/managersource/src/dmic_dev.cpp index 2cf8d093d1c7f3a399d72479bdae0df97e6f66ad..e2f15d0c667ebec82da32d6549a16ecd9396b40f 100644 --- a/services/audiomanager/managersource/src/dmic_dev.cpp +++ b/services/audiomanager/managersource/src/dmic_dev.cpp @@ -343,6 +343,7 @@ int32_t DMicDev::ReadStreamData(const std::string &devId, const int32_t dhId, st data = dataQueue_.front(); dataQueue_.pop(); } +#ifdef DUMP_DMICDEV_FILE if (DaudioHidumper::GetInstance().GetFlagStatus()) { if (!dumpFlag_) { AudioEvent event(NOTIFY_HDF_MIC_DUMP, ""); @@ -351,6 +352,7 @@ int32_t DMicDev::ReadStreamData(const std::string &devId, const int32_t dhId, st } SaveFile(FILE_NAME, const_cast(data->Data()), data->Size()); } +#endif int64_t endTime = GetNowTimeUs(); if (IsOutDurationRange(startTime, endTime, lastReadStartTime_)) { DHLOGE("This time read data spend: %lld, The interval of read data this time and the last time: %lld", diff --git a/services/audiomanager/managersource/src/dspeaker_dev.cpp b/services/audiomanager/managersource/src/dspeaker_dev.cpp index 4b7091b94c98c42ed0b04989fa0770884b7e59e6..bc4bda0545820db00f0fefe742397d39a15b5a1e 100644 --- a/services/audiomanager/managersource/src/dspeaker_dev.cpp +++ b/services/audiomanager/managersource/src/dspeaker_dev.cpp @@ -346,6 +346,7 @@ int32_t DSpeakerDev::WriteStreamData(const std::string &devId, const int32_t dhI DHLOGE("Write stream data, speaker trans is null."); return ERR_DH_AUDIO_SA_SPEAKER_TRANS_NULL; } +#ifdef DUMP_DSPEAKERDEV_FILE if (DaudioHidumper::GetInstance().GetFlagStatus()) { if (!dumpFlag_) { AudioEvent event(NOTIFY_HDF_SPK_DUMP, ""); @@ -354,6 +355,7 @@ int32_t DSpeakerDev::WriteStreamData(const std::string &devId, const int32_t dhI } SaveFile(FILE_NAME, const_cast(data->Data()), data->Size()); } +#endif int32_t ret = speakerTrans_->FeedAudioData(data); if (ret != DH_SUCCESS) { DHLOGE("Write stream data failed, ret: %d.", ret); diff --git a/services/audiomanager/servicesink/BUILD.gn b/services/audiomanager/servicesink/BUILD.gn index 37fb9543844403cb7a329b30a6bddae011519d79..d7ce250dbab1569d8895ea1855eac41ff78e0b17 100755 --- a/services/audiomanager/servicesink/BUILD.gn +++ b/services/audiomanager/servicesink/BUILD.gn @@ -118,6 +118,13 @@ ohos_shared_library("distributed_audio_sink") { "LOG_DOMAIN=0xD004100", ] + if (build_variant == "root") { + defines += [ + "DUMP_DMICCLIENT_FILE", + "DUMP_DSPEAKERCLIENT_FILE", + ] + } + subsystem_name = "distributedhardware" part_name = "distributed_audio" diff --git a/services/audiomanager/servicesource/BUILD.gn b/services/audiomanager/servicesource/BUILD.gn index b5ad8d023371ac7b462a03b067990a4399866a16..d0a6f69d8406534223f25926e389452270fab35e 100755 --- a/services/audiomanager/servicesource/BUILD.gn +++ b/services/audiomanager/servicesource/BUILD.gn @@ -112,6 +112,13 @@ ohos_shared_library("distributed_audio_source") { "LOG_DOMAIN=0xD004100", ] + if (build_variant == "root") { + defines += [ + "DUMP_DSPEAKERDEV_FILE", + "DUMP_DMICDEV_FILE", + ] + } + subsystem_name = "distributedhardware" part_name = "distributed_audio"