Merge branch 'release/4.2.2.sp' into dev/electron22

AgoraIO-Extensions · Sep 7, 2023 · a947d1b · a947d1b
2 parents a156062 + d285b63
commit a947d1b
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 
 
+## [4.2.2-build.134-dev.1](https://github.com/AgoraIO-Extensions/Electron-SDK/compare/v4.2.2-build.133-rc.1...v4.2.2-build.134-dev.1) (2023-09-05)
+
+## [4.2.2-build.133-rc.1](https://github.com/AgoraIO-Extensions/Electron-SDK/compare/v4.2.2-build.132-rc.1...v4.2.2-build.133-rc.1) (2023-09-05)
+
+## [4.2.2-build.132-rc.1](https://github.com/AgoraIO-Extensions/Electron-SDK/compare/v4.2.2-build.130-rc.1...v4.2.2-build.132-rc.1) (2023-09-01)
+
 ## [4.2.2-build.130-rc.1](https://github.com/AgoraIO-Extensions/Electron-SDK/compare/v4.2.2-build.1-rc.2...v4.2.2-build.130-rc.1) (2023-08-25)
 
 

diff --git a/example/package.json b/example/package.json
@@ -65,7 +65,7 @@
     ]
   },
   "dependencies": {
-    "agora-electron-sdk": "4.2.2-build.130-rc.1",
+    "agora-electron-sdk": "4.2.2-build.134-dev.1",
     "antd": "^4.20.3",
     "download": "^8.0.0",
     "ffi-napi": "^4.0.3",

diff --git a/example/yarn.lock b/example/yarn.lock
@@ -1777,10 +1777,10 @@ aggregate-error@^3.0.0:
     clean-stack "^2.0.0"
     indent-string "^4.0.0"
 
-[email protected].130-rc.1:
-  version "4.2.2-build.130-rc.1"
-  resolved "https://registry.npmjs.org/agora-electron-sdk/-/agora-electron-sdk-4.2.2-build.130-rc.1.tgz#4440d9045dafc725974765c006e7bdcfd2900767"
-  integrity sha512-cSXQlG7dDCP1on1TcdRZqSYVF10MIfkXRIuUn0WjLIXsgmpX1mwpumYjBBPn/mOBg6lY5+Ig6GtxLM1C4z090Q==
+[email protected].134-dev.1:
+  version "4.2.2-build.134-dev.1"
+  resolved "https://registry.npmjs.org/agora-electron-sdk/-/agora-electron-sdk-4.2.2-build.134-dev.1.tgz#f1039b93d3636b610f02c26e2aee6e4f2b074c6a"
+  integrity sha512-dyHH48suuAYBXai271p9WR1E1V+xSwhT0amNqGrO+O8B1zMzINXXhKitBq+wWCmVQJs3BSl3N8OJgibTTSHq7Q==
   dependencies:
     buffer "^6.0.3"
     cross-env "^7.0.3"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "agora-electron-sdk",
-  "version": "4.2.2-build.130-rc.1",
+  "version": "4.2.2-build.134-rc.1",
   "description": "agora-electron-sdk",
   "main": "js/AgoraSdk",
   "types": "types/AgoraSdk.d.ts",
@@ -134,7 +134,7 @@
     "yuv-canvas": "1.2.6"
   },
   "agora_electron": {
-    "iris_sdk_win": "https://download.agora.io/sdk/release/iris_4.2.2-custom.7_DCG_Windows_Video_20230825_0113.zip",
-    "iris_sdk_mac": "https://download.agora.io/sdk/release/iris_4.2.2.1-build.1_DCG_Mac_Video_20230822_1159.zip"
+    "iris_sdk_win": "https://download.agora.io/sdk/release/iris_4.2.2.134-build.1_DCG_Windows_Video_20230907_0345.zip",
+    "iris_sdk_mac": "https://download.agora.io/sdk/release/iris_4.2.2.134-build.1_DCG_Mac_Video_20230907_0345.zip"
   }
 }
