From 5263fd97a1b02b7740a0d8637712dbb5c12e9332 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E7=AB=8B=E5=81=A5?= Date: Wed, 23 Oct 2024 19:35:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=87=BD=E6=95=B0=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E8=BF=94=E5=9B=9Eshared=5Fptr=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 李立健 --- .../audiocapturer/src/audio_capturer.cpp | 15 +++++++++++++ .../audiorenderer/src/audio_renderer.cpp | 16 ++++++++++++++ .../audiocapturer/include/audio_capturer.h | 21 +++++++++++++++++++ .../audiorenderer/include/audio_renderer.h | 21 +++++++++++++++++++ 4 files changed, 73 insertions(+) diff --git a/frameworks/native/audiocapturer/src/audio_capturer.cpp b/frameworks/native/audiocapturer/src/audio_capturer.cpp index 9fab77e4c8..6a58b924f3 100644 --- a/frameworks/native/audiocapturer/src/audio_capturer.cpp +++ b/frameworks/native/audiocapturer/src/audio_capturer.cpp @@ -92,6 +92,21 @@ std::unique_ptr AudioCapturer::Create(const AudioCapturerOptions return Create(options, cachePath, appInfo); } +std::shared_ptr AudioCapturer::CreateShared(const AudioCapturerOptions &options) +{ + AppInfo appInfo = {}; + auto tempUniquePtr = Create(options, "", appInfo); + std::shared_ptr sharedPtr(tempUniquePtr.release()); + return sharedPtr; +} + +std::shared_ptr AudioCapturer::CreateShared(const AudioCapturerOptions &options, const AppInfo &appInfo) +{ + auto tempUniquePtr = Create(options, "", appInfo); + std::shared_ptr sharedPtr(tempUniquePtr.release()); + return sharedPtr; +} + std::unique_ptr AudioCapturer::Create(const AudioCapturerOptions &capturerOptions, const std::string cachePath, const AppInfo &appInfo) { diff --git a/frameworks/native/audiorenderer/src/audio_renderer.cpp b/frameworks/native/audiorenderer/src/audio_renderer.cpp index 06368d37f7..47151e8d4b 100644 --- a/frameworks/native/audiorenderer/src/audio_renderer.cpp +++ b/frameworks/native/audiorenderer/src/audio_renderer.cpp @@ -181,6 +181,22 @@ std::unique_ptr AudioRenderer::Create(const std::string cachePath return Create(cachePath, rendererOptions, appInfo); } +std::shared_ptr AudioRenderer::CreateShared(const AudioRendererOptions &rendererOptions) +{ + AppInfo appInfo = {}; + auto tempUniquePtr = Create("", rendererOptions, appInfo); + std::shared_ptr sharedPtr(tempUniquePtr.release()); + return sharedPtr; +} + +std::shared_ptr AudioRenderer::CreateShared(const AudioRendererOptions &rendererOptions, + const AppInfo &appInfo) +{ + auto tempUniquePtr = Create("", rendererOptions, appInfo); + std::shared_ptr sharedPtr(tempUniquePtr.release()); + return sharedPtr; +} + std::unique_ptr AudioRenderer::Create(const std::string cachePath, const AudioRendererOptions &rendererOptions, const AppInfo &appInfo) { diff --git a/interfaces/inner_api/native/audiocapturer/include/audio_capturer.h b/interfaces/inner_api/native/audiocapturer/include/audio_capturer.h index aa82b31ee9..26407b6dd2 100644 --- a/interfaces/inner_api/native/audiocapturer/include/audio_capturer.h +++ b/interfaces/inner_api/native/audiocapturer/include/audio_capturer.h @@ -194,6 +194,27 @@ public: */ static std::unique_ptr Create(const AudioCapturerOptions &options, const std::string cachePath); + /** + * @brief create capturer instance. + * + * @param options The audio capturer configuration to be used while creating capturer instance. + * refer AudioCapturerOptions in audio_info.h. + * @return Returns shared pointer to the AudioCapturer object + * @since 12 + */ + static std::shared_ptr CreateShared(const AudioCapturerOptions &options); + + /** + * @brief create capturer instance. + * + * @param options The audio capturer configuration to be used while creating capturer instance. + * refer AudioCapturerOptions in audio_info.h. + * @param appInfo Originating application's uid and token id can be passed here + * @return Returns shared pointer to the AudioCapturer object + * @since 12 + */ + static std::shared_ptr CreateShared(const AudioCapturerOptions &options, const AppInfo &appInfo); + /** * @brief create capturer instance. * diff --git a/interfaces/inner_api/native/audiorenderer/include/audio_renderer.h b/interfaces/inner_api/native/audiorenderer/include/audio_renderer.h index f369dd10d6..b5f8123ab9 100644 --- a/interfaces/inner_api/native/audiorenderer/include/audio_renderer.h +++ b/interfaces/inner_api/native/audiorenderer/include/audio_renderer.h @@ -221,6 +221,27 @@ public: static std::unique_ptr Create(const std::string cachePath, const AudioRendererOptions &rendererOptions); + /** + * @brief create renderer instance. + * + * @param rendererOptions The audio renderer configuration to be used while creating renderer instance. + * refer AudioRendererOptions in audio_info.h. + * @return Returns shared pointer to the AudioRenderer object + * @since 12 + */ + static std::shared_ptr CreateShared(const AudioRendererOptions &rendererOptions); + + /** + * @brief create renderer instance. + * + * @param rendererOptions The audio renderer configuration to be used while creating renderer instance. + * refer AudioRendererOptions in audio_info.h. + * @param appInfo Originating application's uid and token id can be passed here + * @return Returns shared pointer to the AudioRenderer object + * @since 12 + */ + static std::shared_ptr CreateShared(const AudioRendererOptions &options, const AppInfo &appInfo); + /** * @brief create renderer instance. * -- Gitee From bb80e3e0fb960b0d0b5908167d9b4acffe304cc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E7=AB=8B=E5=81=A5?= Date: Thu, 24 Oct 2024 01:49:27 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BB=85=E6=8F=90=E4=BE=9B=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E5=B8=A6=E9=BB=98=E8=AE=A4=E5=8F=82=E7=9A=84=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 李立健 --- .../native/audiocapturer/src/audio_capturer.cpp | 10 +--------- .../native/audiorenderer/src/audio_renderer.cpp | 10 +--------- .../native/audiocapturer/include/audio_capturer.h | 14 +++----------- .../native/audiorenderer/include/audio_renderer.h | 15 ++++----------- 4 files changed, 9 insertions(+), 40 deletions(-) diff --git a/frameworks/native/audiocapturer/src/audio_capturer.cpp b/frameworks/native/audiocapturer/src/audio_capturer.cpp index 6a58b924f3..5ece15268a 100644 --- a/frameworks/native/audiocapturer/src/audio_capturer.cpp +++ b/frameworks/native/audiocapturer/src/audio_capturer.cpp @@ -92,15 +92,7 @@ std::unique_ptr AudioCapturer::Create(const AudioCapturerOptions return Create(options, cachePath, appInfo); } -std::shared_ptr AudioCapturer::CreateShared(const AudioCapturerOptions &options) -{ - AppInfo appInfo = {}; - auto tempUniquePtr = Create(options, "", appInfo); - std::shared_ptr sharedPtr(tempUniquePtr.release()); - return sharedPtr; -} - -std::shared_ptr AudioCapturer::CreateShared(const AudioCapturerOptions &options, const AppInfo &appInfo) +std::shared_ptr AudioCapturer::CreateCapturer(const AudioCapturerOptions &options, const AppInfo &appInfo) { auto tempUniquePtr = Create(options, "", appInfo); std::shared_ptr sharedPtr(tempUniquePtr.release()); diff --git a/frameworks/native/audiorenderer/src/audio_renderer.cpp b/frameworks/native/audiorenderer/src/audio_renderer.cpp index 47151e8d4b..69f9f4b3ef 100644 --- a/frameworks/native/audiorenderer/src/audio_renderer.cpp +++ b/frameworks/native/audiorenderer/src/audio_renderer.cpp @@ -181,15 +181,7 @@ std::unique_ptr AudioRenderer::Create(const std::string cachePath return Create(cachePath, rendererOptions, appInfo); } -std::shared_ptr AudioRenderer::CreateShared(const AudioRendererOptions &rendererOptions) -{ - AppInfo appInfo = {}; - auto tempUniquePtr = Create("", rendererOptions, appInfo); - std::shared_ptr sharedPtr(tempUniquePtr.release()); - return sharedPtr; -} - -std::shared_ptr AudioRenderer::CreateShared(const AudioRendererOptions &rendererOptions, +std::shared_ptr AudioRenderer::CreateRenderer(const AudioRendererOptions &rendererOptions, const AppInfo &appInfo) { auto tempUniquePtr = Create("", rendererOptions, appInfo); diff --git a/interfaces/inner_api/native/audiocapturer/include/audio_capturer.h b/interfaces/inner_api/native/audiocapturer/include/audio_capturer.h index 26407b6dd2..c3590a9581 100644 --- a/interfaces/inner_api/native/audiocapturer/include/audio_capturer.h +++ b/interfaces/inner_api/native/audiocapturer/include/audio_capturer.h @@ -168,6 +168,7 @@ public: * refer AudioCapturerOptions in audio_info.h. * @return Returns unique pointer to the AudioCapturer object * @since 8 + * @deprecated since 12 */ static std::unique_ptr Create(const AudioCapturerOptions &options); @@ -179,6 +180,7 @@ public: * @param appInfo Originating application's uid and token id can be passed here * @return Returns unique pointer to the AudioCapturer object * @since 9 + * @deprecated since 12 */ static std::unique_ptr Create(const AudioCapturerOptions &options, const AppInfo &appInfo); @@ -194,16 +196,6 @@ public: */ static std::unique_ptr Create(const AudioCapturerOptions &options, const std::string cachePath); - /** - * @brief create capturer instance. - * - * @param options The audio capturer configuration to be used while creating capturer instance. - * refer AudioCapturerOptions in audio_info.h. - * @return Returns shared pointer to the AudioCapturer object - * @since 12 - */ - static std::shared_ptr CreateShared(const AudioCapturerOptions &options); - /** * @brief create capturer instance. * @@ -213,7 +205,7 @@ public: * @return Returns shared pointer to the AudioCapturer object * @since 12 */ - static std::shared_ptr CreateShared(const AudioCapturerOptions &options, const AppInfo &appInfo); + static std::shared_ptr CreateCapturer(const AudioCapturerOptions &options, const AppInfo &appInfo = AppInfo()); /** * @brief create capturer instance. diff --git a/interfaces/inner_api/native/audiorenderer/include/audio_renderer.h b/interfaces/inner_api/native/audiorenderer/include/audio_renderer.h index b5f8123ab9..77b47ddce7 100644 --- a/interfaces/inner_api/native/audiorenderer/include/audio_renderer.h +++ b/interfaces/inner_api/native/audiorenderer/include/audio_renderer.h @@ -194,6 +194,7 @@ public: * refer AudioRendererOptions in audio_info.h. * @return Returns unique pointer to the AudioRenderer object * @since 8 + * @deprecated since 12 */ static std::unique_ptr Create(const AudioRendererOptions &rendererOptions); @@ -205,6 +206,7 @@ public: * @param appInfo Originating application's uid and token id can be passed here * @return Returns unique pointer to the AudioRenderer object * @since 9 + * @deprecated since 12 */ static std::unique_ptr Create(const AudioRendererOptions &options, const AppInfo &appInfo); @@ -221,16 +223,6 @@ public: static std::unique_ptr Create(const std::string cachePath, const AudioRendererOptions &rendererOptions); - /** - * @brief create renderer instance. - * - * @param rendererOptions The audio renderer configuration to be used while creating renderer instance. - * refer AudioRendererOptions in audio_info.h. - * @return Returns shared pointer to the AudioRenderer object - * @since 12 - */ - static std::shared_ptr CreateShared(const AudioRendererOptions &rendererOptions); - /** * @brief create renderer instance. * @@ -240,7 +232,8 @@ public: * @return Returns shared pointer to the AudioRenderer object * @since 12 */ - static std::shared_ptr CreateShared(const AudioRendererOptions &options, const AppInfo &appInfo); + static std::shared_ptr CreateRenderer(const AudioRendererOptions &rendererOptions, + const AppInfo &appInfo = AppInfo()); /** * @brief create renderer instance. -- Gitee From 8bae46bfadd10f710b1d583ceea47ce6b10c2a88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E7=AB=8B=E5=81=A5?= Date: Thu, 24 Oct 2024 02:33:21 +0000 Subject: [PATCH 3/3] =?UTF-8?q?=E7=BC=A9=E7=9F=AD=E8=A1=8C=E5=AE=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 李立健 --- frameworks/native/audiocapturer/src/audio_capturer.cpp | 3 ++- .../inner_api/native/audiocapturer/include/audio_capturer.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/frameworks/native/audiocapturer/src/audio_capturer.cpp b/frameworks/native/audiocapturer/src/audio_capturer.cpp index 5ece15268a..faf0baa52e 100644 --- a/frameworks/native/audiocapturer/src/audio_capturer.cpp +++ b/frameworks/native/audiocapturer/src/audio_capturer.cpp @@ -92,7 +92,8 @@ std::unique_ptr AudioCapturer::Create(const AudioCapturerOptions return Create(options, cachePath, appInfo); } -std::shared_ptr AudioCapturer::CreateCapturer(const AudioCapturerOptions &options, const AppInfo &appInfo) +std::shared_ptr AudioCapturer::CreateCapturer(const AudioCapturerOptions &options, + const AppInfo &appInfo) { auto tempUniquePtr = Create(options, "", appInfo); std::shared_ptr sharedPtr(tempUniquePtr.release()); diff --git a/interfaces/inner_api/native/audiocapturer/include/audio_capturer.h b/interfaces/inner_api/native/audiocapturer/include/audio_capturer.h index c3590a9581..0e6c427cbe 100644 --- a/interfaces/inner_api/native/audiocapturer/include/audio_capturer.h +++ b/interfaces/inner_api/native/audiocapturer/include/audio_capturer.h @@ -205,7 +205,8 @@ public: * @return Returns shared pointer to the AudioCapturer object * @since 12 */ - static std::shared_ptr CreateCapturer(const AudioCapturerOptions &options, const AppInfo &appInfo = AppInfo()); + static std::shared_ptr CreateCapturer(const AudioCapturerOptions &options, + const AppInfo &appInfo = AppInfo()); /** * @brief create capturer instance. -- Gitee