From 52ad19321d6a61811afa97bf6102b253f2ed5cdb Mon Sep 17 00:00:00 2001 From: XUXIAOBO Date: Wed, 25 Aug 2021 11:37:46 +0000 Subject: [PATCH 1/2] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E9=9F=B3=E9=87=8Fbug?= =?UTF-8?q?=202.=E5=85=B3=E9=97=AD=E5=BD=95=E5=88=B6=E6=89=93=E6=A1=A9?= =?UTF-8?q?=E7=BC=96=E8=AF=91=203.=E6=89=93=E5=BC=80=E5=BD=95=E5=88=B6?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E7=BC=96=E8=AF=91=20Signed-off-by:=20XUXIAOB?= =?UTF-8?q?O=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/engine/gstreamer/player/gst_player_ctrl.cpp | 3 ++- services/engine/gstreamer/plugins/BUILD.gn | 1 + services/engine/gstreamer/plugins/source/videocapture/BUILD.gn | 1 - .../source/videocapture/include/video_capture_sf_es_avc_impl.h | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/services/engine/gstreamer/player/gst_player_ctrl.cpp b/services/engine/gstreamer/player/gst_player_ctrl.cpp index 9ef714acd..00fe3be9b 100644 --- a/services/engine/gstreamer/player/gst_player_ctrl.cpp +++ b/services/engine/gstreamer/player/gst_player_ctrl.cpp @@ -287,7 +287,8 @@ void GstPlayerCtrl::SetVolume(float leftVolume, float rightVolume) std::unique_lock 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); + int32_t volume = static_cast(VOLUME_TO_SYSTEM_VOLUME * leftVolume); + int32_t ret = audioManager->SetVolume(AudioStandard::AudioSystemManager::AudioVolumeType::STREAM_MUSIC, volume); CHECK_AND_RETURN_LOG(ret == AudioStandard::SUCCESS, "set volume fail"); OnVolumeChange(); } diff --git a/services/engine/gstreamer/plugins/BUILD.gn b/services/engine/gstreamer/plugins/BUILD.gn index 7b36b2f34..e1491c2bf 100644 --- a/services/engine/gstreamer/plugins/BUILD.gn +++ b/services/engine/gstreamer/plugins/BUILD.gn @@ -15,6 +15,7 @@ import("//build/ohos.gni") group("media_engine_gst_plugins") { deps = [ + "source/videocapture:gst_surface_video_src", "source/audiocapture:gst_audio_capture_src", "sink/audiosink:gst_audio_server_sink", ] diff --git a/services/engine/gstreamer/plugins/source/videocapture/BUILD.gn b/services/engine/gstreamer/plugins/source/videocapture/BUILD.gn index ba07ff5ba..bfc1e0402 100644 --- a/services/engine/gstreamer/plugins/source/videocapture/BUILD.gn +++ b/services/engine/gstreamer/plugins/source/videocapture/BUILD.gn @@ -57,7 +57,6 @@ ohos_shared_library("gst_surface_video_src") { "src/gst_surface_video_src.cpp", "src/video_capture_factory.cpp", "src/video_capture_sf_impl.cpp", - "src/video_capture_stub_impl.cpp", "src/video_capture_sf_es_avc_impl.cpp", ] diff --git a/services/engine/gstreamer/plugins/source/videocapture/include/video_capture_sf_es_avc_impl.h b/services/engine/gstreamer/plugins/source/videocapture/include/video_capture_sf_es_avc_impl.h index 951b8726d..ab1bddaa0 100644 --- a/services/engine/gstreamer/plugins/source/videocapture/include/video_capture_sf_es_avc_impl.h +++ b/services/engine/gstreamer/plugins/source/videocapture/include/video_capture_sf_es_avc_impl.h @@ -39,7 +39,7 @@ private: char *codecData_ = nullptr; int32_t codecDataSize_ = 0; uint32_t nalSize_ = 0; - bool transStreamFormat = false; + bool transStreamFormat = true; }; } // namespace Media } // namespace OHOS -- Gitee From 017f398a9e9c74ef4929e2195dd3bcbd3bdeace7 Mon Sep 17 00:00:00 2001 From: XUXIAOBO Date: Wed, 25 Aug 2021 11:59:04 +0000 Subject: [PATCH 2/2] Signed-off-by: XUXIAOBO --- services/engine/gstreamer/player/gst_player_ctrl.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/services/engine/gstreamer/player/gst_player_ctrl.cpp b/services/engine/gstreamer/player/gst_player_ctrl.cpp index 00fe3be9b..b75aaa5be 100644 --- a/services/engine/gstreamer/player/gst_player_ctrl.cpp +++ b/services/engine/gstreamer/player/gst_player_ctrl.cpp @@ -27,6 +27,7 @@ namespace { namespace OHOS { namespace Media { constexpr int MILLI = 1000; +constexpr int VOLUME_TO_SYSTEM_VOLUME = 15; constexpr int MICRO = MILLI * 1000; using StreamToServiceErrFunc = void (*)(const gchar *name, int32_t &errorCode); static const std::unordered_map STREAM_TO_SERVICE_ERR_FUNC_TABLE = { -- Gitee