diff --git a/android/build.gradle b/android/build.gradle index a315ebf9a..3de3a0775 100644 --- 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.14' - api 'io.agora.rtc:agora-full-preview:4.3.0-dev.14' - api 'io.agora.rtc:full-screen-sharing-special:4.3.0-dev.14' + api 'io.agora.rtc:iris-rtc:4.3.0-dev.16' + api 'io.agora.rtc:agora-full-preview:4.3.0-dev.15' + api 'io.agora.rtc:full-screen-sharing-special:4.3.0-dev.15' } } 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 index f05c41f2f..f45cfa70c 100644 --- a/android/src/main/cpp/third_party/include/iris/iris_base.h +++ b/android/src/main/cpp/third_party/include/iris/iris_base.h @@ -44,6 +44,7 @@ typedef enum IrisError { ERR_OK = 0, ERR_FAILED = 1, ERR_INVALID_ARGUMENT = 2, + ERR_NOT_SUPPORTED = 4, ERR_NOT_INITIALIZED = 7, /*base from IRIS_VIDEO_PROCESS_ERR::ERR_NULL_POINTER=1*/ @@ -83,8 +84,6 @@ typedef struct IrisCEventHandler { typedef void *IrisHandle; typedef IrisHandle IrisEventHandlerHandle; -typedef IrisHandle IrisVideoFrameBufferDelegateHandle; -typedef IrisHandle IrisVideoFrameBufferManagerPtr; typedef IrisHandle IrisApiEnginePtr; EXTERN_C_LEAVE diff --git a/android/src/main/cpp/third_party/include/iris/iris_media_base_cxx.h b/android/src/main/cpp/third_party/include/iris/iris_media_base_cxx.h deleted file mode 100644 index 4aaca97e8..000000000 --- a/android/src/main/cpp/third_party/include/iris/iris_media_base_cxx.h +++ /dev/null @@ -1,9 +0,0 @@ -// -// Created by LXH on 2021/7/20. -// - -#ifndef IRIS_MEDIA_BASE_H_ -#define IRIS_MEDIA_BASE_H_ -#include "iris_media_base_c.h" -#include -#endif//IRIS_MEDIA_BASE_H_ diff --git a/android/src/main/cpp/third_party/include/iris/iris_rtc_api_type.h b/android/src/main/cpp/third_party/include/iris/iris_rtc_api_type.h index 858c4c561..fc0ba18fc 100644 --- a/android/src/main/cpp/third_party/include/iris/iris_rtc_api_type.h +++ b/android/src/main/cpp/third_party/include/iris/iris_rtc_api_type.h @@ -676,46 +676,6 @@ "AudioDeviceManager_getRecordingAudioDeviceInfo" // class IAudioDeviceManager end -// class ICloudSpatialAudioEngine start -#define FUNC_CLOUDSPATIALAUDIOENGINE_SETMAXAUDIORECVCOUNT \ - "CloudSpatialAudioEngine_setMaxAudioRecvCount" -#define FUNC_CLOUDSPATIALAUDIOENGINE_SETAUDIORECVRANGE \ - "CloudSpatialAudioEngine_setAudioRecvRange" -#define FUNC_CLOUDSPATIALAUDIOENGINE_SETDISTANCEUNIT \ - "CloudSpatialAudioEngine_setDistanceUnit" -#define FUNC_CLOUDSPATIALAUDIOENGINE_UPDATESELFPOSITION \ - "CloudSpatialAudioEngine_updateSelfPosition" -#define FUNC_CLOUDSPATIALAUDIOENGINE_UPDATESELFPOSITIONEX \ - "CloudSpatialAudioEngine_updateSelfPositionEx" -#define FUNC_CLOUDSPATIALAUDIOENGINE_UPDATEPLAYERPOSITIONINFO \ - "CloudSpatialAudioEngine_updatePlayerPositionInfo" -#define FUNC_CLOUDSPATIALAUDIOENGINE_SETPARAMETERS \ - "CloudSpatialAudioEngine_setParameters" -#define FUNC_CLOUDSPATIALAUDIOENGINE_INITIALIZE \ - "CloudSpatialAudioEngine_initialize" -#define FUNC_CLOUDSPATIALAUDIOENGINE_ADDEVENTHANDLER \ - "CloudSpatialAudioEngine_addEventHandler" -#define FUNC_CLOUDSPATIALAUDIOENGINE_REMOVEEVENTHANDLER \ - "CloudSpatialAudioEngine_removeEventHandler" -#define FUNC_CLOUDSPATIALAUDIOENGINE_ENABLESPATIALIZER \ - "CloudSpatialAudioEngine_enableSpatializer" -#define FUNC_CLOUDSPATIALAUDIOENGINE_SETTEAMID \ - "CloudSpatialAudioEngine_setTeamId" -#define FUNC_CLOUDSPATIALAUDIOENGINE_SETAUDIORANGEMODE \ - "CloudSpatialAudioEngine_setAudioRangeMode" -#define FUNC_CLOUDSPATIALAUDIOENGINE_ENTERROOM \ - "CloudSpatialAudioEngine_enterRoom" -#define FUNC_CLOUDSPATIALAUDIOENGINE_RENEWTOKEN \ - "CloudSpatialAudioEngine_renewToken" -#define FUNC_CLOUDSPATIALAUDIOENGINE_EXITROOM "CloudSpatialAudioEngine_exitRoom" -#define FUNC_CLOUDSPATIALAUDIOENGINE_GETTEAMMATES \ - "CloudSpatialAudioEngine_getTeammates" -#define FUNC_CLOUDSPATIALAUDIOENGINE_MUTELOCALAUDIOSTREAM \ - "CloudSpatialAudioEngine_muteLocalAudioStream" -#define FUNC_CLOUDSPATIALAUDIOENGINE_MUTEALLREMOTEAUDIOSTREAMS \ - "CloudSpatialAudioEngine_muteAllRemoteAudioStreams" -// class ICloudSpatialAudioEngine end - // class ILocalSpatialAudioEngine start #define FUNC_LOCALSPATIALAUDIOENGINE_SETMAXAUDIORECVCOUNT \ "LocalSpatialAudioEngine_setMaxAudioRecvCount" @@ -774,11 +734,8 @@ #define FUNC_MEDIAENGINE_ENABLECUSTOMAUDIOLOCALPLAYBACK \ "MediaEngine_enableCustomAudioLocalPlayback" #define FUNC_MEDIAENGINE_PUSHVIDEOFRAME "MediaEngine_pushVideoFrame" -#define FUNC_MEDIAENGINE_PUSHVIDEOFRAME2 "MediaEngine_pushVideoFrame2" #define FUNC_MEDIAENGINE_PUSHENCODEDVIDEOIMAGE \ "MediaEngine_pushEncodedVideoImage" -#define FUNC_MEDIAENGINE_PUSHENCODEDVIDEOIMAGE2 \ - "MediaEngine_pushEncodedVideoImage2" #define FUNC_MEDIAENGINE_RELEASE "MediaEngine_release" #define FUNC_MEDIAENGINE_REGISTERVIDEOFRAMEOBSERVER \ "MediaEngine_registerVideoFrameObserver" diff --git a/android/src/main/cpp/third_party/include/iris/iris_rtc_base.h b/android/src/main/cpp/third_party/include/iris/iris_rtc_base.h deleted file mode 100644 index 1a67bb299..000000000 --- a/android/src/main/cpp/third_party/include/iris/iris_rtc_base.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// Created by LXH on 2021/1/14. -// - -#ifndef IRIS_RTC_BASE_H_ -#define IRIS_RTC_BASE_H_ - -#include "iris_base.h" -#include "iris_media_base_c.h" -#include "iris_rtc_api_type.h" -#include "iris_rtc_rendering_c.h" - -#endif//IRIS_RTC_BASE_H_ diff --git a/android/src/main/cpp/third_party/include/iris/iris_rtc_c_api.h b/android/src/main/cpp/third_party/include/iris/iris_rtc_c_api.h index 5cd09d5c5..58499af90 100644 --- a/android/src/main/cpp/third_party/include/iris/iris_rtc_c_api.h +++ b/android/src/main/cpp/third_party/include/iris/iris_rtc_c_api.h @@ -5,7 +5,8 @@ #ifndef IRIS_RTC_C_API_H_ #define IRIS_RTC_C_API_H_ -#include "iris_rtc_base.h" +#include "iris_base.h" +#include "iris_platform.h" EXTERN_C_ENTER @@ -13,18 +14,15 @@ typedef enum IRIS_API_ERROR_CODE_TYPE { IRIS_API_NOT_CREATE = 666666, } IRIS_API_ERROR_CODE_TYPE; -typedef void *IrisApiEnginePtr; - -IRIS_API int IRIS_CALL CallIrisApi(IrisApiEnginePtr engine_ptr, +IRIS_API int IRIS_CALL CallIrisApi(IrisApiEnginePtr api_engine, ApiParam *param); -/// IrisRtcEngine -IRIS_API IrisApiEnginePtr IRIS_CALL CreateIrisApiEngine(void *rtcEngine); +IRIS_API IrisApiEnginePtr IRIS_CALL CreateIrisApiEngine(IrisHandle rtc_engine); -IRIS_API void IRIS_CALL DestroyIrisApiEngine(IrisApiEnginePtr engine_ptr); +IRIS_API void IRIS_CALL DestroyIrisApiEngine(IrisApiEnginePtr api_engine); IRIS_API IrisEventHandlerHandle IRIS_CALL -CreateIrisEventHandler(IrisCEventHandler *event_handler); +CreateIrisEventHandler(IrisCEventHandler *c_event_handler); IRIS_API void IRIS_CALL DestroyIrisEventHandler(IrisEventHandlerHandle handler); diff --git a/android/src/main/cpp/third_party/include/iris/iris_rtc_high_performance_c_api.h b/android/src/main/cpp/third_party/include/iris/iris_rtc_high_performance_c_api.h index 57937aa97..ba8d08dee 100644 --- a/android/src/main/cpp/third_party/include/iris/iris_rtc_high_performance_c_api.h +++ b/android/src/main/cpp/third_party/include/iris/iris_rtc_high_performance_c_api.h @@ -1,9 +1,7 @@ #pragma once -#include "iris_rtc_base.h" #include "iris_rtc_c_api.h" -EXTERN_C_ENTER struct IrisSpatialAudioZone { //the zone id @@ -24,10 +22,10 @@ struct IrisSpatialAudioZone { float upLength; //the audio attenuation of zone float audioAttenuation; - - IrisSpatialAudioZone() = default; }; +EXTERN_C_ENTER + IRIS_API int IRIS_CALL ILocalSpatialAudioEngine_SetMaxAudioRecvCount( IrisApiEnginePtr enginePtr, int maxCount); diff --git a/android/src/main/cpp/third_party/include/iris/iris_rtc_rendering_c.h b/android/src/main/cpp/third_party/include/iris/iris_rtc_rendering_c.h index 464edead3..d2e74cc8e 100644 --- a/android/src/main/cpp/third_party/include/iris/iris_rtc_rendering_c.h +++ b/android/src/main/cpp/third_party/include/iris/iris_rtc_rendering_c.h @@ -3,7 +3,7 @@ #include "iris_base.h" -typedef void *IrisRtcRenderingHandle; +typedef IrisHandle IrisRtcRenderingHandle; /// The agora::media::base::VideoFrame C projection but remove some unsupported property in C, /// e.g., agora::media::base::VideoFrame.sharedContext, agora::media::base::VideoFrame.textureId, etc. @@ -56,7 +56,7 @@ typedef enum GET_VIDEO_FRAME_CACHE_RETURN_TYPE { } GET_VIDEO_FRAME_CACHE_RETURN_TYPE; IRIS_API IrisRtcRenderingHandle -CreateIrisRtcRendering(void *iris_api_engine_handle); +CreateIrisRtcRendering(IrisApiEnginePtr iris_api_engine_handle); IRIS_API void FreeIrisRtcRendering(IrisRtcRenderingHandle handle); diff --git a/android/src/main/cpp/third_party/include/iris/iris_rtc_rendering_cxx.h b/android/src/main/cpp/third_party/include/iris/iris_rtc_rendering_cxx.h index 71dbe3068..646f52e14 100644 --- a/android/src/main/cpp/third_party/include/iris/iris_rtc_rendering_cxx.h +++ b/android/src/main/cpp/third_party/include/iris/iris_rtc_rendering_cxx.h @@ -33,7 +33,7 @@ class IRIS_CPP_API IrisRtcRendering { public: virtual ~IrisRtcRendering() {} - static IrisRtcRendering *Create(void *iris_api_engine_handle); + static IrisRtcRendering *Create(IrisApiEnginePtr iris_api_engine_handle); /// Add `VideoFrameObserverDelegate` with `config`, return a delegate id that save inside /// `IrisRtcRendering`, you should save the id and pass it to `RemoveVideoFrameObserverDelegate`. diff --git a/ios/agora_rtc_engine.podspec b/ios/agora_rtc_engine.podspec index fd74c0d68..f45619d1a 100644 --- a/ios/agora_rtc_engine.podspec +++ b/ios/agora_rtc_engine.podspec @@ -23,8 +23,8 @@ Pod::Spec.new do |s| puts '[plugin_dev] Found .plugin_dev file, use vendored_frameworks instead.' s.vendored_frameworks = 'libs/*.xcframework' else - s.dependency 'AgoraIrisRTC_iOS', '4.3.0-dev.13' - s.dependency 'AgoraRtcEngine_iOS_Preview', '4.3.0-dev.14' + s.dependency 'AgoraIrisRTC_iOS', '4.3.0-dev.15' + s.dependency 'AgoraRtcEngine_iOS_Preview', '4.3.0-dev.15' end s.platform = :ios, '9.0' diff --git a/macos/agora_rtc_engine.podspec b/macos/agora_rtc_engine.podspec index 9e3ba3376..fa84caa6b 100644 --- a/macos/agora_rtc_engine.podspec +++ b/macos/agora_rtc_engine.podspec @@ -21,8 +21,8 @@ A new flutter plugin project. puts '[plugin_dev] Found .plugin_dev file, use vendored_frameworks instead.' s.vendored_frameworks = 'libs/*.framework' else - s.dependency 'AgoraRtcEngine_macOS_Preview', '4.3.0-dev.14' - s.dependency 'AgoraIrisRTC_macOS', '4.3.0-dev.14' + s.dependency 'AgoraRtcEngine_macOS_Preview', '4.3.0-dev.15' + s.dependency 'AgoraIrisRTC_macOS', '4.3.0-dev.15' end s.platform = :osx, '10.11' diff --git a/scripts/artifacts_version.sh b/scripts/artifacts_version.sh index 6af421113..e7d171fcf 100644 --- a/scripts/artifacts_version.sh +++ b/scripts/artifacts_version.sh @@ -1,6 +1,6 @@ set -e -export IRIS_CDN_URL_ANDROID="https://download.agora.io/sdk/release/iris_4.3.0-dev.14_DCG_Android_Video_20231221_0531.zip" -export IRIS_CDN_URL_IOS="https://download.agora.io/sdk/release/iris_4.3.0-dev.13_DCG_iOS_Video_20231213_0239.zip" -export IRIS_CDN_URL_MACOS="https://download.agora.io/sdk/release/iris_4.3.0-dev.14_DCG_Mac_Video_20231221_0531.zip" -export IRIS_CDN_URL_WINDOWS="https://download.agora.io/sdk/release/iris_4.3.0-dev.14_DCG_Windows_Video_20231222_0659.zip" +export IRIS_CDN_URL_ANDROID="https://download.agora.io/sdk/release/iris_4.3.0-dev.16_DCG_Android_Video_20240102_1139.zip" +export IRIS_CDN_URL_IOS="https://download.agora.io/sdk/release/iris_4.3.0-dev.15_DCG_iOS_Video_20240102_1055.zip" +export IRIS_CDN_URL_MACOS="https://download.agora.io/sdk/release/iris_4.3.0-dev.15_DCG_Mac_Video_20240102_1054.zip" +export IRIS_CDN_URL_WINDOWS="https://download.agora.io/sdk/release/iris_4.3.0-dev.15_DCG_Windows_Video_20240102_1054.zip" diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt index e7b7f9abb..cb6418d9c 100644 --- a/windows/CMakeLists.txt +++ b/windows/CMakeLists.txt @@ -12,8 +12,8 @@ project(${PROJECT_NAME} LANGUAGES CXX) # not be changed set(PLUGIN_NAME "agora_rtc_engine_plugin") -set(IRIS_SDK_DOWNLOAD_URL "https://download.agora.io/sdk/release/iris_4.3.0-dev.14_DCG_Windows_Video_20231222_0659.zip") -set(IRIS_SDK_DOWNLOAD_NAME "iris_4.3.0-dev.14_DCG_Windows") +set(IRIS_SDK_DOWNLOAD_URL "https://download.agora.io/sdk/release/iris_4.3.0-dev.15_DCG_Windows_Video_20240102_1054.zip") +set(IRIS_SDK_DOWNLOAD_NAME "iris_4.3.0-dev.15_DCG_Windows") set(RTC_SDK_DOWNLOAD_NAME "Agora_Native_SDK_for_Windows_FULL") set(IRIS_SDK_VERSION "v3_6_2_fix.1")