Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: upgrade native sdk dependencies 20240102 #1482

Merged
merged 1 commit into from
Jan 2, 2024
+25 −95
Merged

feat: upgrade native sdk dependencies 20240102 #1482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}

Expand Down
3 changes: 1 addition & 2 deletions android/src/main/cpp/third_party/include/iris/iris_base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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*/
Expand Down Expand Up @@ -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
Expand Down
9 changes: 0 additions & 9 deletions android/src/main/cpp/third_party/include/iris/iris_media_base_cxx.h
View file
Open in desktop

This file was deleted.

43 changes: 0 additions & 43 deletions android/src/main/cpp/third_party/include/iris/iris_rtc_api_type.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
13 changes: 0 additions & 13 deletions android/src/main/cpp/third_party/include/iris/iris_rtc_base.h
View file
Open in desktop

This file was deleted.

14 changes: 6 additions & 8 deletions android/src/main/cpp/third_party/include/iris/iris_rtc_c_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,24 @@
#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

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);

Expand Down
6 changes: 2 additions & 4 deletions android/src/main/cpp/third_party/include/iris/iris_rtc_high_performance_c_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions android/src/main/cpp/third_party/include/iris/iris_rtc_rendering_c.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion android/src/main/cpp/third_party/include/iris/iris_rtc_rendering_cxx.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand Down
4 changes: 2 additions & 2 deletions ios/agora_rtc_engine.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions macos/agora_rtc_engine.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
8 changes: 4 additions & 4 deletions scripts/artifacts_version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
4 changes: 2 additions & 2 deletions windows/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down