Merge branch 'AgoraIO-Extensions:main' into main

berkmancenter · Jun 13, 2024 · 38e8748 · 38e8748
2 parents 6b0f2ae + d71cd95
commit 38e8748
Show file tree

Hide file tree

Showing 135 changed files with 7,089 additions and 4,091 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -31,7 +31,7 @@ jobs:
           TOTAL: ${{ steps.analysis.outputs.total }}
           TOTAL_MAX: ${{ steps.analysis.outputs.total_max }}
         run: |
-          if (( $TOTAL < 120 ))
+          if (( $TOTAL_MAX - $TOTAL > 10 ))
           then
             echo Pub Score too low.
             exit 1

diff --git a/.github/workflows/code-gen.yaml b/.github/workflows/code-gen.yaml
@@ -42,7 +42,7 @@ jobs:
           channel: 'stable'
       - name: Run code-gen
         run: |
-          bash scripts/code_gen.sh
+          bash scripts/code_gen.sh ${{ inputs.version }}
 
       - name: Get current date
         id: date

diff --git a/.gitignore b/.gitignore
@@ -39,4 +39,5 @@ third_party/
 
 .ccls-cache/
 
-test_shard/**/scripts/iris_web_version.js
+test_shard/**/scripts/iris_web_version.js
+test_shard/**/web/iris_web_version.js
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,26 @@
 # Changelog
 
