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 58c7ec7fc760e8d8e4f555c52f274b18efcd4d1b..9da4737115035e92ab95bb0ef7f30861801a5208 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; diff --git a/frameworks/native/audiodefinitions/src/audio_pipe_info.cpp b/frameworks/native/audiodefinitions/src/audio_pipe_info.cpp index fcdea6467c0ced50899e555c24906e26a777a2a4..daa70cb1b0dd87ec63e3fb8a196b4c36ca6fd3ba 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 = ""; 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 b20bd09a1c619fb33ed3aa934a50655374a879bc..5c520cfac2ea18f0ffa7b9f33f5c39e0811d7731 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; } diff --git a/services/audio_service/client/src/renderer_in_client.cpp b/services/audio_service/client/src/renderer_in_client.cpp index 64dc928ff8b90a02afda567a02fae5d0342652f9..759b49c10c9e267755335e12784db287e8714d36 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); } diff --git a/services/audio_service/common/src/audio_dump_pcm.cpp b/services/audio_service/common/src/audio_dump_pcm.cpp index 04ae40982196abc5e4e9b62be44ac6409285df9b..4726513eeb55f8f1eb1e118cbe5ddb7723ff792a 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); }