From 11b565240ef4f594e92e772f7aa6c63e5221d3cd Mon Sep 17 00:00:00 2001 From: fanpingan Date: Fri, 17 May 2024 20:19:12 +0800 Subject: [PATCH 1/4] Provide NDK api: OH_AVPlayer_SetAudioRendererInfo OH_AVPlayer_SetAudioInterruptMode Signed-off-by: fanpingan Change-Id: I4145d029a09006dfd88f8aabc71826e2b95c5bbb --- multimedia/player_framework/avplayer.h | 19 +++++++++++++++++++ .../avplayer/libavplayer.ndk.json | 2 ++ 2 files changed, 21 insertions(+) diff --git a/multimedia/player_framework/avplayer.h b/multimedia/player_framework/avplayer.h index 22725740d..ccf929b1e 100644 --- a/multimedia/player_framework/avplayer.h +++ b/multimedia/player_framework/avplayer.h @@ -43,6 +43,7 @@ #include "native_averrors.h" #include "avplayer_base.h" #include "native_window/external_window.h" +#include "native_audiostream_base.h" #ifdef __cplusplus extern "C" { @@ -317,6 +318,24 @@ OH_AVErrCode OH_AVPlayer_SetPlaybackSpeed(OH_AVPlayer *player, AVPlaybackSpeed s */ OH_AVErrCode OH_AVPlayer_GetPlaybackSpeed(OH_AVPlayer *player, AVPlaybackSpeed *speed); +/** + * + * + * + * + * + */ +OH_AVErrCode OH_AVPlayer_SetAudioRendererInfo(OH_AVPlayer *player, OH_AudioStream_Usage streamUsage); + +/** + * + * + * + * + * + */ +OH_AVErrCode OH_AVPlayer_SetAudioInterruptMode(OH_AVPlayer *player, OH_AudioInterrupt_Mode interruptMode); + /** * @brief set the bit rate use for hls player * diff --git a/multimedia/player_framework/avplayer/libavplayer.ndk.json b/multimedia/player_framework/avplayer/libavplayer.ndk.json index 5c260ec08..399af3ebc 100644 --- a/multimedia/player_framework/avplayer/libavplayer.ndk.json +++ b/multimedia/player_framework/avplayer/libavplayer.ndk.json @@ -16,6 +16,8 @@ { "name": "OH_AVPlayer_GetVideoHeight" }, { "name": "OH_AVPlayer_SetPlaybackSpeed" }, { "name": "OH_AVPlayer_GetPlaybackSpeed" }, + { "name": "OH_AVPlayer_SetAudioRendererInfo"}, + { "name": "OH_AVPlayer_SetAudioInterruptMode"}, { "name": "OH_AVPlayer_SetVideoSurface" }, { "name": "OH_AVPlayer_SelectBitRate" }, { "name": "OH_AVPlayer_GetDuration" }, -- Gitee From d5e3dd7992679a6fbf3e02ad24313e4ff7557b5c Mon Sep 17 00:00:00 2001 From: fanpingan Date: Sat, 18 May 2024 14:52:11 +0800 Subject: [PATCH 2/4] Provide NDK api: OH_AVPlayer_SetAudioRendererInfo OH_AVPlayer_SetAudioInterruptMode Signed-off-by: fanpingan Change-Id: I544978f96b7427c01b6406a07b96a4f29df94e41 --- multimedia/player_framework/avplayer.h | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/multimedia/player_framework/avplayer.h b/multimedia/player_framework/avplayer.h index ccf929b1e..eae2a4577 100644 --- a/multimedia/player_framework/avplayer.h +++ b/multimedia/player_framework/avplayer.h @@ -319,20 +319,26 @@ OH_AVErrCode OH_AVPlayer_SetPlaybackSpeed(OH_AVPlayer *player, AVPlaybackSpeed s OH_AVErrCode OH_AVPlayer_GetPlaybackSpeed(OH_AVPlayer *player, AVPlaybackSpeed *speed); /** - * - * - * - * - * + * @brief Set the renderer information of the player's audio renderer + * @param player Pointer to an OH_AVPlayer instance + * @param streamUsage The value {@link OH_AudioStream_Usage} used for the stream usage of the player audio render. + * @return Function result code. + * {@link AV_ERR_OK} if the execution is successful. + * {@link AV_ERR_INVALID_VAL} if input player is nullptr or streamUsage value is invalid. + * @since 12 + * @version 1.0 */ OH_AVErrCode OH_AVPlayer_SetAudioRendererInfo(OH_AVPlayer *player, OH_AudioStream_Usage streamUsage); /** - * - * - * - * - * + * @brief Set the interruption mode of the player's audio stream + * @param player Pointer to an OH_AVPlayer instance + * @param interruptMode The value {@link OH_AudioInterrupt_Mode} used for the interruption mode of the player audio stream. + * @return Function result code. + * {@link AV_ERR_OK} if the execution is successful. + * {@link AV_ERR_INVALID_VAL} if input player is nullptr or interruptMode value is invalid. + * @since 12 + * @version 1.0 */ OH_AVErrCode OH_AVPlayer_SetAudioInterruptMode(OH_AVPlayer *player, OH_AudioInterrupt_Mode interruptMode); -- Gitee From ddeb4634b4e4331fa35d51c26bc175ccbacf22a7 Mon Sep 17 00:00:00 2001 From: fanpingan Date: Sat, 18 May 2024 16:14:43 +0800 Subject: [PATCH 3/4] Provide NDK api: OH_AVPlayer_SetAudioRendererInfo OH_AVPlayer_SetAudioInterruptMode Signed-off-by: fanpingan Change-Id: I1920be895eaaafaa1f02664c49e13cbd123d6bb3 --- multimedia/player_framework/avplayer.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/multimedia/player_framework/avplayer.h b/multimedia/player_framework/avplayer.h index eae2a4577..dd4018b79 100644 --- a/multimedia/player_framework/avplayer.h +++ b/multimedia/player_framework/avplayer.h @@ -333,7 +333,8 @@ OH_AVErrCode OH_AVPlayer_SetAudioRendererInfo(OH_AVPlayer *player, OH_AudioStrea /** * @brief Set the interruption mode of the player's audio stream * @param player Pointer to an OH_AVPlayer instance - * @param interruptMode The value {@link OH_AudioInterrupt_Mode} used for the interruption mode of the player audio stream. + * @param interruptMode The value {@link OH_AudioInterrupt_Mode} used for the interruption mode of + * the player audio stream. * @return Function result code. * {@link AV_ERR_OK} if the execution is successful. * {@link AV_ERR_INVALID_VAL} if input player is nullptr or interruptMode value is invalid. -- Gitee From 24952201ae7901302fc0dc7dc3492d801003054d Mon Sep 17 00:00:00 2001 From: fanpingan Date: Wed, 22 May 2024 16:06:17 +0800 Subject: [PATCH 4/4] Provide NDK api: OH_AVPlayer_SetAudioRendererInfo OH_AVPlayer_SetAudioInterruptMode Signed-off-by: fanpingan Change-Id: I7fb3e3c705c8bee121e73be28f7de114e40751dd --- multimedia/player_framework/avplayer.h | 13 +++++++++++++ .../player_framework/avplayer/libavplayer.ndk.json | 1 + 2 files changed, 14 insertions(+) diff --git a/multimedia/player_framework/avplayer.h b/multimedia/player_framework/avplayer.h index dd4018b79..f9c946449 100644 --- a/multimedia/player_framework/avplayer.h +++ b/multimedia/player_framework/avplayer.h @@ -343,6 +343,19 @@ OH_AVErrCode OH_AVPlayer_SetAudioRendererInfo(OH_AVPlayer *player, OH_AudioStrea */ OH_AVErrCode OH_AVPlayer_SetAudioInterruptMode(OH_AVPlayer *player, OH_AudioInterrupt_Mode interruptMode); +/** + * @brief Set the effect mode of the player's audio stream + * @param player Pointer to an OH_AVPlayer instance + * @param effectMode The value {@link OH_AudioStream_AudioEffectMode} used for the effect mode of + * the player audio stream. + * @return Function result code. + * {@link AV_ERR_OK} if the execution is successful. + * {@link AV_ERR_INVALID_VAL} if input player is nullptr or effectMode value is invalid. + * @since 12 + * @version 1.0 + */ +OH_AVErrCode OH_AVPlayer_SetAudioEffectMode(OH_AVPlayer *player, OH_AudioStream_AudioEffectMode effectMode); + /** * @brief set the bit rate use for hls player * diff --git a/multimedia/player_framework/avplayer/libavplayer.ndk.json b/multimedia/player_framework/avplayer/libavplayer.ndk.json index 399af3ebc..a8896d2e5 100644 --- a/multimedia/player_framework/avplayer/libavplayer.ndk.json +++ b/multimedia/player_framework/avplayer/libavplayer.ndk.json @@ -18,6 +18,7 @@ { "name": "OH_AVPlayer_GetPlaybackSpeed" }, { "name": "OH_AVPlayer_SetAudioRendererInfo"}, { "name": "OH_AVPlayer_SetAudioInterruptMode"}, + { "name": "OH_AVPlayer_SetAudioEffectMode"}, { "name": "OH_AVPlayer_SetVideoSurface" }, { "name": "OH_AVPlayer_SelectBitRate" }, { "name": "OH_AVPlayer_GetDuration" }, -- Gitee