From 9e59487cf29f96201539771e1e76dafee041dfb5 Mon Sep 17 00:00:00 2001 From: zhaijunwei Date: Sun, 7 Apr 2024 16:16:06 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=9F=B3=E9=A2=91NDK=E6=96=B0=E5=A2=9EAudi?= =?UTF-8?q?oRenderer=E6=89=93=E6=96=AD=E6=A8=A1=E5=BC=8F=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhaijunwei --- .../common/native_audiostream_base.h | 20 +++++++++++++++++++ .../common/native_audiostreambuilder.h | 12 +++++++++++ multimedia/audio_framework/ohaudio.ndk.json | 4 ++++ 3 files changed, 36 insertions(+) diff --git a/multimedia/audio_framework/common/native_audiostream_base.h b/multimedia/audio_framework/common/native_audiostream_base.h index 55bff63079a..a0930058dbe 100644 --- a/multimedia/audio_framework/common/native_audiostream_base.h +++ b/multimedia/audio_framework/common/native_audiostream_base.h @@ -446,6 +446,26 @@ typedef enum { EFFECT_DEFAULT = 1, } OH_AudioStream_AudioEffectMode; +/** + * Defines the audio interrupt mode. + * + * @since 12 + */ +typedef enum { + /** + * Share mode + * + * @since 12 + */ + AUDIOSTREAM_INTERRUPT_MODE_SHARE = 0, + /** + * Independent mode + * + * @since 12 + */ + AUDIOSTREAM_INTERRUPT_MODE_INDEPENDENT = 1 +} OH_AudioInterrupt_Mode; + /** * Declaring the audio stream builder. * The instance of builder is used for creating audio stream. diff --git a/multimedia/audio_framework/common/native_audiostreambuilder.h b/multimedia/audio_framework/common/native_audiostreambuilder.h index 79a64dbf510..7957da9ccfa 100644 --- a/multimedia/audio_framework/common/native_audiostreambuilder.h +++ b/multimedia/audio_framework/common/native_audiostreambuilder.h @@ -252,6 +252,18 @@ OH_AudioStream_Result OH_AudioStreamBuilder_SetFrameSizeInCallback(OH_AudioStrea OH_AudioStream_Result OH_AudioStreamBuilder_SetWriteDataWithMetadataCallback(OH_AudioStreamBuilder* builder, OH_AudioRenderer_WriteDataWithMetadataCallback callback, void* userData); +/* + * Set the interrupt mode of the stream client + * + * @since 12 + * + * @param builder Reference provided by OH_AudioStreamBuilder_Create() + * @param mode The audio interrupt mode + * @return {@link #AUDIOSTREAM_SUCCESS} or an undesired error. + */ +OH_AudioStream_Result OH_AudioStreamBuilder_SetRendererInterruptMode(OH_AudioStreamBuilder* builder, + OH_AudioInterrupt_Mode mode); + #ifdef __cplusplus } #endif diff --git a/multimedia/audio_framework/ohaudio.ndk.json b/multimedia/audio_framework/ohaudio.ndk.json index 9fc32540710..6157abe6596 100644 --- a/multimedia/audio_framework/ohaudio.ndk.json +++ b/multimedia/audio_framework/ohaudio.ndk.json @@ -242,5 +242,9 @@ { "first_introduced": "12", "name": "OH_AudioStreamBuilder_SetWriteDataWithMetadataCallback" + }, + { + "first_introduced":"12", + "name": "OH_AudioStreamBuilder_SetRendererInterruptMode" } ] -- Gitee From 25337755ae39a0898c11b860cef41867b1d0c5e2 Mon Sep 17 00:00:00 2001 From: zhaijunwei Date: Mon, 8 Apr 2024 16:49:14 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=A0=B9=E6=8D=AEreview=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhaijunwei --- .../audio_framework/common/native_audiostreambuilder.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/multimedia/audio_framework/common/native_audiostreambuilder.h b/multimedia/audio_framework/common/native_audiostreambuilder.h index 7957da9ccfa..9739faeeb9f 100644 --- a/multimedia/audio_framework/common/native_audiostreambuilder.h +++ b/multimedia/audio_framework/common/native_audiostreambuilder.h @@ -252,14 +252,13 @@ OH_AudioStream_Result OH_AudioStreamBuilder_SetFrameSizeInCallback(OH_AudioStrea OH_AudioStream_Result OH_AudioStreamBuilder_SetWriteDataWithMetadataCallback(OH_AudioStreamBuilder* builder, OH_AudioRenderer_WriteDataWithMetadataCallback callback, void* userData); -/* - * Set the interrupt mode of the stream client - * - * @since 12 +/** + * @brief Set the interrupt mode of the stream client * * @param builder Reference provided by OH_AudioStreamBuilder_Create() * @param mode The audio interrupt mode * @return {@link #AUDIOSTREAM_SUCCESS} or an undesired error. + * @since 12 */ OH_AudioStream_Result OH_AudioStreamBuilder_SetRendererInterruptMode(OH_AudioStreamBuilder* builder, OH_AudioInterrupt_Mode mode); -- Gitee From 36b1275a92ddfaef9d3b10f009aabe0ed3acb73b Mon Sep 17 00:00:00 2001 From: zhaijunwei Date: Mon, 8 Apr 2024 21:03:36 +0800 Subject: [PATCH 3/3] fix review Signed-off-by: zhaijunwei --- multimedia/audio_framework/common/native_audiostream_base.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/multimedia/audio_framework/common/native_audiostream_base.h b/multimedia/audio_framework/common/native_audiostream_base.h index a0930058dbe..accc468ff82 100644 --- a/multimedia/audio_framework/common/native_audiostream_base.h +++ b/multimedia/audio_framework/common/native_audiostream_base.h @@ -454,14 +454,10 @@ typedef enum { typedef enum { /** * Share mode - * - * @since 12 */ AUDIOSTREAM_INTERRUPT_MODE_SHARE = 0, /** * Independent mode - * - * @since 12 */ AUDIOSTREAM_INTERRUPT_MODE_INDEPENDENT = 1 } OH_AudioInterrupt_Mode; -- Gitee