From 02a4e85fe9fb95dd6f030892d20ce62dcbd6e0ad Mon Sep 17 00:00:00 2001 From: AOL Date: Fri, 24 Nov 2023 11:06:21 +0000 Subject: [PATCH 1/3] add new callback size set func and missing ndk json defination Signed-off-by: AOL --- .../common/native_audiostreambuilder.h | 16 ++++++++++++++++ multimedia/audio_framework/ohaudio.ndk.json | 8 +++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/multimedia/audio_framework/common/native_audiostreambuilder.h b/multimedia/audio_framework/common/native_audiostreambuilder.h index 99d94288e..41a0e6679 100644 --- a/multimedia/audio_framework/common/native_audiostreambuilder.h +++ b/multimedia/audio_framework/common/native_audiostreambuilder.h @@ -199,6 +199,22 @@ OH_AudioStream_Result OH_AudioStreamBuilder_GenerateRenderer(OH_AudioStreamBuild */ OH_AudioStream_Result OH_AudioStreamBuilder_GenerateCapturer(OH_AudioStreamBuilder* builder, OH_AudioCapturer** audioCapturer); + +/* + * Set the data frame size for each callback, use this function if the application requires a specific number + * of frames for processing. + * The frame size should be at least the size device process at one time, and less than half the internal + * buffer capacity. + * + * @since 11 + * + * @param builder Reference provided by OH_AudioStreamBuilder_Create() + * @param frameSize The data frame size for each callback. + * @return {@link #AUDIOSTREAM_SUCCESS} or an undesired error. + */ +OH_AudioStream_Result OH_AudioStreamBuilder_SetFrameSizeInCallback(OH_AudioStreamBuilder* builder, + int32_t frameSize); + #ifdef __cplusplus } #endif diff --git a/multimedia/audio_framework/ohaudio.ndk.json b/multimedia/audio_framework/ohaudio.ndk.json index 1062c40a8..83db7d066 100644 --- a/multimedia/audio_framework/ohaudio.ndk.json +++ b/multimedia/audio_framework/ohaudio.ndk.json @@ -25,6 +25,9 @@ { "name": "OH_AudioRenderer_GetLatencyMode" }, { "name": "OH_AudioRenderer_GetRendererInfo" }, { "name": "OH_AudioRenderer_GetEncodingType" }, + { "name": "OH_AudioRenderer_GetFramesWritten" }, + { "name": "OH_AudioRenderer_GetTimestamp" }, + { "name": "OH_AudioRenderer_GetFrameSizeInCallback" }, { "name": "OH_AudioCapturer_Release" }, { "name": "OH_AudioCapturer_Start" }, { "name": "OH_AudioCapturer_Pause" }, @@ -37,5 +40,8 @@ { "name": "OH_AudioCapturer_GetChannelCount" }, { "name": "OH_AudioCapturer_GetSampleFormat" }, { "name": "OH_AudioCapturer_GetEncodingType" }, - { "name": "OH_AudioCapturer_GetCapturerInfo" } + { "name": "OH_AudioCapturer_GetCapturerInfo" }, + { "name": "OH_AudioCapturer_GetFrameSizeInCallback" }, + { "name": "OH_AudioCapturer_GetTimestamp" }, + { "name": "OH_AudioCapturer_GetFramesRead" } ] \ No newline at end of file -- Gitee From 8c23a193b61de39d078534f35bd920fd5f079781 Mon Sep 17 00:00:00 2001 From: magekkkk Date: Tue, 19 Dec 2023 10:27:20 +0800 Subject: [PATCH 2/3] add missing api in json Signed-off-by: magekkkk --- multimedia/audio_framework/ohaudio.ndk.json | 1 + 1 file changed, 1 insertion(+) diff --git a/multimedia/audio_framework/ohaudio.ndk.json b/multimedia/audio_framework/ohaudio.ndk.json index 83db7d066..8985395e4 100644 --- a/multimedia/audio_framework/ohaudio.ndk.json +++ b/multimedia/audio_framework/ohaudio.ndk.json @@ -12,6 +12,7 @@ { "name": "OH_AudioStreamBuilder_SetCapturerCallback" }, { "name": "OH_AudioStreamBuilder_GenerateRenderer" }, { "name": "OH_AudioStreamBuilder_GenerateCapturer" }, + { "name": "OH_AudioStreamBuilder_SetFrameSizeInCallback" }, { "name": "OH_AudioRenderer_Release" }, { "name": "OH_AudioRenderer_Start" }, { "name": "OH_AudioRenderer_Pause" }, -- Gitee From f575056f815810b8e7aae1da443de54c5f15c9f5 Mon Sep 17 00:00:00 2001 From: magekkkk Date: Wed, 20 Dec 2023 17:50:48 +0800 Subject: [PATCH 3/3] add introduce tag in json Signed-off-by: magekkkk --- multimedia/audio_framework/ohaudio.ndk.json | 230 ++++++++++++++++---- 1 file changed, 184 insertions(+), 46 deletions(-) diff --git a/multimedia/audio_framework/ohaudio.ndk.json b/multimedia/audio_framework/ohaudio.ndk.json index 8985395e4..e098fad58 100644 --- a/multimedia/audio_framework/ohaudio.ndk.json +++ b/multimedia/audio_framework/ohaudio.ndk.json @@ -1,48 +1,186 @@ [ - { "name": "OH_AudioStreamBuilder_Create" }, - { "name": "OH_AudioStreamBuilder_Destroy" }, - { "name": "OH_AudioStreamBuilder_SetSamplingRate" }, - { "name": "OH_AudioStreamBuilder_SetChannelCount" }, - { "name": "OH_AudioStreamBuilder_SetSampleFormat" }, - { "name": "OH_AudioStreamBuilder_SetEncodingType" }, - { "name": "OH_AudioStreamBuilder_SetLatencyMode" }, - { "name": "OH_AudioStreamBuilder_SetRendererInfo" }, - { "name": "OH_AudioStreamBuilder_SetCapturerInfo" }, - { "name": "OH_AudioStreamBuilder_SetRendererCallback" }, - { "name": "OH_AudioStreamBuilder_SetCapturerCallback" }, - { "name": "OH_AudioStreamBuilder_GenerateRenderer" }, - { "name": "OH_AudioStreamBuilder_GenerateCapturer" }, - { "name": "OH_AudioStreamBuilder_SetFrameSizeInCallback" }, - { "name": "OH_AudioRenderer_Release" }, - { "name": "OH_AudioRenderer_Start" }, - { "name": "OH_AudioRenderer_Pause" }, - { "name": "OH_AudioRenderer_Stop" }, - { "name": "OH_AudioRenderer_Flush" }, - { "name": "OH_AudioRenderer_GetCurrentState" }, - { "name": "OH_AudioRenderer_GetSamplingRate" }, - { "name": "OH_AudioRenderer_GetStreamId" }, - { "name": "OH_AudioRenderer_GetChannelCount" }, - { "name": "OH_AudioRenderer_GetSampleFormat" }, - { "name": "OH_AudioRenderer_GetLatencyMode" }, - { "name": "OH_AudioRenderer_GetRendererInfo" }, - { "name": "OH_AudioRenderer_GetEncodingType" }, - { "name": "OH_AudioRenderer_GetFramesWritten" }, - { "name": "OH_AudioRenderer_GetTimestamp" }, - { "name": "OH_AudioRenderer_GetFrameSizeInCallback" }, - { "name": "OH_AudioCapturer_Release" }, - { "name": "OH_AudioCapturer_Start" }, - { "name": "OH_AudioCapturer_Pause" }, - { "name": "OH_AudioCapturer_Stop" }, - { "name": "OH_AudioCapturer_Flush" }, - { "name": "OH_AudioCapturer_GetCurrentState" }, - { "name": "OH_AudioCapturer_GetLatencyMode" }, - { "name": "OH_AudioCapturer_GetStreamId" }, - { "name": "OH_AudioCapturer_GetSamplingRate" }, - { "name": "OH_AudioCapturer_GetChannelCount" }, - { "name": "OH_AudioCapturer_GetSampleFormat" }, - { "name": "OH_AudioCapturer_GetEncodingType" }, - { "name": "OH_AudioCapturer_GetCapturerInfo" }, - { "name": "OH_AudioCapturer_GetFrameSizeInCallback" }, - { "name": "OH_AudioCapturer_GetTimestamp" }, - { "name": "OH_AudioCapturer_GetFramesRead" } + { + "first_introduced": "10", + "name": "OH_AudioStreamBuilder_Create" + }, + { + "first_introduced": "10", + "name": "OH_AudioStreamBuilder_Destroy" + }, + { + "first_introduced": "10", + "name": "OH_AudioStreamBuilder_SetSamplingRate" + }, + { + "first_introduced": "10", + "name": "OH_AudioStreamBuilder_SetChannelCount" + }, + { + "first_introduced": "10", + "name": "OH_AudioStreamBuilder_SetSampleFormat" + }, + { + "first_introduced": "10", + "name": "OH_AudioStreamBuilder_SetEncodingType" + }, + { + "first_introduced": "10", + "name": "OH_AudioStreamBuilder_SetLatencyMode" + }, + { + "first_introduced": "10", + "name": "OH_AudioStreamBuilder_SetRendererInfo" + }, + { + "first_introduced": "10", + "name": "OH_AudioStreamBuilder_SetCapturerInfo" + }, + { + "first_introduced": "10", + "name": "OH_AudioStreamBuilder_SetRendererCallback" + }, + { + "first_introduced": "10", + "name": "OH_AudioStreamBuilder_SetCapturerCallback" + }, + { + "first_introduced": "10", + "name": "OH_AudioStreamBuilder_GenerateRenderer" + }, + { + "first_introduced": "10", + "name": "OH_AudioStreamBuilder_GenerateCapturer" + }, + { + "first_introduced": "11", + "name": "OH_AudioStreamBuilder_SetFrameSizeInCallback" + }, + { + "first_introduced": "10", + "name": "OH_AudioRenderer_Release" + }, + { + "first_introduced": "10", + "name": "OH_AudioRenderer_Start" + }, + { + "first_introduced": "10", + "name": "OH_AudioRenderer_Pause" + }, + { + "first_introduced": "10", + "name": "OH_AudioRenderer_Stop" + }, + { + "first_introduced": "10", + "name": "OH_AudioRenderer_Flush" + }, + { + "first_introduced": "10", + "name": "OH_AudioRenderer_GetCurrentState" + }, + { + "first_introduced": "10", + "name": "OH_AudioRenderer_GetSamplingRate" + }, + { + "first_introduced": "10", + "name": "OH_AudioRenderer_GetStreamId" + }, + { + "first_introduced": "10", + "name": "OH_AudioRenderer_GetChannelCount" + }, + { + "first_introduced": "10", + "name": "OH_AudioRenderer_GetSampleFormat" + }, + { + "first_introduced": "10", + "name": "OH_AudioRenderer_GetLatencyMode" + }, + { + "first_introduced": "10", + "name": "OH_AudioRenderer_GetRendererInfo" + }, + { + "first_introduced": "10", + "name": "OH_AudioRenderer_GetEncodingType" + }, + { + "first_introduced": "10", + "name": "OH_AudioRenderer_GetFramesWritten" + }, + { + "first_introduced": "10", + "name": "OH_AudioRenderer_GetTimestamp" + }, + { + "first_introduced": "10", + "name": "OH_AudioRenderer_GetFrameSizeInCallback" + }, + { + "first_introduced": "10", + "name": "OH_AudioCapturer_Release" + }, + { + "first_introduced": "10", + "name": "OH_AudioCapturer_Start" + }, + { + "first_introduced": "10", + "name": "OH_AudioCapturer_Pause" + }, + { + "first_introduced": "10", + "name": "OH_AudioCapturer_Stop" + }, + { + "first_introduced": "10", + "name": "OH_AudioCapturer_Flush" + }, + { + "first_introduced": "10", + "name": "OH_AudioCapturer_GetCurrentState" + }, + { + "first_introduced": "10", + "name": "OH_AudioCapturer_GetLatencyMode" + }, + { + "first_introduced": "10", + "name": "OH_AudioCapturer_GetStreamId" + }, + { + "first_introduced": "10", + "name": "OH_AudioCapturer_GetSamplingRate" + }, + { + "first_introduced": "10", + "name": "OH_AudioCapturer_GetChannelCount" + }, + { + "first_introduced": "10", + "name": "OH_AudioCapturer_GetSampleFormat" + }, + { + "first_introduced": "10", + "name": "OH_AudioCapturer_GetEncodingType" + }, + { + "first_introduced": "10", + "name": "OH_AudioCapturer_GetCapturerInfo" + }, + { + "first_introduced": "10", + "name": "OH_AudioCapturer_GetFrameSizeInCallback" + }, + { + "first_introduced": "10", + "name": "OH_AudioCapturer_GetTimestamp" + }, + { + "first_introduced": "10", + "name": "OH_AudioCapturer_GetFramesRead" + } ] \ No newline at end of file -- Gitee