From 4c1ca0d7634f0fbabb4e86fc1258d4cd467bd103 Mon Sep 17 00:00:00 2001 From: Nero-Hu Date: Fri, 22 Sep 2023 17:44:09 +0800 Subject: [PATCH 1/5] electron 4.2.3 --- ...irtcengine_isfeatureavailableondevice.dita | 3 +- ...i_irtcengineex_enablecontentinspectex.dita | 3 +- .../API/class_contentinspectconfig.dita | 2 + dita/RTC-NG/API/rtc_api_data_type.dita | 1 + dita/RTC-NG/RTC_NG_API_Electron.ditamap | 2 + .../config/keys-rtc-ng-api-electron.ditamap | 126 ++++++++++++++++++ .../config/relations-rtc-ng-api.ditamap | 2 +- 7 files changed, 134 insertions(+), 5 deletions(-) diff --git a/dita/RTC-NG/API/api_irtcengine_isfeatureavailableondevice.dita b/dita/RTC-NG/API/api_irtcengine_isfeatureavailableondevice.dita index 7a47ffdc91e..2c5bb56c89e 100644 --- a/dita/RTC-NG/API/api_irtcengine_isfeatureavailableondevice.dita +++ b/dita/RTC-NG/API/api_irtcengine_isfeatureavailableondevice.dita @@ -16,9 +16,8 @@ public abstract boolean isFeatureAvailableOnDevice(int type); - (BOOL)isFeatureAvailableOnDevice:(AgoraFeatureType)type; virtual bool isFeatureAvailableOnDevice(FeatureType type) = 0; - - abstract isFeatureAvailableOnDevice(type: FeatureType): boolean; + abstract isFeatureAvailableOnDevice(type: FeatureType): boolean; Future<bool> isFeatureAvailableOnDevice(FeatureType type);