diff --git a/ts/Private/AgoraBase.ts b/ts/Private/AgoraBase.ts
@@ -438,6 +438,10 @@ export enum ErrorCodeType {
    * 1501: Permission to access the camera is not granted. Check whether permission to access the camera permission is granted.
    */
   ErrVdmCameraNotAuthorized = 1501,
+  /**
+   * @ignore
+   */
+  ErrAdmApplicationLoopback = 2007,
 }
 
 /**
@@ -3115,7 +3119,7 @@ export enum ConnectionChangedReasonType {
    */
   ConnectionChangedClientIpAddressChanged = 13,
   /**
-   * 14: Timeout for the keep-alive of the connection between the SDK and the Agora edge server. The connection state changes to .
+   * 14: Timeout for the keep-alive of the connection between the SDK and the Agora edge server. The SDK tries to reconnect to the server automatically.
    */
   ConnectionChangedKeepAliveTimeout = 14,
   /**

diff --git a/ts/Private/IAgoraRtcEngine.ts b/ts/Private/IAgoraRtcEngine.ts
@@ -4758,7 +4758,7 @@ export abstract class IRtcEngine {
    *
    * The SDK enables the low-quality video stream auto mode on the sender side by default (it does not actively sending low-quality video streams). The host identity receiver can initiate a low-quality video stream application at the receiving end by calling setRemoteVideoStreamType. After receiving the application, the sending end automatically switches to the low-quality video stream mode.
    *  If you want to modify this behavior, you can call this method and modify the mode to DisableSimulcastStream (never send low-quality video streams) or EnableSimulcastStream (always send low-quality video streams).
-   *  If you want to restore the default behavior after making changes, you can call this method again with mode set to AutoSimulcastStream. The difference and connection between this method and is as follows:
+   *  If you want to restore the default behavior after making changes, you can call this method again with mode set to AutoSimulcastStream. The difference and connection between this method and enableDualStreamMode is as follows:
    *  When calling this method and setting mode to DisableSimulcastStream, it has the same effect as calling and setting enabled to false.
    *  When calling this method and setting mode to EnableSimulcastStream, it has the same effect as calling and setting enabled to true.
    *  Both methods can be called before and after joining a channel. If both methods are used, the settings in the method called later takes precedence.
@@ -5656,8 +5656,7 @@ export abstract class IRtcEngine {
   /**
    * Starts pushing media streams to a CDN without transcoding.
    *
-   * Ensure that you enable the Media Push service before using this function. See Enable Media Push.
-   *  Call this method after joining a channel.
+   * Call this method after joining a channel.
    *  Only hosts in the LIVE_BROADCASTING profile can call this method.
    *  If you want to retry pushing streams after a failed push, make sure to call stopRtmpStream first, then call this method to retry pushing streams; otherwise, the SDK returns the same error code as the last failed push. Agora recommends that you use the server-side Media Push function. You can call this method to push an audio or video stream to the specified CDN address. This method can push media streams to only one CDN address at a time, so if you need to push streams to multiple addresses, call this method multiple times. After you call this method, the SDK triggers the onRtmpStreamingStateChanged callback on the local client to report the state of the streaming.
    *
@@ -5675,8 +5674,7 @@ export abstract class IRtcEngine {
   /**
    * Starts Media Push and sets the transcoding configuration.
    *
-   * Agora recommends that you use the server-side Media Push function. You can call this method to push a live audio-and-video stream to the specified CDN address and set the transcoding configuration. This method can push media streams to only one CDN address at a time, so if you need to push streams to multiple addresses, call this method multiple times. After you call this method, the SDK triggers the onRtmpStreamingStateChanged callback on the local client to report the state of the streaming.
-   *  Ensure that you enable the Media Push service before using this function. See Enable Media Push.
+   * Agora recommends that you use the server-side Media Push function. You can call this method to push a live audio-and-video stream to the specified CDN address and set the transcoding configuration. This method can push media streams to only one CDN address at a time, so if you need to push streams to multiple addresses, call this method multiple times. Under one Agora project, the maximum number of concurrent tasks to push media streams is 200 by default. If you need a higher quota, contact. After you call this method, the SDK triggers the onRtmpStreamingStateChanged callback on the local client to report the state of the streaming.
    *  Call this method after joining a channel.
    *  Only hosts in the LIVE_BROADCASTING profile can call this method.
    *  If you want to retry pushing streams after a failed push, make sure to call stopRtmpStream first, then call this method to retry pushing streams; otherwise, the SDK returns the same error code as the last failed push.

diff --git a/ts/Private/IAgoraRtcEngineEx.ts b/ts/Private/IAgoraRtcEngineEx.ts
@@ -641,8 +641,7 @@ export abstract class IRtcEngineEx extends IRtcEngine {
   /**
    * Starts pushing media streams to a CDN without transcoding.
    *
-   * Ensure that you enable the Media Push service before using this function. See Enable Media Push.
-   *  Call this method after joining a channel.
+   * Call this method after joining a channel.
    *  Only hosts in the LIVE_BROADCASTING profile can call this method.
    *  If you want to retry pushing streams after a failed push, make sure to call stopRtmpStream first, then call this method to retry pushing streams; otherwise, the SDK returns the same error code as the last failed push. Agora recommends that you use the server-side Media Push function. You can call this method to push an audio or video stream to the specified CDN address. This method can push media streams to only one CDN address at a time, so if you need to push streams to multiple addresses, call this method multiple times. After you call this method, the SDK triggers the onRtmpStreamingStateChanged callback on the local client to report the state of the streaming.
    *