From 7eb637ecab03c4c1e71a2ab27c07cf599fe00aa0 Mon Sep 17 00:00:00 2001 From: FileStream Date: Fri, 17 May 2024 03:03:27 +0000 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DAcquireAudioBufferMix=20?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E9=80=BB=E8=BE=91=E9=97=AE=E9=A2=98=20https:?= =?UTF-8?q?//gitee.com/openharmony/multimedia=5Fplayer=5Fframework/issues/?= =?UTF-8?q?I9Q0KV?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: FileStream --- .../screen_capture/server/screen_capture_server.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/services/services/screen_capture/server/screen_capture_server.cpp b/services/services/screen_capture/server/screen_capture_server.cpp index 91a74e0bf..198fc3607 100644 --- a/services/services/screen_capture/server/screen_capture_server.cpp +++ b/services/services/screen_capture/server/screen_capture_server.cpp @@ -1638,7 +1638,11 @@ int32_t ScreenCaptureServer::AcquireAudioBufferMix(std::shared_ptr innerAudioCapture_ != nullptr) { retInner = innerAudioCapture_->AcquireAudioBuffer(innerAudioBuffer); retMic = micAudioCapture_->AcquireAudioBuffer(micAudioBuffer); - return retInner && retMic; + if (retInner == MSERR_OK && retMic == MSERR_OK) { + return MSERR_OK; + } else { + return MSERR_UNKNOWN; + } } if (type == AVScreenCaptureMixMode::MIC_MODE && micAudioCapture_ != nullptr) { return micAudioCapture_->AcquireAudioBuffer(micAudioBuffer); @@ -1683,7 +1687,11 @@ int32_t ScreenCaptureServer::ReleaseAudioBufferMix(AVScreenCaptureMixMode type) innerAudioCapture_ != nullptr) { retInner = innerAudioCapture_->ReleaseAudioBuffer(); retMic = micAudioCapture_->ReleaseAudioBuffer(); - return retInner && retMic; + if (retInner == MSERR_OK && retMic == MSERR_OK) { + return MSERR_OK; + } else { + return MSERR_UNKNOWN; + } } if (type == AVScreenCaptureMixMode::MIC_MODE && micAudioCapture_ != nullptr) { return micAudioCapture_->ReleaseAudioBuffer(); -- Gitee