From 739b7f6b8760a3f4b0d01f76b871886f86f53872 Mon Sep 17 00:00:00 2001
From: darkshadow <chenyan218@huawei.com>
Date: Mon, 8 Sep 2025 11:28:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95=E7=BA=BF?=
 =?UTF-8?q?=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: darkshadow <chenyan218@huawei.com>
---
 .../include/sink/direct_audio_render_sink.h          |  2 ++
 .../hdiadapter_new/sink/direct_audio_render_sink.cpp | 12 ++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/frameworks/native/hdiadapter_new/include/sink/direct_audio_render_sink.h b/frameworks/native/hdiadapter_new/include/sink/direct_audio_render_sink.h
index 89e6843bd0..721e914e47 100644
--- a/frameworks/native/hdiadapter_new/include/sink/direct_audio_render_sink.h
+++ b/frameworks/native/hdiadapter_new/include/sink/direct_audio_render_sink.h
@@ -19,6 +19,7 @@
 #include "sink/i_audio_render_sink.h"
 #include <iostream>
 #include <cstring>
+#include <thread>
 #include "v5_0/iaudio_manager.h"
 #include "audio_utils.h"
 #include "util/audio_running_lock.h"
@@ -125,6 +126,7 @@ private:
     FILE *dumpFile_ = nullptr;
     std::string dumpFileName_ = "";
     std::mutex sinkMutex_;
+    std::thread testThread_;
 };
 
 } // namespace AudioStandard
diff --git a/frameworks/native/hdiadapter_new/sink/direct_audio_render_sink.cpp b/frameworks/native/hdiadapter_new/sink/direct_audio_render_sink.cpp
index ddbbdd3dcb..11f0671d99 100644
--- a/frameworks/native/hdiadapter_new/sink/direct_audio_render_sink.cpp
+++ b/frameworks/native/hdiadapter_new/sink/direct_audio_render_sink.cpp
@@ -33,6 +33,14 @@ namespace OHOS {
 namespace AudioStandard {
 DirectAudioRenderSink::~DirectAudioRenderSink()
 {
+    std::unique_lock<std::mutex> lock(sinkMutex_);
+    if (started_) {
+        started_ = false;
+    }
+    lock.unlock();
+    if (testThread_.joinable()) {
+        testThread_.join();
+    }
 }
  
 int32_t DirectAudioRenderSink::Init(const IAudioSinkAttr &attr)
@@ -100,7 +108,7 @@ int32_t DirectAudioRenderSink::Start(void)
 
 void DirectAudioRenderSink::StartTestThread(void)
 {
-    std::thread([this]() {
+    testThread_ = std::thread([this]() {
         bool keepRunning = true;
         while (keepRunning) {
             std::unique_lock<std::mutex> lock(sinkMutex_);
@@ -109,7 +117,7 @@ void DirectAudioRenderSink::StartTestThread(void)
             lock.unlock();
             std::this_thread::sleep_for(std::chrono::milliseconds(TEST_CALLBACK_TIME));
         }
-    }).detach();
+    });
 }
  
 int32_t DirectAudioRenderSink::Stop(void)
-- 
Gitee