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.

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 20240415 #1707

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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.1-dev.16'
api 'io.agora.rtc:agora-full-preview:4.3.1-dev.16'
api 'io.agora.rtc:full-screen-sharing-special:4.3.1-dev.16'
api 'io.agora.rtc:iris-rtc:4.3.1-dev.17'
api 'io.agora.rtc:agora-full-preview:4.3.1-dev.17'
api 'io.agora.rtc:full-screen-sharing-special:4.3.1-dev.17'
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -797,7 +797,7 @@ struct CameraCapturerConfiguration {
/**
* The camera direction.
*/
CAMERA_DIRECTION cameraDirection;
Optional<CAMERA_DIRECTION> cameraDirection;

/*- CAMERA_FOCAL_LENGTH_TYPE.CAMERA_FOCAL_LENGTH_DEFAULT:
For iOS, if iPhone/iPad has 3 or 2 back camera, it means combination of triple (wide + ultra wide + telephoto) camera
Expand All @@ -807,33 +807,22 @@ struct CameraCapturerConfiguration {
- CAMERA_FOCAL_LENGTH_TYPE.CAMERA_FOCAL_LENGTH_WIDE_ANGLE:wide camera
- CAMERA_FOCAL_LENGTH_TYPE.CAMERA_FOCAL_LENGTH_URLTRA_WIDE:ultra wide camera
- CAMERA_FOCAL_LENGTH_TYPE.CAMERA_FOCAL_LENGTH_TELEPHOTO:telephoto camera*/
CAMERA_FOCAL_LENGTH_TYPE cameraFocalLengthType;
Optional<CAMERA_FOCAL_LENGTH_TYPE> cameraFocalLengthType;
#else
/** For windows. The device ID of the playback device. The maximum length is #MAX_DEVICE_ID_LENGTH. */
char deviceId[MAX_DEVICE_ID_LENGTH];
/** For windows. The device ID of the playback device. */
Optional<const char *> deviceId;
#endif

#if defined(__ANDROID__)
/**
* The camera id.
*/
char cameraId[MAX_DEVICE_ID_LENGTH];
Optional<const char *> cameraId;
#endif
/** The video format. See VideoFormat. */
Optional<bool> followEncodeDimensionRatio;
/** The video format. See VideoFormat. */
VideoFormat format;
bool followEncodeDimensionRatio;
CameraCapturerConfiguration() : followEncodeDimensionRatio(true) {
#if defined(__ANDROID__) || (defined(__APPLE__) && TARGET_OS_IOS)
cameraDirection = CAMERA_REAR;

#else
memset(deviceId, 0, sizeof(deviceId));
#endif

#if defined(__ANDROID__)
memset(cameraId, 0, sizeof(cameraId));
#endif
}
CameraCapturerConfiguration() : format(VideoFormat(0, 0, 0)) {}
};
/**
* The configuration of the captured screen.
Expand Down Expand Up @@ -2145,25 +2134,6 @@ class IRtcEngineEventHandler {
(void) vecDistance;
(void) numFaces;
}

#if defined(__ANDROID__)
/**
* When the actual configuration is different from the preset configuration, the callback is triggered.
*
* @param direction Camera orientation, front or back.
* @param focalLengthType The focal length of the camera, wide Angle, super wide Angle or ordinary lens.
* @param width Camera acquisition width.
* @param height Camera acquisition width.
* @param frameRate Camera acquisition frameRate.
*/
virtual void onCameraCapturerConfigurationChanged(int direction, int focalLengthType, int width, int height, int frameRate) {
(void)direction;
(void)focalLengthType;
(void)width;
(void)height;
(void)frameRate;
}
#endif // __ANDROID__
#endif
/**
* Occurs when the video stops playing.
Expand Down Expand Up @@ -6972,7 +6942,7 @@ class IRtcEngine : public agora::base::IEngineBase {
* - true: The center stage is supported.
* - false: The center stage is not supported.
*/
virtual bool isSupportPortraitCenterStage() = 0;
virtual bool isCameraCenterStageSupported() = 0;

/** Enables the camera Center Stage.
* @param enabled enable Center Stage:
Expand All @@ -6982,7 +6952,7 @@ class IRtcEngine : public agora::base::IEngineBase {
* - 0: Success.
* - < 0: Failure.
*/
virtual int enablePortraitCenterStage(bool enabled) = 0;
virtual int enableCameraCenterStage(bool enabled) = 0;
#endif