diff --git a/dita/RTC-NG/API/api_irtcengineex_enablecontentinspectex.dita b/dita/RTC-NG/API/api_irtcengineex_enablecontentinspectex.dita index 6bfacf90f6f..db491b88a55 100644 --- a/dita/RTC-NG/API/api_irtcengineex_enablecontentinspectex.dita +++ b/dita/RTC-NG/API/api_irtcengineex_enablecontentinspectex.dita @@ -17,9 +17,8 @@ boolean enabled, ContentInspectConfig config, RtcConnection connection); - (int)enableContentInspectEx:(BOOL)enabled config:(AgoraContentInspectConfig* _Nonnull)config connection:(AgoraRtcConnection * _Nonnull)connection NS_SWIFT_NAME(enableContentInspectEx(_:config:connection:)); virtual int enableContentInspectEx(bool enabled, const media::ContentInspectConfig &config, const RtcConnection& connection) = 0; - - abstract enableContentInspectEx( + abstract enableContentInspectEx( enabled: boolean, config: ContentInspectConfig, connection: RtcConnection diff --git a/dita/RTC-NG/API/class_contentinspectconfig.dita b/dita/RTC-NG/API/class_contentinspectconfig.dita index 669324e188e..31d8e3e859a 100644 --- a/dita/RTC-NG/API/class_contentinspectconfig.dita +++ b/dita/RTC-NG/API/class_contentinspectconfig.dita @@ -59,6 +59,8 @@ extraInfo?: string; + serverConfig?: string; + modules?: ContentInspectModule[]; moduleCount?: number; diff --git a/dita/RTC-NG/API/rtc_api_data_type.dita b/dita/RTC-NG/API/rtc_api_data_type.dita index bce57be50b5..0cf9ca9055b 100644 --- a/dita/RTC-NG/API/rtc_api_data_type.dita +++ b/dita/RTC-NG/API/rtc_api_data_type.dita @@ -1820,6 +1820,7 @@
    • +
    • diff --git a/dita/RTC-NG/RTC_NG_API_Electron.ditamap b/dita/RTC-NG/RTC_NG_API_Electron.ditamap index 333363be4bf..00f38257a43 100644 --- a/dita/RTC-NG/RTC_NG_API_Electron.ditamap +++ b/dita/RTC-NG/RTC_NG_API_Electron.ditamap @@ -284,6 +284,7 @@ + @@ -676,6 +677,7 @@ + diff --git a/dita/RTC-NG/config/keys-rtc-ng-api-electron.ditamap b/dita/RTC-NG/config/keys-rtc-ng-api-electron.ditamap index 7bd23eef44b..fafbd21bc7d 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-electron.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-electron.ditamap @@ -3328,6 +3328,13 @@ + + + + enableContentInspectEx + + + @@ -3421,6 +3428,13 @@ + + + + isFeatureAvailableOnDevice + + + @@ -5607,6 +5621,13 @@ ContentInspectSupervise + + + + ContentInspectImageModeration + + + @@ -7967,6 +7988,27 @@ + + + + FeatureType + + + + + + + videoVirtualBackground + + + + + + + videoBeautyEffect + + + @@ -8401,6 +8443,62 @@ + + + + LocalVideoStreamErrorScreenCaptureWindowNotSupported + + + + + + + LocalVideoStreamErrorScreenCaptureNoPermission + + + + + + + LocalVideoStreamErrorScreenCapturePaused + + + + + + + LocalVideoStreamErrorScreenCaptureResumed + + + + + + + LocalVideoStreamErrorScreenCaptureWindowHidden + + + + + + + LocalVideoStreamErrorScreenCaptureWindowRecoverFromHidden + + + + + + + LocalVideoStreamErrorScreenCaptureWindowRecoverFromMinimized + + + + + + + LocalVideoStreamErrorScreenCaptureFailure + + + @@ -9192,6 +9290,13 @@ + + + + NetworkTypeMobile5g + + + @@ -10949,6 +11054,27 @@ + + + + VideoTextureId3d11texture2d + + + + + + + VideoTexture2d + + + + + + + VideoTextureOes + + + diff --git a/dita/RTC-NG/config/relations-rtc-ng-api.ditamap b/dita/RTC-NG/config/relations-rtc-ng-api.ditamap index 129a3994c2e..72f8fdad8ea 100644 --- a/dita/RTC-NG/config/relations-rtc-ng-api.ditamap +++ b/dita/RTC-NG/config/relations-rtc-ng-api.ditamap @@ -2293,7 +2293,7 @@ - + From f646142b58afd8cc2c3cd0eadae34a25ff5046b2 Mon Sep 17 00:00:00 2001 From: Nero-Hu Date: Fri, 22 Sep 2023 09:45:46 +0000 Subject: [PATCH 2/5] Sync cn prototype to en prototype --- en-US/dita/RTC-NG/API/class_contentinspectconfig.dita | 2 ++ 1 file changed, 2 insertions(+) diff --git a/en-US/dita/RTC-NG/API/class_contentinspectconfig.dita b/en-US/dita/RTC-NG/API/class_contentinspectconfig.dita index c0c449f5288..f2b6e1d9309 100644 --- a/en-US/dita/RTC-NG/API/class_contentinspectconfig.dita +++ b/en-US/dita/RTC-NG/API/class_contentinspectconfig.dita @@ -59,6 +59,8 @@ extraInfo?: string; + serverConfig?: string; + modules?: ContentInspectModule[]; moduleCount?: number; From a1301dac68e5295d20a1d62934e9b051eee4bf6d Mon Sep 17 00:00:00 2001 From: Suri539 Date: Mon, 25 Sep 2023 16:33:39 +0800 Subject: [PATCH 3/5] syn cn maps to en and add unity proto --- ...irtcengine_isfeatureavailableondevice.dita | 2 +- .../config/keys-rtc-ng-api-electron.ditamap | 149 +++++++++++++++++- .../RTC-NG/config/keys-rtc-ng-api-rn.ditamap | 62 +++++++- .../config/keys-rtc-ng-api-unity.ditamap | 149 +++++++++++++----- 4 files changed, 322 insertions(+), 40 deletions(-) diff --git a/dita/RTC-NG/API/api_irtcengine_isfeatureavailableondevice.dita b/dita/RTC-NG/API/api_irtcengine_isfeatureavailableondevice.dita index 2c5bb56c89e..1326b7c43e8 100644 --- a/dita/RTC-NG/API/api_irtcengine_isfeatureavailableondevice.dita +++ b/dita/RTC-NG/API/api_irtcengine_isfeatureavailableondevice.dita @@ -16,7 +16,7 @@ public abstract boolean isFeatureAvailableOnDevice(int type); - (BOOL)isFeatureAvailableOnDevice:(AgoraFeatureType)type; virtual bool isFeatureAvailableOnDevice(FeatureType type) = 0; - + public abstract bool IsFeatureAvailableOnDevice(FeatureType type); abstract isFeatureAvailableOnDevice(type: FeatureType): boolean; Future<bool> isFeatureAvailableOnDevice(FeatureType type);

    diff --git a/en-US/dita/RTC-NG/config/keys-rtc-ng-api-electron.ditamap b/en-US/dita/RTC-NG/config/keys-rtc-ng-api-electron.ditamap index e951addddab..fb072612816 100644 --- a/en-US/dita/RTC-NG/config/keys-rtc-ng-api-electron.ditamap +++ b/en-US/dita/RTC-NG/config/keys-rtc-ng-api-electron.ditamap @@ -736,7 +736,7 @@ - + setPlayerOptionInString @@ -2742,6 +2742,13 @@ + + + + setPlaybackDeviceMute + + + @@ -2805,6 +2812,13 @@ + + + + getPlaybackDeviceMute + + + @@ -2921,6 +2935,13 @@ + + + + adjustCustomAudioPlayoutVolume + + + @@ -3307,6 +3328,13 @@ + + + + enableContentInspectEx + + + @@ -3400,6 +3428,13 @@ + + + + isFeatureAvailableOnDevice + + + @@ -5586,6 +5621,13 @@ ContentInspectSupervise + + + + ContentInspectImageModeration + + + @@ -7946,6 +7988,27 @@ + + + + FeatureType + + + + + + + videoVirtualBackground + + + + + + + videoBeautyEffect + + + @@ -8380,6 +8443,62 @@ + + + + LocalVideoStreamErrorScreenCaptureWindowNotSupported + + + + + + + LocalVideoStreamErrorScreenCaptureNoPermission + + + + + + + LocalVideoStreamErrorScreenCapturePaused + + + + + + + LocalVideoStreamErrorScreenCaptureResumed + + + + + + + LocalVideoStreamErrorScreenCaptureWindowHidden + + + + + + + LocalVideoStreamErrorScreenCaptureWindowRecoverFromHidden + + + + + + + LocalVideoStreamErrorScreenCaptureWindowRecoverFromMinimized + + + + + + + LocalVideoStreamErrorScreenCaptureFailure + + + @@ -9171,6 +9290,13 @@ + + + + NetworkTypeMobile5g + + + @@ -10928,6 +11054,27 @@ + + + + VideoTextureId3d11texture2d + + + + + + + VideoTexture2d + + + + + + + VideoTextureOes + + + diff --git a/en-US/dita/RTC-NG/config/keys-rtc-ng-api-rn.ditamap b/en-US/dita/RTC-NG/config/keys-rtc-ng-api-rn.ditamap index 80c469b281d..dad044489bf 100644 --- a/en-US/dita/RTC-NG/config/keys-rtc-ng-api-rn.ditamap +++ b/en-US/dita/RTC-NG/config/keys-rtc-ng-api-rn.ditamap @@ -764,7 +764,7 @@ - + setPlayerOptionInString @@ -2901,6 +2901,15 @@ + + + + + adjustCustomAudioPlayoutVolume + + + + @@ -3302,6 +3311,13 @@ + + + + enableContentInspectEx + + + @@ -3381,6 +3397,13 @@ + + + + isFeatureAvailableOnDevice + + + @@ -5536,6 +5559,13 @@ ContentInspectSupervise + + + + ContentInspectImageModeration + + + @@ -7896,6 +7926,27 @@ + + + + FeatureType + + + + + + + videoVirtualBackground + + + + + + + videoBeautyEffect + + + @@ -9142,6 +9193,13 @@ + + + + NetworkTypeMobile5g + + + @@ -11928,4 +11986,4 @@ - \ No newline at end of file + diff --git a/en-US/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap b/en-US/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap index 8aff11849b6..c287eff3549 100644 --- a/en-US/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap +++ b/en-US/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap @@ -724,14 +724,14 @@ - + SetPlayerOption [1/2] - + setPlayerOption [2/2] @@ -3237,14 +3237,14 @@ - + SetPlaybackDeviceMute - + GetPlaybackDeviceMute @@ -3339,6 +3339,13 @@ + + + + AdjustCustomAudioPlayoutVolume + + + @@ -3431,7 +3438,7 @@ - + Preload [2/2] @@ -3515,14 +3522,14 @@ - + GetInternalSongCode - + GetSongSimpleInfo @@ -3573,7 +3580,7 @@ - + OnSongSimpleInfoResult @@ -3596,6 +3603,13 @@ + + + + EnableContentInspectEx + + + @@ -3747,6 +3761,13 @@ + + + + IsFeatureAvailableOnDevice + + + @@ -4423,20 +4444,6 @@ - - - - GetObservedFramePosition - - - - - - - GetVideoFormatPreference - - - @@ -4497,20 +4504,13 @@ - + GetMaxMetadataSize - - - - OnReadyToSendMetadata - - - @@ -6947,17 +6947,17 @@ - + - CONTENT_INSPECT_MODERATION + CONTENT_INSPECT_SUPERVISE - + - CONTENT_INSPECT_SUPERVISION + CONTENT_INSPECT_IMAGE_MODERATION @@ -8340,6 +8340,27 @@ + + + + FeatureType + + + + + + + VIDEO_VIRTUAL_BACKGROUND + + + + + + + VIDEO_BEAUTY_EFFECT + + + @@ -8767,6 +8788,13 @@ + + + + LOCAL_VIDEO_STREAM_ERROR_DEVICE_SYSTEM_PRESSURE + + + @@ -8774,10 +8802,45 @@ - + - LOCAL_VIDEO_STREAM_ERROR_DEVICE_SYSTEM_PRESSURE + LOCAL_VIDEO_STREAM_ERROR_SCREEN_CAPTURE_NO_PERMISSION + + + + + + + LOCAL_VIDEO_STREAM_ERROR_SCREEN_CAPTURE_PAUSED + + + + + + + LOCAL_VIDEO_STREAM_ERROR_SCREEN_CAPTURE_RESUMED + + + + + + + LOCAL_VIDEO_STREAM_ERROR_SCREEN_CAPTURE_WINDOW_HIDDEN + + + + + + + LOCAL_VIDEO_STREAM_ERROR_SCREEN_CAPTURE_WINDOW_RECOVER_FROM_HIDDEN + + + + + + + LOCAL_VIDEO_STREAM_ERROR_SCREEN_CAPTURE_WINDOW_RECOVER_FROM_MINIMIZED @@ -9684,6 +9747,13 @@ + + + + NETWORK_TYPE_MOBILE_5G + + + @@ -11644,6 +11714,13 @@ + + + + VIDEO_TEXTURE_ID3D11TEXTURE2D + + + From 8cf606abef4121948f54c0903cf2da2b087c3273 Mon Sep 17 00:00:00 2001 From: Suri539 Date: Mon, 25 Sep 2023 16:39:09 +0800 Subject: [PATCH 4/5] update cpp en maps and fix --- ...i_irtcengineex_enablecontentinspectex.dita | 2 +- .../RTC-NG/config/keys-rtc-ng-api-cpp.ditamap | 121 +++++++++++++++--- 2 files changed, 105 insertions(+), 18 deletions(-) diff --git a/dita/RTC-NG/API/api_irtcengineex_enablecontentinspectex.dita b/dita/RTC-NG/API/api_irtcengineex_enablecontentinspectex.dita index db491b88a55..09261c5a08a 100644 --- a/dita/RTC-NG/API/api_irtcengineex_enablecontentinspectex.dita +++ b/dita/RTC-NG/API/api_irtcengineex_enablecontentinspectex.dita @@ -17,7 +17,7 @@ boolean enabled, ContentInspectConfig config, RtcConnection connection);     - (int)enableContentInspectEx:(BOOL)enabled config:(AgoraContentInspectConfig* _Nonnull)config connection:(AgoraRtcConnection * _Nonnull)connection NS_SWIFT_NAME(enableContentInspectEx(_:config:connection:)); virtual int enableContentInspectEx(bool enabled, const media::ContentInspectConfig &config, const RtcConnection& connection) = 0; - + public abstract int EnableContentInspectEx(bool enabled, ContentInspectConfig config, RtcConnection connection); abstract enableContentInspectEx( enabled: boolean, config: ContentInspectConfig, diff --git a/en-US/dita/RTC-NG/config/keys-rtc-ng-api-cpp.ditamap b/en-US/dita/RTC-NG/config/keys-rtc-ng-api-cpp.ditamap index 60e15a128d6..f9d043e0e5b 100644 --- a/en-US/dita/RTC-NG/config/keys-rtc-ng-api-cpp.ditamap +++ b/en-US/dita/RTC-NG/config/keys-rtc-ng-api-cpp.ditamap @@ -785,7 +785,7 @@ - + setPlayerOption @@ -3413,21 +3413,17 @@ - + - href="../API/api_iaudiodevicemanager_setplaybackdevicemute.dita" - setPlaybackDeviceMute - + setPlaybackDeviceMute - + - href="../API/api_iaudiodevicemanager_getplaybackdevicemute.dita" - getPlaybackDeviceMute - + getPlaybackDeviceMute @@ -3569,6 +3565,13 @@ + + + + adjustCustomAudioPlayoutVolume + + + @@ -3875,6 +3878,13 @@ + + + + enableContentInspectEx + + + @@ -3905,13 +3915,6 @@ - - - - removeInjectStreamUrl - - - @@ -4017,6 +4020,13 @@ + + + + isFeatureAvailableOnDevice + + + @@ -6274,6 +6284,13 @@ + + + + CONTENT_INSPECT_IMAGE_MODERATION + + + @@ -8710,6 +8727,27 @@ + + + + FeatureType + + + + + + + VIDEO_VIRTUAL_BACKGROUND + + + + + + + VIDEO_BEAUTY_EFFECT + + + @@ -9144,6 +9182,48 @@ + + + + LOCAL_VIDEO_STREAM_ERROR_SCREEN_CAPTURE_NO_PERMISSION + + + + + + + LOCAL_VIDEO_STREAM_ERROR_SCREEN_CAPTURE_PAUSED + + + + + + + LOCAL_VIDEO_STREAM_ERROR_SCREEN_CAPTURE_RESUMED + + + + + + + LOCAL_VIDEO_STREAM_ERROR_SCREEN_CAPTURE_WINDOW_HIDDEN + + + + + + + LOCAL_VIDEO_STREAM_ERROR_SCREEN_CAPTURE_WINDOW_RECOVER_FROM_HIDDEN + + + + + + + LOCAL_VIDEO_STREAM_ERROR_SCREEN_CAPTURE_WINDOW_RECOVER_FROM_MINIMIZED + + + @@ -11821,7 +11901,7 @@ - VideoContentHint + VIDEO_CONTENT_HINT @@ -12077,6 +12157,13 @@ + + + + VIDEO_TEXTURE_ID3D11TEXTURE2D + + + From bcaf7c6a13506974bd79a1aa853880527547c797 Mon Sep 17 00:00:00 2001 From: Suri539 Date: Mon, 25 Sep 2023 08:55:33 +0000 Subject: [PATCH 5/5] Sync cn prototype to en prototype --- .../API/api_irtcengine_isfeatureavailableondevice.dita | 7 +++---- .../API/api_irtcengineex_enablecontentinspectex.dita | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/en-US/dita/RTC-NG/API/api_irtcengine_isfeatureavailableondevice.dita b/en-US/dita/RTC-NG/API/api_irtcengine_isfeatureavailableondevice.dita index ca576b6caed..ae0a0f86647 100644 --- a/en-US/dita/RTC-NG/API/api_irtcengine_isfeatureavailableondevice.dita +++ b/en-US/dita/RTC-NG/API/api_irtcengine_isfeatureavailableondevice.dita @@ -15,10 +15,9 @@

    public abstract boolean isFeatureAvailableOnDevice(int type); - (BOOL)isFeatureAvailableOnDevice:(AgoraFeatureType)type; - virtual bool isFeatureAvailableOnDevice(FeatureType type) = 0; - - - abstract isFeatureAvailableOnDevice(type: FeatureType): boolean; + virtual bool isFeatureAvailableOnDevice(FeatureType type) = 0; + public abstract bool IsFeatureAvailableOnDevice(FeatureType type); + abstract isFeatureAvailableOnDevice(type: FeatureType): boolean; Future<bool> isFeatureAvailableOnDevice(FeatureType type);

    diff --git a/en-US/dita/RTC-NG/API/api_irtcengineex_enablecontentinspectex.dita b/en-US/dita/RTC-NG/API/api_irtcengineex_enablecontentinspectex.dita index 293f4d5c939..dc327aee1ea 100644 --- a/en-US/dita/RTC-NG/API/api_irtcengineex_enablecontentinspectex.dita +++ b/en-US/dita/RTC-NG/API/api_irtcengineex_enablecontentinspectex.dita @@ -16,10 +16,9 @@ public abstract int enableContentInspectEx( boolean enabled, ContentInspectConfig config, RtcConnection connection); - (int)enableContentInspectEx:(BOOL)enabled config:(AgoraContentInspectConfig* _Nonnull)config connection:(AgoraRtcConnection * _Nonnull)connection NS_SWIFT_NAME(enableContentInspectEx(_:config:connection:)); - virtual int enableContentInspectEx(bool enabled, const media::ContentInspectConfig &config, const RtcConnection& connection) = 0; - - - abstract enableContentInspectEx( + virtual int enableContentInspectEx(bool enabled, const media::ContentInspectConfig &config, const RtcConnection& connection) = 0; + public abstract int EnableContentInspectEx(bool enabled, ContentInspectConfig config, RtcConnection connection); + abstract enableContentInspectEx( enabled: boolean, config: ContentInspectConfig, connection: RtcConnection