feat: upgrade native sdk dependencies 20240122

AgoraIO-Extensions · Jan 22, 2024 · 8c67b33 · 8c67b33
1 parent 0d692de
commit 8c67b33
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 906 deletions.
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-dev.18'
-    api 'io.agora.rtc:agora-full-preview:4.3.0-dev.18'
-    api 'io.agora.rtc:full-screen-sharing-special:4.3.0-dev.18'
+    api 'io.agora.rtc:iris-rtc:4.3.0-dev.19'
+    api 'io.agora.rtc:agora-full-preview:4.3.0-dev.19'
+    api 'io.agora.rtc:full-screen-sharing-special:4.3.0-dev.19'
   }
 }
 

diff --git a/android/src/main/cpp/third_party/include/agora_rtc/AgoraBase.h b/android/src/main/cpp/third_party/include/agora_rtc/AgoraBase.h
@@ -1877,7 +1877,7 @@ struct VideoEncoderConfiguration {
   AdvanceOptions advanceOptions;
 
   VideoEncoderConfiguration(const VideoDimensions& d, int f, int b, ORIENTATION_MODE m, VIDEO_MIRROR_MODE_TYPE mirror = VIDEO_MIRROR_MODE_DISABLED)
-    : codecType(VIDEO_CODEC_H265),
+    : codecType(VIDEO_CODEC_NONE),
       dimensions(d),
       frameRate(f),
       bitrate(b),
@@ -1887,7 +1887,7 @@ struct VideoEncoderConfiguration {
       mirrorMode(mirror),
       advanceOptions(PREFER_AUTO, PREFER_LOW_LATENCY) {}
   VideoEncoderConfiguration(int width, int height, int f, int b, ORIENTATION_MODE m, VIDEO_MIRROR_MODE_TYPE mirror = VIDEO_MIRROR_MODE_DISABLED)
-    : codecType(VIDEO_CODEC_H265),
+    : codecType(VIDEO_CODEC_NONE),
       dimensions(width, height),
       frameRate(f),
       bitrate(b),
@@ -1907,7 +1907,7 @@ struct VideoEncoderConfiguration {
       mirrorMode(config.mirrorMode),
       advanceOptions(config.advanceOptions) {}
   VideoEncoderConfiguration()
-    : codecType(VIDEO_CODEC_H265),
+    : codecType(VIDEO_CODEC_NONE),
       dimensions(FRAME_WIDTH_960, FRAME_HEIGHT_540),
       frameRate(FRAME_RATE_FPS_15),
       bitrate(STANDARD_BITRATE),

diff --git a/android/src/main/cpp/third_party/include/agora_rtc/AgoraMediaBase.h b/android/src/main/cpp/third_party/include/agora_rtc/AgoraMediaBase.h
@@ -122,9 +122,9 @@ enum AudioRoute
    */
   ROUTE_LOUDSPEAKER = 4,
   /**
-   * The Bluetooth Headset via HFP.
+   * The Bluetooth Device via HFP.
    */
-  ROUTE_HEADSETBLUETOOTH = 5,
+  ROUTE_BLUETOOTH_DEVICE_HFP = 5,
   /**
    * The USB.
    */
@@ -142,9 +142,9 @@ enum AudioRoute
    */
   ROUTE_AIRPLAY = 9,
   /**
-   * The Bluetooth Speaker via A2DP.
+   * The Bluetooth Device via A2DP.
    */
-  ROUTE_BLUETOOTH_SPEAKER = 10,
+  ROUTE_BLUETOOTH_DEVICE_A2DP = 10,
 };
 
 /**

diff --git a/android/src/main/cpp/third_party/include/agora_rtc/IAgoraMusicContentCenter.h b/android/src/main/cpp/third_party/include/agora_rtc/IAgoraMusicContentCenter.h
@@ -234,7 +234,7 @@ class IMusicContentCenterEventHandler {
      * 
      * @param requestId The request id is same as that returned by getMusicCharts.
      * @param result The result of music chart collection
-     * @param statusCode The status of the request. See MusicContentCenterStateReason
+     * @param reason The status of the request. See MusicContentCenterStateReason
      */
     virtual void onMusicChartsResult(const char* requestId, agora_refptr<MusicChartCollection> result, MusicContentCenterStateReason reason) = 0;
 
@@ -243,7 +243,7 @@ class IMusicContentCenterEventHandler {
      * 
      * @param requestId The request id is same as that returned by getMusicCollectionByMusicChartId or searchMusic
      * @param result The result of music collection
-     * @param statusCode The status of the request. See MusicContentCenterStateReason
+     * @param reason The status of the request. See MusicContentCenterStateReason
      */
     virtual void onMusicCollectionResult(const char* requestId, agora_refptr<MusicCollection> result, MusicContentCenterStateReason reason) = 0;
 
@@ -253,7 +253,7 @@ class IMusicContentCenterEventHandler {
      * @param requestId The request id is same as that returned by getLyric
      * @param songCode Song code
      * @param lyricUrl  The lyric url of this music
-     * @param statusCode The status of the request. See MusicContentCenterStateReason
+     * @param reason The status of the request. See MusicContentCenterStateReason
      */
     virtual void onLyricResult(const char* requestId, int64_t songCode, const char* lyricUrl, MusicContentCenterStateReason reason) = 0;
 
@@ -263,7 +263,7 @@ class IMusicContentCenterEventHandler {
      * @param requestId The request id is same as that returned by getSongSimpleInfo.
      * @param songCode Song code
      * @param simpleInfo The metadata of the music.
-     * @param statusCode The status of the request. See MusicContentCenterStateReason
+     * @param reason The status of the request. See MusicContentCenterStateReason
      */
     virtual void onSongSimpleInfoResult(const char* requestId, int64_t songCode, const char* simpleInfo, MusicContentCenterStateReason reason) = 0;
 

diff --git a/android/src/main/cpp/third_party/include/agora_rtc/IAgoraParameter.h b/android/src/main/cpp/third_party/include/agora_rtc/IAgoraParameter.h
@@ -116,7 +116,7 @@
  * set the video codec type, such as "H264", "JPEG"
  */
 #define KEY_RTC_VIDEO_CODEC_TYPE                      "engine.video.codec_type"
-#define KEY_RTC_VIDEO_MINOR_STREAM_CODEC_TYPE         "engine.video.minor_stream_codec_type"
+#define KEY_RTC_VIDEO_MINOR_STREAM_CODEC_INDEX        "engine.video.minor_stream_codec_index"
 #define KEY_RTC_VIDEO_CODEC_INDEX                     "che.video.videoCodecIndex"
 /**
   * only use average QP for quality scaling

diff --git a/android/src/main/cpp/third_party/include/iris/iris_base.h b/android/src/main/cpp/third_party/include/iris/iris_base.h
@@ -54,6 +54,7 @@ typedef enum IrisError {
   ERR_FRAM_TYPE_NOT_MATCHING = 1006,
   ERR_ALREADY_REGISTERED = 1007,
   ERR_ALREADY_UNREGISTERED = 1008,
+  ERR_API_NOT_REGISTERED = 1009,
 } IrisError;
 
 IRIS_API void enableUseJsonArray(bool enable);

diff --git a/android/src/main/cpp/third_party/include/iris/iris_engine_base.h b/android/src/main/cpp/third_party/include/iris/iris_engine_base.h
@@ -8,6 +8,6 @@ class IApiEngineBase {
   virtual int CallIrisApi(ApiParam *apiParam) = 0;
 };
 
-IRIS_API IApiEngineBase *IRIS_CALL createIrisRtcEngine(void *engine);
+IRIS_API IApiEngineBase *IRIS_CALL createIrisRtcEngine(IrisHandle rtcEngine);
 
-IRIS_API void IRIS_CALL destroyIrisRtcEngine(IApiEngineBase *engine);
+IRIS_API void IRIS_CALL destroyIrisRtcEngine(IApiEngineBase *apiEngine);