From 85b17d36dcc779d5760c41ebf62bdf2e066be3e2 Mon Sep 17 00:00:00 2001
From: bird_j <9307954+bird-j@user.noreply.gitee.com>
Date: Tue, 27 Jul 2021 07:28:49 +0000
Subject: [PATCH] =?UTF-8?q?1.=20d.ts=20=E5=8F=AA=E6=8F=90=E4=BE=9B?=
 =?UTF-8?q?=E9=9F=B3=E9=A2=91=E6=92=AD=E6=94=BE=EF=BC=8C=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E5=88=A0=E6=8E=89=202.=20d.ts=20=E9=9F=B3=E9=A2=91=E6=92=AD?=
 =?UTF-8?q?=E6=94=BEupdatetime=20=E5=8F=82=E6=95=B0=E6=B2=A1=E4=BC=A0?=
 =?UTF-8?q?=EF=BC=8Cbugfix=203.=20beta2.3=20=E9=9F=B3=E9=A2=91=E6=89=93?=
 =?UTF-8?q?=E5=BC=80=E7=BC=96=E8=AF=91=E9=93=BE=E6=8E=A5=204.=20beta2.3=20?=
 =?UTF-8?q?=E9=9F=B3=E9=87=8F=E5=AF=B9=E6=8E=A5=E7=9A=84=E6=98=A0=E5=B0=84?=
 =?UTF-8?q?=E6=94=B9=E6=88=900~15?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 services/player/engine/BUILD.gn                    |  4 ++++
 .../engine/gstplayer_engine/gst_player_ctrl.cpp    | 14 ++++++++------
 services/plugins/BUILD.gn                          |  4 ++--
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/services/player/engine/BUILD.gn b/services/player/engine/BUILD.gn
index 05bbbded2..15357bdd3 100644
--- a/services/player/engine/BUILD.gn
+++ b/services/player/engine/BUILD.gn
@@ -43,6 +43,9 @@ config("media_player_engine_config") {
     "//drivers/peripheral/display/interfaces/include",
     "//foundation/multimedia/media_standard/services/player/engine/player_register",
     "//foundation/multimedia/media_standard/services/player/engine/gstplayer_engine",
+    "//foundation/multimedia/audio_standard/frameworks/innerkitsimpl/common/include",
+    "//foundation/multimedia/audio_standard/interfaces/innerkits/native/audiocommon/include",
+    "//foundation/multimedia/audio_standard/interfaces/innerkits/native/audiomanager/include",    
     "//third_party/gstreamer/gstreamer",
     "//third_party/gstreamer/gstreamer/libs",
     "//third_party/gstreamer/gstplugins_base",
@@ -77,6 +80,7 @@ ohos_shared_library("media_player_engine") {
   deps = [
     "//foundation/multimedia/media_standard/services/utils:media_service_utils",
     "//foundation/graphic/standard:libsurface",
+    "//foundation/multimedia/audio_standard/interfaces/innerkits/native/audiomanager:audio_client",
     "//third_party/gstreamer/gstreamer:gstreamer",
     "//third_party/gstreamer/gstreamer:gstbase",
     "//third_party/gstreamer/gstplugins_base:gstvideo",
diff --git a/services/player/engine/gstplayer_engine/gst_player_ctrl.cpp b/services/player/engine/gstplayer_engine/gst_player_ctrl.cpp
index e989cb0d7..bed77d1a2 100644
--- a/services/player/engine/gstplayer_engine/gst_player_ctrl.cpp
+++ b/services/player/engine/gstplayer_engine/gst_player_ctrl.cpp
@@ -15,8 +15,9 @@
 
 #include "gst_player_ctrl.h"
 #include "media_log.h"
-// #include "audio_system_manager.h"
+#include "audio_system_manager.h"
 #include "media_errors.h"
+#include "audio_errors.h"
 
 namespace {
     constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, LOG_DOMAIN, "GstPlayerCtrl"};
@@ -137,11 +138,12 @@ void GstPlayerCtrl::SetLoop(bool loop)
 
 void GstPlayerCtrl::SetVolume(float leftVolume, float rightVolume)
 {
-    // std::unique_lock<std::mutex> lock(mutex_);
-    // AudioStandard::AudioSystemManager *audioManager = AudioStandard::AudioSystemManager::GetInstance();
-    // CHECK_AND_RETURN_LOG(audioManager != nullptr, "audioManager is nullptr");
-    // int32_t ret = audioManager->SetVolume(AudioStandard::AudioSystemManager::AudioVolumeType::STREAM_MUSIC, leftVolume);
-    // CHECK_AND_RETURN_LOG(ret == AudioStandard::SUCCESS, "set volume fail");
+    std::unique_lock<std::mutex> lock(mutex_);
+    AudioStandard::AudioSystemManager *audioManager = AudioStandard::AudioSystemManager::GetInstance();
+    CHECK_AND_RETURN_LOG(audioManager != nullptr, "audioManager is nullptr");
+    int32_t sysVolume = static_cast<int>(leftVolume * 15);
+    int32_t ret = audioManager->SetVolume(AudioStandard::AudioSystemManager::AudioVolumeType::STREAM_MUSIC, sysVolume);
+    CHECK_AND_RETURN_LOG(ret == AudioStandard::SUCCESS, "set volume fail");
 }
 
 uint64_t GstPlayerCtrl::GetPosition()
diff --git a/services/plugins/BUILD.gn b/services/plugins/BUILD.gn
index cd0e74bb3..27966f00d 100644
--- a/services/plugins/BUILD.gn
+++ b/services/plugins/BUILD.gn
@@ -17,7 +17,7 @@ group("media_plugins") {
     deps = [
         # "gstreamer/codec:codec_plugins",
         "gstreamer/source/videocapture:gst_surface_video_src",
-        # "gstreamer/source/audiocapture:gst_audio_capture_src",
-        # "gstreamer/sink/audiosink:gst_audio_server_sink",
+        "gstreamer/source/audiocapture:gst_audio_capture_src",
+        "gstreamer/sink/audiosink:gst_audio_server_sink",
     ]
 }
-- 
Gitee