From 16ff6620d7dbcd3dd79cf2b42dc2fc142a3e495b Mon Sep 17 00:00:00 2001 From: AOL Date: Thu, 11 Aug 2022 02:22:17 +0000 Subject: [PATCH 1/4] add audio syscap Signed-off-by: magekkkk --- include/syscap_define.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/syscap_define.h b/include/syscap_define.h index d74ef83..a1f59d2 100644 --- a/include/syscap_define.h +++ b/include/syscap_define.h @@ -135,6 +135,12 @@ typedef enum SystemCapabilityNum { MULTIMEDIA_MEDIA_VIDEOPLAYER, MULTIMEDIA_MEDIA_VIDEORECORDER, MULTIMEDIA_AV_SESSION, + MULTIMEDIA_AUDIO_CORE, + MULTIMEDIA_AUDIO_RENDERER, + MULTIMEDIA_AUDIO_CAPTURER, + MULTIMEDIA_AUDIO_DEVICE, + MULTIMEDIA_AUDIO_VOLUME, + MULTIMEDIA_AUDIO_COMMUNICATION, MULTIMODALINPUT_INPUT, NOTIFICATION_COMMONEVENT, NOTIFICATION_EMITTER, @@ -308,6 +314,12 @@ const static SyscapWithNum g_arraySyscap[] = { {"SystemCapability.Multimedia.Media.VideoPlayer", MULTIMEDIA_MEDIA_VIDEOPLAYER}, {"SystemCapability.Multimedia.Media.VideoRecorder", MULTIMEDIA_MEDIA_VIDEORECORDER}, {"SystemCapability.Multimedia.AVSession", MULTIMEDIA_AV_SESSION}, + {"SystemCapability.Multimedia.Audio.Core", MULTIMEDIA_AUDIO_CORE}, + {"SystemCapability.Multimedia.Audio.Renderer", MULTIMEDIA_AUDIO_RENDERER}, + {"SystemCapability.Multimedia.Audio.Capturer", MULTIMEDIA_AUDIO_CAPTURER}, + {"SystemCapability.Multimedia.Audio.Device", MULTIMEDIA_AUDIO_DEVICE}, + {"SystemCapability.Multimedia.Audio.Volume", MULTIMEDIA_AUDIO_VOLUME}, + {"SystemCapability.Multimedia.Audio.Communication", MULTIMEDIA_AUDIO_COMMUNICATION}, {"SystemCapability.multimodalinput.input", MULTIMODALINPUT_INPUT}, {"SystemCapability.Notification.CommonEvent", NOTIFICATION_COMMONEVENT}, {"SystemCapability.Notification.Emitter", NOTIFICATION_EMITTER}, -- Gitee From b23c9016b1219eaa84c0f54681c5d2f114a9aea6 Mon Sep 17 00:00:00 2001 From: AOL Date: Thu, 11 Aug 2022 02:23:48 +0000 Subject: [PATCH 2/4] fix format issue for audio syscap Signed-off-by: magekkkk --- include/syscap_define.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/syscap_define.h b/include/syscap_define.h index a1f59d2..e575978 100644 --- a/include/syscap_define.h +++ b/include/syscap_define.h @@ -315,11 +315,11 @@ const static SyscapWithNum g_arraySyscap[] = { {"SystemCapability.Multimedia.Media.VideoRecorder", MULTIMEDIA_MEDIA_VIDEORECORDER}, {"SystemCapability.Multimedia.AVSession", MULTIMEDIA_AV_SESSION}, {"SystemCapability.Multimedia.Audio.Core", MULTIMEDIA_AUDIO_CORE}, - {"SystemCapability.Multimedia.Audio.Renderer", MULTIMEDIA_AUDIO_RENDERER}, - {"SystemCapability.Multimedia.Audio.Capturer", MULTIMEDIA_AUDIO_CAPTURER}, - {"SystemCapability.Multimedia.Audio.Device", MULTIMEDIA_AUDIO_DEVICE}, - {"SystemCapability.Multimedia.Audio.Volume", MULTIMEDIA_AUDIO_VOLUME}, - {"SystemCapability.Multimedia.Audio.Communication", MULTIMEDIA_AUDIO_COMMUNICATION}, + {"SystemCapability.Multimedia.Audio.Renderer", MULTIMEDIA_AUDIO_RENDERER}, + {"SystemCapability.Multimedia.Audio.Capturer", MULTIMEDIA_AUDIO_CAPTURER}, + {"SystemCapability.Multimedia.Audio.Device", MULTIMEDIA_AUDIO_DEVICE}, + {"SystemCapability.Multimedia.Audio.Volume", MULTIMEDIA_AUDIO_VOLUME}, + {"SystemCapability.Multimedia.Audio.Communication", MULTIMEDIA_AUDIO_COMMUNICATION}, {"SystemCapability.multimodalinput.input", MULTIMODALINPUT_INPUT}, {"SystemCapability.Notification.CommonEvent", NOTIFICATION_COMMONEVENT}, {"SystemCapability.Notification.Emitter", NOTIFICATION_EMITTER}, -- Gitee From 2716790741dc544c14880cefb9b24f5d4b273c45 Mon Sep 17 00:00:00 2001 From: AOL Date: Thu, 11 Aug 2022 02:36:14 +0000 Subject: [PATCH 3/4] update add position for audio syscap Signed-off-by: magekkkk --- include/syscap_define.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/include/syscap_define.h b/include/syscap_define.h index e575978..58d5055 100644 --- a/include/syscap_define.h +++ b/include/syscap_define.h @@ -136,11 +136,6 @@ typedef enum SystemCapabilityNum { MULTIMEDIA_MEDIA_VIDEORECORDER, MULTIMEDIA_AV_SESSION, MULTIMEDIA_AUDIO_CORE, - MULTIMEDIA_AUDIO_RENDERER, - MULTIMEDIA_AUDIO_CAPTURER, - MULTIMEDIA_AUDIO_DEVICE, - MULTIMEDIA_AUDIO_VOLUME, - MULTIMEDIA_AUDIO_COMMUNICATION, MULTIMODALINPUT_INPUT, NOTIFICATION_COMMONEVENT, NOTIFICATION_EMITTER, @@ -199,6 +194,11 @@ typedef enum SystemCapabilityNum { LOCATION_LOCATION_GEOFENCE, LOCATION_LOCATION_GEOCODER, LOCATION_LOCATION_LITE, + MULTIMEDIA_AUDIO_RENDERER, + MULTIMEDIA_AUDIO_CAPTURER, + MULTIMEDIA_AUDIO_DEVICE, + MULTIMEDIA_AUDIO_VOLUME, + MULTIMEDIA_AUDIO_COMMUNICATION, // Add here SYSCAP_NUM_MAX = 960 } SyscapNum; @@ -314,12 +314,6 @@ const static SyscapWithNum g_arraySyscap[] = { {"SystemCapability.Multimedia.Media.VideoPlayer", MULTIMEDIA_MEDIA_VIDEOPLAYER}, {"SystemCapability.Multimedia.Media.VideoRecorder", MULTIMEDIA_MEDIA_VIDEORECORDER}, {"SystemCapability.Multimedia.AVSession", MULTIMEDIA_AV_SESSION}, - {"SystemCapability.Multimedia.Audio.Core", MULTIMEDIA_AUDIO_CORE}, - {"SystemCapability.Multimedia.Audio.Renderer", MULTIMEDIA_AUDIO_RENDERER}, - {"SystemCapability.Multimedia.Audio.Capturer", MULTIMEDIA_AUDIO_CAPTURER}, - {"SystemCapability.Multimedia.Audio.Device", MULTIMEDIA_AUDIO_DEVICE}, - {"SystemCapability.Multimedia.Audio.Volume", MULTIMEDIA_AUDIO_VOLUME}, - {"SystemCapability.Multimedia.Audio.Communication", MULTIMEDIA_AUDIO_COMMUNICATION}, {"SystemCapability.multimodalinput.input", MULTIMODALINPUT_INPUT}, {"SystemCapability.Notification.CommonEvent", NOTIFICATION_COMMONEVENT}, {"SystemCapability.Notification.Emitter", NOTIFICATION_EMITTER}, @@ -371,6 +365,12 @@ const static SyscapWithNum g_arraySyscap[] = { {"SystemCapability.UserIAM.UserAuth.PinAuth", USERIAM_USERAUTH_PINAUTH}, {"SystemCapability.UserIAM.UserIdm", USERIAM_USERIDM}, {"SystemCapability.Security.CertificateManager", SECURITY_CERTIFICATE_MANAGER}, + {"SystemCapability.Multimedia.Audio.Core", MULTIMEDIA_AUDIO_CORE}, + {"SystemCapability.Multimedia.Audio.Renderer", MULTIMEDIA_AUDIO_RENDERER}, + {"SystemCapability.Multimedia.Audio.Capturer", MULTIMEDIA_AUDIO_CAPTURER}, + {"SystemCapability.Multimedia.Audio.Device", MULTIMEDIA_AUDIO_DEVICE}, + {"SystemCapability.Multimedia.Audio.Volume", MULTIMEDIA_AUDIO_VOLUME}, + {"SystemCapability.Multimedia.Audio.Communication", MULTIMEDIA_AUDIO_COMMUNICATION}, }; #endif // _SYSCAP_DEFINE_H -- Gitee From 017cd7a687fd03de8a4b4ed7256f769162308dd0 Mon Sep 17 00:00:00 2001 From: AOL Date: Thu, 11 Aug 2022 02:37:11 +0000 Subject: [PATCH 4/4] update position Signed-off-by: magekkkk --- include/syscap_define.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/syscap_define.h b/include/syscap_define.h index 58d5055..51b1efe 100644 --- a/include/syscap_define.h +++ b/include/syscap_define.h @@ -135,7 +135,6 @@ typedef enum SystemCapabilityNum { MULTIMEDIA_MEDIA_VIDEOPLAYER, MULTIMEDIA_MEDIA_VIDEORECORDER, MULTIMEDIA_AV_SESSION, - MULTIMEDIA_AUDIO_CORE, MULTIMODALINPUT_INPUT, NOTIFICATION_COMMONEVENT, NOTIFICATION_EMITTER, @@ -194,6 +193,7 @@ typedef enum SystemCapabilityNum { LOCATION_LOCATION_GEOFENCE, LOCATION_LOCATION_GEOCODER, LOCATION_LOCATION_LITE, + MULTIMEDIA_AUDIO_CORE, MULTIMEDIA_AUDIO_RENDERER, MULTIMEDIA_AUDIO_CAPTURER, MULTIMEDIA_AUDIO_DEVICE, -- Gitee