NMS-20533

temp
AgoraIO · Oct 17, 2024 · f9aa027 · f9aa027
1 parent adcb942
commit f9aa027
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 34 deletions.
diff --git a/dita/RTC-NG/API/api_irtcengine_startscreencapturebywindowid.dita b/dita/RTC-NG/API/api_irtcengine_startscreencapturebywindowid.dita
@@ -18,7 +18,7 @@
             <codeblock props="mac" outputclass="language-objectivec">- (int)startScreenCaptureByWindowId:(UInt32)windowId
                 regionRect:(CGRect)regionRect
                 captureParams:(AgoraScreenCaptureParameters *_Nonnull)captureParams;</codeblock>
-            <codeblock props="cpp unreal" outputclass="language-cpp">virtual int startScreenCaptureByWindowId(view_t windowId,
+            <codeblock props="cpp unreal" outputclass="language-cpp">virtual int startScreenCaptureByWindowId(int64_t windowId,
                 const Rectangle&amp; regionRect,
                 const ScreenCaptureParameters&amp; captureParams) = 0;</codeblock>
          <codeblock props="bp" outputclass="language-cpp">UFUNCTION(BlueprintCallable, Category = &quot;Agora|IRtcEngine&quot;)

diff --git a/dita/RTC-NG/API/callback_irtcengineeventhandler_onlocalvideostatechanged.dita b/dita/RTC-NG/API/callback_irtcengineeventhandler_onlocalvideostatechanged.dita
@@ -104,6 +104,7 @@
                         <li>当前 App 已被切换到后台。可以使用前台服务通知操作系统，确保 App 在切换到后台时仍可采集视频。<ph props="cn">详见<xref keyref="android-background"/>。</ph></li>
                     </ul></li>
                     <li><ph keyref="LOCAL_VIDEO_STREAM_REASON_DEVICE_FATAL_ERROR"/> (15)：视频采集设备出错。请提示用户关闭并重新启动摄像头以恢复功能，如果该操作不能解决问题，请检查摄像头是否出现硬件故障。</li>
+                    <li><ph keyref="LOCAL_VIDEO_STREAM_REASON_SCREEN_CAPTURE_FAILURE"/> (21)：当前采集的窗口无数据。</li>
                     </ul> </p>
                 </pd>
             </plentry>

diff --git a/dita/RTC-NG/API/class_screencaptureconfiguration.dita b/dita/RTC-NG/API/class_screencaptureconfiguration.dita
@@ -26,9 +26,9 @@ __attribute__((visibility("default"))) @interface AgoraScreenCaptureConfiguratio
 #endif</codeblock>
             <codeblock props="cpp unreal" outputclass="language-cpp">struct ScreenCaptureConfiguration {
   bool isCaptureWindow;
-  uint32_t displayId;
+  int64_t displayId;
   Rectangle screenRect;
-  view_t windowId;
+  int64_t windowId;
   ScreenCaptureParameters params;
   Rectangle regionRect;
 

diff --git a/dita/RTC-NG/API/class_screencapturesourceinfo.dita b/dita/RTC-NG/API/class_screencapturesourceinfo.dita
@@ -22,22 +22,23 @@
 @end
 </codeblock>
             <codeblock props="cpp unreal" outputclass="language-cpp">struct ScreenCaptureSourceInfo {
-    ScreenCaptureSourceType type;
-    view_t sourceId;
-    const char* sourceName;
-    ThumbImageBuffer thumbImage;
-    ThumbImageBuffer iconImage;
-    const char* processPath;
-    const char* sourceTitle;
-    bool primaryMonitor;
+  ScreenCaptureSourceType type;
+  int64_t sourceId;
+  const char* sourceName;
+  ThumbImageBuffer thumbImage;
+  ThumbImageBuffer iconImage;
+  const char* processPath;
+  const char* sourceTitle;
+  bool primaryMonitor;
+  bool isOccluded;
+  Rectangle position;
 #if defined(_WIN32)
-    Rectangle position;
-    bool minimizeWindow;
-    view_t sourceDisplayId;
-  ScreenCaptureSourceInfo() : type(ScreenCaptureSourceType_Unknown), sourceId(nullptr), sourceName(nullptr),
-                              processPath(nullptr), sourceTitle(nullptr), primaryMonitor(false), isOccluded(false), minimizeWindow(false), sourceDisplayId((view_t)-2) {}
+  bool minimizeWindow;
+  int64_t sourceDisplayId;
+  ScreenCaptureSourceInfo() : type(ScreenCaptureSourceType_Unknown), sourceId(0), sourceName(nullptr),
+                              processPath(nullptr), sourceTitle(nullptr), primaryMonitor(false), isOccluded(false), minimizeWindow(false), sourceDisplayId(-2) {}
 #else
-  ScreenCaptureSourceInfo() : type(ScreenCaptureSourceType_Unknown), sourceId(nullptr), sourceName(nullptr), processPath(nullptr), sourceTitle(nullptr), primaryMonitor(false), isOccluded(false) {}
+  ScreenCaptureSourceInfo() : type(ScreenCaptureSourceType_Unknown), sourceId(0), sourceName(nullptr), processPath(nullptr), sourceTitle(nullptr), primaryMonitor(false), isOccluded(false) {}
 #endif
 };</codeblock>
          <codeblock props="bp" outputclass="language-cpp">USTRUCT(BlueprintType)

diff --git a/dita/RTC-NG/API/enum_localvideostreamreason.dita b/dita/RTC-NG/API/enum_localvideostreamreason.dita
@@ -98,7 +98,7 @@
             </plentry>
             <plentry props="cpp unreal bp flutter unity electron">
                 <pt><ph keyref="LOCAL_VIDEO_STREAM_REASON_SCREEN_CAPTURE_FAILURE"/></pt>
-                <pd>21：（仅适用于 Windows）当前采集的窗口无数据。</pd>
+                <pd>21：（仅适用于 Windows 和 Android）当前采集的窗口无数据。</pd>
             </plentry>
                 <plentry props="cpp unreal bp flutter unity electron">
                     <pt><ph keyref="LOCAL_VIDEO_STREAM_REASON_SCREEN_CAPTURE_NO_PERMISSION"/></pt>

diff --git a/dita/RTC-NG/RTC_NG_API_iOS.ditamap b/dita/RTC-NG/RTC_NG_API_iOS.ditamap
@@ -90,6 +90,10 @@
             <topicref keyref="onUserOffline" toc="no"/>
         </topicref>
         <topicref href="API/toc_publishnsubscribe.dita" chunk="to-content">
+            <topicref keyref="enableDualStreamMode" toc="no"/>
+            <topicref keyref="enableDualStreamMode2" toc="no" processing-role="resource-only"/>
+            <topicref keyref="enableDualStreamMode3" toc="no"/>
+            <topicref keyref="enableDualStreamModeEx" toc="no"/>
             <topicref keyref="muteAllRemoteAudioStreams" toc="no"/>
             <topicref keyref="muteAllRemoteAudioStreamsEx" toc="no"/>
             <topicref keyref="muteAllRemoteVideoStreams" toc="no"/>
@@ -102,6 +106,12 @@
             <topicref keyref="muteRemoteAudioStreamEx" toc="no"/>
             <topicref keyref="muteRemoteVideoStream" toc="no"/>
             <topicref keyref="muteRemoteVideoStreamEx" toc="no"/>
+            <topicref keyref="setDualStreamMode" toc="no"/>
+            <topicref keyref="setDualStreamMode2" toc="no"/>
+            <topicref keyref="setDualStreamModeEx" toc="no"/>
+            <topicref keyref="setRemoteDefaultVideoStreamType" toc="no"/>
+            <topicref keyref="setRemoteVideoStreamType" toc="no"/>
+            <topicref keyref="setRemoteVideoStreamTypeEx" toc="no"/>
             <topicref keyref="setRemoteVideoSubscriptionOptions" toc="no"/>
             <topicref keyref="setRemoteVideoSubscriptionOptionsEx" toc="no"/>
             <topicref keyref="setSubscribeAudioAllowlist" toc="no"/>
@@ -309,6 +319,12 @@
                     <topicref keyref="enableVirtualBackground" toc="no"/>
                     <topicref keyref="enableVirtualBackground2" toc="no"/>
                 </topicref>
+                <topicref href="API/toc_local_transcoder.dita" chunk="to-content">
+                    <topicref keyref="startLocalVideoTranscoder" toc="no"/>
+                    <topicref keyref="stopLocalVideoTranscoder" toc="no"/>
+                    <topicref keyref="updateLocalTranscoderConfiguration" toc="no"/>
+                    <topicref keyref="onLocalVideoTranscoderError" toc="no"/>
+                </topicref>
                 <topicref href="API/toc_video_enhance_option.dita" chunk="to-content">
                     <topicref keyref="setBeautyEffectOptions" toc="no"/>
                     <topicref keyref="setBeautyEffectOptions2" toc="no"/>
@@ -344,22 +360,6 @@
             </topicref>
             <topicref href="API/toc_video_codec.dita" chunk="to-content">
                 <topicref href="API/toc_dual_stream.dita" chunk="to-content">
-                    <topicref keyref="enableDualStreamMode" toc="no"/>
-                    <topicref keyref="enableDualStreamMode2" toc="no" processing-role="resource-only"/>
-                    <topicref keyref="enableDualStreamMode3" toc="no"/>
-                    <topicref keyref="enableDualStreamModeEx" toc="no"/>
-                    <topicref keyref="setDualStreamMode" toc="no"/>
-                    <topicref keyref="setDualStreamMode2" toc="no"/>
-                    <topicref keyref="setDualStreamModeEx" toc="no"/>
-                    <topicref keyref="setRemoteDefaultVideoStreamType" toc="no"/>
-                    <topicref keyref="setRemoteVideoStreamType" toc="no"/>
-                    <topicref keyref="setRemoteVideoStreamTypeEx" toc="no"/>
-                </topicref>
-                <topicref href="API/toc_local_transcoder.dita" chunk="to-content">
-                    <topicref keyref="startLocalVideoTranscoder" toc="no"/>
-                    <topicref keyref="stopLocalVideoTranscoder" toc="no"/>
-                    <topicref keyref="updateLocalTranscoderConfiguration" toc="no"/>
-                    <topicref keyref="onLocalVideoTranscoderError" toc="no"/>
                 </topicref>
             </topicref>
             <topicref href="API/toc_video_rendering.dita" chunk="to-content">

diff --git a/dita/RTC-NG/config/keys-rtc-ng-api-java.ditamap b/dita/RTC-NG/config/keys-rtc-ng-api-java.ditamap
@@ -8774,6 +8774,13 @@
                 </keywords>
             </topicmeta>
         </keydef>
+        <keydef keys="LOCAL_VIDEO_STREAM_REASON_SCREEN_CAPTURE_FAILURE">
+            <topicmeta>
+                <keywords>
+                    <keyword>LOCAL_VIDEO_STREAM_REASON_SCREEN_CAPTURE_FAILURE</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
         <keydef keys="LOCAL_VIDEO_STREAM_STATE_STOPPED">
             <topicmeta>
                 <keywords>