From f2f7edc13c600fd11999208c9b5af99afa44619c Mon Sep 17 00:00:00 2001
From: liuyuehua1 <liuyuehua1@huawei.com>
Date: Thu, 18 Aug 2022 08:40:40 +0800
Subject: [PATCH] Adjust audio stop status code.

Signed-off-by: liuyuehua1 <liuyuehua1@huawei.com>
---
 .../src/adapter/audiocapturer_adapter.cpp     | 20 +++++++++++--------
 .../src/adapter/audioplayer_adapter.cpp       | 17 ++++++++++------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/frameworks/native/opensles/src/adapter/audiocapturer_adapter.cpp b/frameworks/native/opensles/src/adapter/audiocapturer_adapter.cpp
index ae6b890383..c8bf9e5e4a 100644
--- a/frameworks/native/opensles/src/adapter/audiocapturer_adapter.cpp
+++ b/frameworks/native/opensles/src/adapter/audiocapturer_adapter.cpp
@@ -74,25 +74,29 @@ SLresult AudioCapturerAdapter::SetCaptureStateAdapter(SLuint32 id, SLuint32 stat
     AUDIO_INFO_LOG("AudioCapturerAdapter::SetCaptureStateAdapter state: %{public}lu.", state);
     AudioCapturer *audioCapturer = GetAudioCapturerById(id);
     SLresult slResult = SL_RESULT_SUCCESS;
-    bool reseult = false;
+    bool result = false;
+    bool rtStop = false;
+    bool rtRelease = false;
+    int32_t rtClear = -1;
     switch (state) {
         case SL_RECORDSTATE_RECORDING:
-            reseult = audioCapturer->Start();
+            result = audioCapturer->Start();
             break;
         case SL_RECORDSTATE_PAUSED:
-            reseult = audioCapturer->Pause();
+            result = audioCapturer->Pause();
             break;
         case SL_RECORDSTATE_STOPPED: {
-            reseult = audioCapturer->Clear();
-            reseult = reseult && audioCapturer->Stop();
-            reseult = reseult && audioCapturer->Release();
+            rtStop = audioCapturer->Stop();
+            rtClear = audioCapturer->Clear();
+            rtRelease = audioCapturer->Release();
+            result = rtStop && !rtClear && rtRelease;
             break;
         }
         default:
-            AUDIO_ERR_LOG("AudioPlayerAdapter::play state not supported ");
+            AUDIO_ERR_LOG("AudioPlayerAdapter::play state not supported.");
             break;
     }
-    slResult = reseult ? SL_RESULT_SUCCESS : SL_RESULT_RESOURCE_ERROR;
+    slResult = result ? SL_RESULT_SUCCESS : SL_RESULT_RESOURCE_ERROR;
     return slResult;
 }
 
diff --git a/frameworks/native/opensles/src/adapter/audioplayer_adapter.cpp b/frameworks/native/opensles/src/adapter/audioplayer_adapter.cpp
index 73f07de714..fb3beea028 100644
--- a/frameworks/native/opensles/src/adapter/audioplayer_adapter.cpp
+++ b/frameworks/native/opensles/src/adapter/audioplayer_adapter.cpp
@@ -73,24 +73,29 @@ SLresult AudioPlayerAdapter::SetPlayStateAdapter(SLuint32 id, SLuint32 state)
 {
     AudioRenderer* pRender = GetAudioRenderById(id);
     SLresult slResult = SL_RESULT_SUCCESS;
-    bool reseult = false;
+    bool result = false;
+    bool rtStop = false;
+    bool rtRelease = false;
+    int32_t rtClear = -1;
     switch (state) {
         case SL_PLAYSTATE_PLAYING:
-            reseult = pRender->Start();
+            result = pRender->Start();
             break;
         case SL_PLAYSTATE_PAUSED:
-            reseult = pRender->Pause();
+            result = pRender->Pause();
             break;
         case SL_PLAYSTATE_STOPPED: {
-            reseult = pRender->Clear();
-            reseult = reseult && pRender->Stop();
-            reseult = reseult && pRender->Release();
+            rtStop = pRender->Stop();
+            rtClear = pRender->Clear();
+            rtRelease = pRender->Release();
+            result = rtStop && !rtClear && rtRelease;
             break;
         }
         default:
             AUDIO_ERR_LOG("AudioPlayerAdapter::play state not supported ");
             break;
     }
+    slResult = result ? SL_RESULT_SUCCESS : SL_RESULT_RESOURCE_ERROR;
     return slResult;
 }
 
-- 
Gitee