From 9fd41b0ea8443375fb15e601fa8ca4987e8d0dc8 Mon Sep 17 00:00:00 2001 From: CodeRepository1 <16179862+coderepository1@user.noreply.gitee.com> Date: Tue, 2 Sep 2025 01:39:07 +0000 Subject: [PATCH 1/7] update frameworks/native/audiodefinitions/src/audio_pipe_info.cpp. synchronize yellow code. Signed-off-by: CodeRepository1 <16179862+coderepository1@user.noreply.gitee.com> --- frameworks/native/audiodefinitions/src/audio_pipe_info.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/native/audiodefinitions/src/audio_pipe_info.cpp b/frameworks/native/audiodefinitions/src/audio_pipe_info.cpp index fcdea6467c..b23722e0ad 100644 --- a/frameworks/native/audiodefinitions/src/audio_pipe_info.cpp +++ b/frameworks/native/audiodefinitions/src/audio_pipe_info.cpp @@ -123,7 +123,7 @@ std::string AudioPipeInfo::ToString() { std::string out = ""; AppendFormat(out, "id %u, adapter %s, name %s", - id_, adapterName_.c_str(), name_.c_str()); + id_, adapterName_.c_str(), name_.c_str());//update return out; } -- Gitee From cf162d83076e313dd88b069e6ab3928c54742f77 Mon Sep 17 00:00:00 2001 From: CodeRepository1 <16179862+coderepository1@user.noreply.gitee.com> Date: Wed, 3 Sep 2025 08:33:17 +0000 Subject: [PATCH 2/7] warning_process Signed-off-by: CodeRepository1 <16179862+coderepository1@user.noreply.gitee.com> --- services/audio_service/client/src/renderer_in_client.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/audio_service/client/src/renderer_in_client.cpp b/services/audio_service/client/src/renderer_in_client.cpp index 64dc928ff8..759b49c10c 100644 --- a/services/audio_service/client/src/renderer_in_client.cpp +++ b/services/audio_service/client/src/renderer_in_client.cpp @@ -556,7 +556,7 @@ int32_t RendererInClientInner::WriteInner(uint8_t *pcmBuffer, size_t pcmBufferSi converter_->Process(bufDesc); uint8_t *buffer; - uint32_t bufferSize; + uint32_t bufferSize = 0; converter_->GetOutputBufferStream(buffer, bufferSize); return WriteInner(buffer, bufferSize); } -- Gitee From 33a727b686b31acbbb0a8681dbaa7413d34fce54 Mon Sep 17 00:00:00 2001 From: CodeRepository1 <16179862+coderepository1@user.noreply.gitee.com> Date: Wed, 3 Sep 2025 08:45:32 +0000 Subject: [PATCH 3/7] warning_process Signed-off-by: CodeRepository1 <16179862+coderepository1@user.noreply.gitee.com> --- frameworks/native/audiodefinitions/src/audio_pipe_info.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/native/audiodefinitions/src/audio_pipe_info.cpp b/frameworks/native/audiodefinitions/src/audio_pipe_info.cpp index b23722e0ad..fcdea6467c 100644 --- a/frameworks/native/audiodefinitions/src/audio_pipe_info.cpp +++ b/frameworks/native/audiodefinitions/src/audio_pipe_info.cpp @@ -123,7 +123,7 @@ std::string AudioPipeInfo::ToString() { std::string out = ""; AppendFormat(out, "id %u, adapter %s, name %s", - id_, adapterName_.c_str(), name_.c_str());//update + id_, adapterName_.c_str(), name_.c_str()); return out; } -- Gitee From 8d3d8c6e560672c79dd4e0172aa7cbf754897347 Mon Sep 17 00:00:00 2001 From: CodeRepository1 <16179862+coderepository1@user.noreply.gitee.com> Date: Wed, 3 Sep 2025 08:48:14 +0000 Subject: [PATCH 4/7] waring_process Signed-off-by: CodeRepository1 <16179862+coderepository1@user.noreply.gitee.com> --- frameworks/native/audiodefinitions/src/audio_pipe_info.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/native/audiodefinitions/src/audio_pipe_info.cpp b/frameworks/native/audiodefinitions/src/audio_pipe_info.cpp index fcdea6467c..daa70cb1b0 100644 --- a/frameworks/native/audiodefinitions/src/audio_pipe_info.cpp +++ b/frameworks/native/audiodefinitions/src/audio_pipe_info.cpp @@ -118,7 +118,7 @@ void AudioPipeInfo::DumpInputAttrs(std::string &dumpString) { AppendFormat(dumpString, " - SourceType: %s\n", moduleInfo_.sourceType.c_str()); } - +//update std::string AudioPipeInfo::ToString() { std::string out = ""; -- Gitee From e6c07062a0aa7a5aafd596ae4a1cfabb817fbbe1 Mon Sep 17 00:00:00 2001 From: CodeRepository1 <16179862+coderepository1@user.noreply.gitee.com> Date: Wed, 3 Sep 2025 08:52:47 +0000 Subject: [PATCH 5/7] initialize temp Signed-off-by: CodeRepository1 <16179862+coderepository1@user.noreply.gitee.com> --- services/audio_service/common/src/audio_dump_pcm.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/audio_service/common/src/audio_dump_pcm.cpp b/services/audio_service/common/src/audio_dump_pcm.cpp index 04ae409821..4726513eeb 100644 --- a/services/audio_service/common/src/audio_dump_pcm.cpp +++ b/services/audio_service/common/src/audio_dump_pcm.cpp @@ -308,7 +308,7 @@ void AudioCacheMgrInner::GetCachedDuration(int64_t &startTime, int64_t &endTime) return; } - int64_t temp; + int64_t temp = 0; if (memChunkDeque_.front() != nullptr) { memChunkDeque_.front()->GetMemChunkDuration(startTime, temp); } -- Gitee From 935a466c47177df184c786374faaf5c9dffb9a2c Mon Sep 17 00:00:00 2001 From: CodeRepository1 <16179862+coderepository1@user.noreply.gitee.com> Date: Wed, 3 Sep 2025 08:56:08 +0000 Subject: [PATCH 6/7] =?UTF-8?q?inBuffer=E4=B8=BA=E6=97=A0=E7=AC=A6?= =?UTF-8?q?=E5=8F=B7=E6=95=B0=EF=BC=8C=E4=B8=8D=E5=8F=AF=E8=83=BD=E4=B8=BA?= =?UTF-8?q?=E8=B4=9F=E6=95=B0=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E4=B8=BA0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: CodeRepository1 <16179862+coderepository1@user.noreply.gitee.com> --- .../pulseaudio/modules/capturer/module_inner_capturer_sink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/native/pulseaudio/modules/capturer/module_inner_capturer_sink.c b/frameworks/native/pulseaudio/modules/capturer/module_inner_capturer_sink.c index b20bd09a1c..5c520cfac2 100644 --- a/frameworks/native/pulseaudio/modules/capturer/module_inner_capturer_sink.c +++ b/frameworks/native/pulseaudio/modules/capturer/module_inner_capturer_sink.c @@ -187,7 +187,7 @@ static void ProcessRewind(struct userdata *u, pa_usec_t now) delay = u->timestamp - now; inBuffer = pa_usec_to_bytes(delay, &u->sink->sample_spec); - if (inBuffer <= 0) { + if (inBuffer = 0) { goto do_nothing; } -- Gitee From 0c66993519985d7b88a074e44088c88ce39b8c9e Mon Sep 17 00:00:00 2001 From: CodeRepository1 <16179862+coderepository1@user.noreply.gitee.com> Date: Wed, 3 Sep 2025 09:08:48 +0000 Subject: [PATCH 7/7] =?UTF-8?q?sinkIndexSessionIDMap=E4=B8=8D=E5=86=8D?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E4=BA=86,=E6=B8=85=E7=90=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: CodeRepository1 <16179862+coderepository1@user.noreply.gitee.com> --- .../audioadapter/include/pulse_audio_service_adapter_impl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/native/audioadapter/include/pulse_audio_service_adapter_impl.h b/frameworks/native/audioadapter/include/pulse_audio_service_adapter_impl.h index 58c7ec7fc7..9da4737115 100644 --- a/frameworks/native/audioadapter/include/pulse_audio_service_adapter_impl.h +++ b/frameworks/native/audioadapter/include/pulse_audio_service_adapter_impl.h @@ -92,7 +92,7 @@ private: static constexpr uint32_t PA_CONNECT_RETRY_SLEEP_IN_MICRO_SECONDS = 500000; pa_context *mContext = NULL; pa_threaded_mainloop *mMainLoop = NULL; - static SafeMap sinkIndexSessionIDMap; + //static SafeMap sinkIndexSessionIDMap; static SafeMap sourceIndexSessionIDMap; std::mutex lock_; bool isSetDefaultSink_ = false; -- Gitee