#if defined(_WIN32) || (defined(__APPLE__) && TARGET_OS_MAC && !TARGET_OS_IPHONE)
Expand Down
22 changes: 11 additions & 11 deletions internal/deps_summary.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
Iris:
https://download.agora.io/sdk/release/iris_4.3.1-dev.16_DCG_Android_Video_20240410_0607_469.zip
https://download.agora.io/sdk/release/iris_4.3.1-dev.16_DCG_iOS_Video_20240410_0607_378.zip
https://download.agora.io/sdk/release/iris_4.3.1-dev.16_DCG_Mac_Video_20240410_0607_377.zip
https://download.agora.io/sdk/release/iris_4.3.1-dev.16_DCG_Windows_Video_20240410_0607_412.zip
implementation 'io.agora.rtc:iris-rtc:4.3.1-dev.16'
pod 'AgoraIrisRTC_iOS', '4.3.1-dev.16'
pod 'AgoraIrisRTC_macOS', '4.3.1-dev.16'
https://download.agora.io/sdk/release/iris_4.3.1-dev.17_DCG_Android_Video_20240415_0633_475.zip
https://download.agora.io/sdk/release/iris_4.3.1-dev.17_DCG_iOS_Video_20240415_0633_383.zip
https://download.agora.io/sdk/release/iris_4.3.1-dev.17_DCG_Mac_Video_20240415_0633_384.zip
https://download.agora.io/sdk/release/iris_4.3.1-dev.17_DCG_Windows_Video_20240415_0633_418.zip
implementation 'io.agora.rtc:iris-rtc:4.3.1-dev.17'
pod 'AgoraIrisRTC_iOS', '4.3.1-dev.17'
pod 'AgoraIrisRTC_macOS', '4.3.1-dev.17'

Native:
<NATIVE_CDN_URL_ANDROID>
<NATIVE_CDN_URL_IOS>
<NATIVE_CDN_URL_MACOS>
<NATIVE_CDN_URL_WINDOWS>
implementation 'io.agora.rtc:agora-full-preview:4.3.1-dev.16'
implementation 'io.agora.rtc:full-screen-sharing-special:4.3.1-dev.16'
pod 'AgoraRtcEngine_iOS_Preview', '4.3.1-dev.16'
pod 'AgoraRtcEngine_macOS_Preview', '4.3.1-dev.16'
implementation 'io.agora.rtc:agora-full-preview:4.3.1-dev.17'
implementation 'io.agora.rtc:full-screen-sharing-special:4.3.1-dev.17'
pod 'AgoraRtcEngine_iOS_Preview', '4.3.1-dev.17'
pod 'AgoraRtcEngine_macOS_Preview', '4.3.1-dev.17'
4 changes: 2 additions & 2 deletions ios/agora_rtc_engine.podspec
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.1-dev.16'
s.dependency 'AgoraRtcEngine_iOS_Preview', '4.3.1-dev.16'
s.dependency 'AgoraIrisRTC_iOS', '4.3.1-dev.17'
s.dependency 'AgoraRtcEngine_iOS_Preview', '4.3.1-dev.17'
end

s.platform = :ios, '9.0'
Expand Down
4 changes: 2 additions & 2 deletions macos/agora_rtc_engine.podspec
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/*.xcframework', 'libs/*.framework'
else
s.dependency 'AgoraRtcEngine_macOS_Preview', '4.3.1-dev.16'
s.dependency 'AgoraIrisRTC_macOS', '4.3.1-dev.16'
s.dependency 'AgoraRtcEngine_macOS_Preview', '4.3.1-dev.17'
s.dependency 'AgoraIrisRTC_macOS', '4.3.1-dev.17'
end

s.platform = :osx, '10.11'
Expand Down
8 changes: 4 additions & 4 deletions scripts/artifacts_version.sh
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.1-dev.16_DCG_Android_Video_20240410_0607_469.zip"
export IRIS_CDN_URL_IOS="https://download.agora.io/sdk/release/iris_4.3.1-dev.16_DCG_iOS_Video_20240410_0607_378.zip"
export IRIS_CDN_URL_MACOS="https://download.agora.io/sdk/release/iris_4.3.1-dev.16_DCG_Mac_Video_20240410_0607_377.zip"
export IRIS_CDN_URL_WINDOWS="https://download.agora.io/sdk/release/iris_4.3.1-dev.16_DCG_Windows_Video_20240410_0607_412.zip"
export IRIS_CDN_URL_ANDROID="https://download.agora.io/sdk/release/iris_4.3.1-dev.17_DCG_Android_Video_20240415_0633_475.zip"
export IRIS_CDN_URL_IOS="https://download.agora.io/sdk/release/iris_4.3.1-dev.17_DCG_iOS_Video_20240415_0633_383.zip"
export IRIS_CDN_URL_MACOS="https://download.agora.io/sdk/release/iris_4.3.1-dev.17_DCG_Mac_Video_20240415_0633_384.zip"
export IRIS_CDN_URL_WINDOWS="https://download.agora.io/sdk/release/iris_4.3.1-dev.17_DCG_Windows_Video_20240415_0633_418.zip"
4 changes: 2 additions & 2 deletions windows/CMakeLists.txt
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.1-dev.16_DCG_Windows_Video_20240410_0607_412.zip")
set(IRIS_SDK_DOWNLOAD_NAME "iris_4.3.1-dev.16_DCG_Windows")
set(IRIS_SDK_DOWNLOAD_URL "https://download.agora.io/sdk/release/iris_4.3.1-dev.17_DCG_Windows_Video_20240415_0633_418.zip")
set(IRIS_SDK_DOWNLOAD_NAME "iris_4.3.1-dev.17_DCG_Windows")
set(RTC_SDK_DOWNLOAD_NAME "Agora_Native_SDK_for_Windows_FULL")
set(IRIS_SDK_VERSION "v3_6_2_fix.1")

Expand Down