+## [6.3.2](https://github.com/AgoraIO-Extensions/Agora-Flutter-SDK/compare/6.3.1...6.3.2) (2024-06-06)
+
+
+### Features
+
+* upgrade native sdk 4.3.2 ([#1795](https://github.com/AgoraIO-Extensions/Agora-Flutter-SDK/issues/1795)) ([e937989](https://github.com/AgoraIO-Extensions/Agora-Flutter-SDK/commit/e9379891d4d54f8f56cd19af7ad1ebd0ddc0c8f1))
+
+## [6.3.1](https://github.com/AgoraIO-Extensions/Agora-Flutter-SDK/compare/6.3.0...6.3.1) (2024-05-09)
+
+
+### Features
+
+* Upgrade native sdk 4.3.1 ([#1611](https://github.com/AgoraIO-Extensions/Agora-Flutter-SDK/issues/1611)) ([18f1a56](https://github.com/AgoraIO-Extensions/Agora-Flutter-SDK/commit/18f1a56ad19f761e249656e7b680cb2e174dab48))
+
+
+### Bug Fixes
+
+* AgoraVideoView crash when dispose after RtcEngine.release ([#1585](https://github.com/AgoraIO-Extensions/Agora-Flutter-SDK/issues/1585)) ([cd33120](https://github.com/AgoraIO-Extensions/Agora-Flutter-SDK/commit/cd33120b609c9fee410482f5410657579857c984))
+* AgoraVideoView takes over the whole browser window ([#1717](https://github.com/AgoraIO-Extensions/Agora-Flutter-SDK/issues/1717)) ([0052cc7](https://github.com/AgoraIO-Extensions/Agora-Flutter-SDK/commit/0052cc78446244cfaa4cfa5fff53515256704abf)), closes [/github.com/flutter/flutter/issues/143922#issuecomment-1960133128](https://github.com/AgoraIO-Extensions//github.com/flutter/flutter/issues/143922/issues/issuecomment-1960133128)
+* Prevent multiple initializations of internal resources when `RtcEngine.initialize` is called simultaneously ([#1712](https://github.com/AgoraIO-Extensions/Agora-Flutter-SDK/issues/1712)) ([462cfc3](https://github.com/AgoraIO-Extensions/Agora-Flutter-SDK/commit/462cfc3ebddeebe83143f341eb6ec8185a9e5b25))
+
 ## [6.3.0](https://github.com/AgoraIO-Extensions/Agora-Flutter-SDK/compare/6.2.6...6.3.0) (2024-02-28)
 
 

diff --git a/README.md b/README.md
@@ -89,7 +89,7 @@ Download the `iris_web`(see the link below) artifact and include it as a `<scrip
 </body>
 </html>
 ```
-Download: https://download.agora.io/sdk/release/iris-web-rtc_n430_w4200_0.6.0.js
+Download: https://download.agora.io/sdk/release/iris-web-rtc_n430_w4200_0.7.0.js
 
 **For Testing Purposes**
 
@@ -101,7 +101,7 @@ You can directly depend on the Agora CDN for testing purposes:
 ...
 <body>
   ...
-  <script src="https://download.agora.io/sdk/release/iris-web-rtc_n430_w4200_0.6.0.js"></script>
+  <script src="https://download.agora.io/sdk/release/iris-web-rtc_n430_w4200_0.7.0.js"></script>
 </body>
 </html>
 ```

diff --git a/android/build.gradle b/android/build.gradle
@@ -57,9 +57,9 @@ dependencies {
   if (isDev(project)) {
     api fileTree(dir: "libs", include: ["*.jar"])
   } else {
-    api 'io.agora.rtc:iris-rtc:4.3.0-build.2'
-    api 'io.agora.rtc:full-sdk:4.3.0'
-    api 'io.agora.rtc:full-screen-sharing:4.3.0'
+    api 'io.agora.rtc:iris-rtc:4.3.2-build.1'
+    api 'io.agora.rtc:full-sdk:4.3.2'
+    api 'io.agora.rtc:full-screen-sharing:4.3.2'
   }
 }
 

diff --git a/android/src/main/cpp/iris_rtc_rendering_android.cc b/android/src/main/cpp/iris_rtc_rendering_android.cc
@@ -303,6 +303,8 @@ class Texture2DRendering final : public RenderingOp {
         CHECK_GL_ERROR()
         glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
         CHECK_GL_ERROR()
+        glViewport(0, 0, video_frame->width, video_frame->height);
+        CHECK_GL_ERROR()
 
         // Bind 2D texture
         glActiveTexture(GL_TEXTURE0);
@@ -409,6 +411,8 @@ class OESTextureRendering final : public RenderingOp {
         CHECK_GL_ERROR()
         glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
         CHECK_GL_ERROR()
+        glViewport(0, 0, video_frame->width, video_frame->height);
+        CHECK_GL_ERROR()
 
         // Bind external oes texture
         glActiveTexture(GL_TEXTURE0);
@@ -528,6 +532,12 @@ class YUVRendering final : public RenderingOp {
     CHECK_GL_ERROR()
     glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
     CHECK_GL_ERROR()
+    glViewport(0, 0, width, height);
+    CHECK_GL_ERROR()
+
+    // Ensure that the unpack alignment is set to 1 byte to avoid any alignment issues with YUV data.
+    glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+    CHECK_GL_ERROR()
 
     glEnableVertexAttribArray(aPositionLoc_);
     CHECK_GL_ERROR()
@@ -538,8 +548,8 @@ class YUVRendering final : public RenderingOp {
 
     // Adjust the tex coords to avoid green edge issue
     float sFactor = 1.0f;
-    if (video_frame->width != video_frame->yStride) {
-      sFactor = (float) video_frame->width / (float) video_frame->yStride - 0.02f;
+    if (width != yStride) {
+      sFactor = (float) width / (float) yStride - 0.02f;
     }
 
     float fragment[] = {sFactor, 0.0f, 0.0f, 0.0f, sFactor, 1.0f, 0.0f, 1.0f};
@@ -704,6 +714,8 @@ class NativeTextureRenderer final
       strcpy(config.channelId, "");
     }
     config.video_view_setup_mode = video_view_setup_mode;
+    config.observed_frame_position = agora::media::base::VIDEO_MODULE_POSITION::POSITION_POST_CAPTURER
+            | agora::media::base::VIDEO_MODULE_POSITION::POSITION_PRE_RENDERER;
 
     if (iris_rtc_rendering_) {
       delegate_id_ =