From 96605ed4b97de42707f3140e89cd93d5b344d5da Mon Sep 17 00:00:00 2001 From: shentingguang Date: Thu, 9 May 2024 16:41:15 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: shentingguang --- frameworks/js/napi/audiocapturer/napi_audio_capturer.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frameworks/js/napi/audiocapturer/napi_audio_capturer.cpp b/frameworks/js/napi/audiocapturer/napi_audio_capturer.cpp index f29e4629e..6d843b490 100644 --- a/frameworks/js/napi/audiocapturer/napi_audio_capturer.cpp +++ b/frameworks/js/napi/audiocapturer/napi_audio_capturer.cpp @@ -1056,6 +1056,8 @@ void NapiAudioCapturer::RegisterCapturerReadDataCallback(napi_env env, napi_valu cb->AddCallbackReference(cbName, argv[PARAM1]); AUDIO_INFO_LOG("Register Callback is successful"); + AUDIO_INFO_LOG("Register Callback is successful"); + AUDIO_INFO_LOG("Register Callback is successful"); } napi_value NapiAudioCapturer::Off(napi_env env, napi_callback_info info) -- Gitee From eeb0cd2cd10babf8b57b63f8d56bd146f63f6c88 Mon Sep 17 00:00:00 2001 From: Chumouzhi Date: Thu, 9 May 2024 16:44:45 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=97=A5=E5=BF=971?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frameworks/js/napi/audiocapturer/napi_audio_capturer.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frameworks/js/napi/audiocapturer/napi_audio_capturer.cpp b/frameworks/js/napi/audiocapturer/napi_audio_capturer.cpp index 6d843b490..1d2d051e0 100644 --- a/frameworks/js/napi/audiocapturer/napi_audio_capturer.cpp +++ b/frameworks/js/napi/audiocapturer/napi_audio_capturer.cpp @@ -1058,6 +1058,9 @@ void NapiAudioCapturer::RegisterCapturerReadDataCallback(napi_env env, napi_valu AUDIO_INFO_LOG("Register Callback is successful"); AUDIO_INFO_LOG("Register Callback is successful"); AUDIO_INFO_LOG("Register Callback is successful"); + AUDIO_INFO_LOG("Register Callback is successful"); + AUDIO_INFO_LOG("Register Callback is successful"); + AUDIO_INFO_LOG("Register Callback is successful"); } napi_value NapiAudioCapturer::Off(napi_env env, napi_callback_info info) -- Gitee From 24ca364cbf73a378d6412c3a4fe2414e3129cd77 Mon Sep 17 00:00:00 2001 From: Chumouzhi Date: Fri, 10 May 2024 11:00:37 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=BC=96=E7=A8=8B=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Chumouzhi --- frameworks/js/napi/audiocapturer/napi_audio_capturer.cpp | 5 ----- frameworks/native/audiocapturer/src/audio_capturer.cpp | 3 ++- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/frameworks/js/napi/audiocapturer/napi_audio_capturer.cpp b/frameworks/js/napi/audiocapturer/napi_audio_capturer.cpp index 1d2d051e0..f29e4629e 100644 --- a/frameworks/js/napi/audiocapturer/napi_audio_capturer.cpp +++ b/frameworks/js/napi/audiocapturer/napi_audio_capturer.cpp @@ -1056,11 +1056,6 @@ void NapiAudioCapturer::RegisterCapturerReadDataCallback(napi_env env, napi_valu cb->AddCallbackReference(cbName, argv[PARAM1]); AUDIO_INFO_LOG("Register Callback is successful"); - AUDIO_INFO_LOG("Register Callback is successful"); - AUDIO_INFO_LOG("Register Callback is successful"); - AUDIO_INFO_LOG("Register Callback is successful"); - AUDIO_INFO_LOG("Register Callback is successful"); - AUDIO_INFO_LOG("Register Callback is successful"); } napi_value NapiAudioCapturer::Off(napi_env env, napi_callback_info info) diff --git a/frameworks/native/audiocapturer/src/audio_capturer.cpp b/frameworks/native/audiocapturer/src/audio_capturer.cpp index 0e79bf37d..cc3f375e0 100644 --- a/frameworks/native/audiocapturer/src/audio_capturer.cpp +++ b/frameworks/native/audiocapturer/src/audio_capturer.cpp @@ -1102,7 +1102,8 @@ void CapturerPolicyServiceDiedCallback::RestoreTheadLoop() uint32_t sleepTime = 500000; bool result = false; int32_t ret = -1; - while (!result && tryCounter-- > 0) { + while (!result && tryCounter > 0) { + tryCounter--; usleep(sleepTime); if (capturer_== nullptr || capturer_->audioStream_== nullptr || capturer_->abortRestore_) { -- Gitee