Skip to content

Commit

Permalink
feat: upgrade native sdk 4.2.6.20
Browse files Browse the repository at this point in the history
  • Loading branch information
peilinok authored Dec 24, 2024
1 parent 5e03f20 commit bfa8baa
Show file tree
Hide file tree
Showing 10 changed files with 119 additions and 23 deletions.
5 changes: 3 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,9 @@ dependencies {
if (isDev(project)) {
implementation fileTree(dir: "libs", include: ["*.jar"])
} else {
api 'io.agora.rtc:iris-rtc:4.2.6.147-build.1'
api 'io.agora.rtc:agora-special-full:4.2.6.147.BASIC'
api 'io.agora.rtc:iris-rtc:4.2.6.20-build.1'
api 'io.agora.rtc:agora-special-full:4.2.6.20'
api 'io.agora.rtc:full-screen-sharing:4.2.6.20'
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6069,6 +6069,27 @@ class IRtcEngine : public agora::base::IEngineBase {
*/
virtual int setRemoteRenderMode(uid_t uid, media::base::RENDER_MODE_TYPE renderMode,
VIDEO_MIRROR_MODE_TYPE mirrorMode) = 0;

/**
* Sets the target frames per second (FPS) for the local render target.
*
* @param sourceType The type of video source.
* @param targetFps The target frames per second to be set.
*
* @return
* - 0: Success.
* - < 0: Failure.
*/
virtual int setLocalRenderTargetFps(VIDEO_SOURCE_TYPE sourceType, int targetFps) = 0;
/**
* Sets the target frames per second (FPS) for the remote render target.
*
* @param targetFps The target frames per second to be set for the remote render target.
* @return
* - 0: Success.
* - < 0: Failure.
*/
virtual int setRemoteRenderTargetFps(int targetFps) = 0;

// The following APIs are either deprecated and going to deleted.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1978,6 +1978,74 @@ class IRtcEngineEx : public IRtcEngine {
* - < 0: Failure.
*/
virtual int getCallIdEx(agora::util::AString& callId, const RtcConnection& connection) = 0;

/** Preloads a specified audio effect.
*
* This method preloads only one specified audio effect into the memory each time
* it is called. To preload multiple audio effects, call this method multiple times.
*
* After preloading, you can call \ref IRtcEngine::playEffect "playEffect"
* to play the preloaded audio effect or call
* \ref IRtcEngine::playAllEffects "playAllEffects" to play all the preloaded
* audio effects.
*
* @note
* - To ensure smooth communication, limit the size of the audio effect file.
* - Agora recommends calling this method before joining the channel.
*
* @param connection The RtcConnection object.
* @param soundId The ID of the audio effect.
* @param filePath The absolute path of the local audio effect file or the URL
* of the online audio effect file. Supported audio formats: mp3, mp4, m4a, aac,
* 3gp, mkv, and wav.
*
* @return
* - 0: Success.
* - < 0: Failure.
*/
virtual int preloadEffectEx(const RtcConnection& connection, int soundId, const char* filePath, int startPos = 0) = 0;

/** Plays a specified audio effect.
*
*
* This method plays only one specified audio effect each time it is called.
* To play multiple audio effects, call this method multiple times.
*
* @note
* - Agora recommends playing no more than three audio effects at the same time.
* - The ID and file path of the audio effect in this method must be the same
* as that in the \ref IRtcEngine::preloadEffect "preloadEffect" method.
*
* @param connection The RtcConnection object.
* @param soundId The ID of the audio effect.
* @param filePath The absolute path of the local audio effect file or the URL
* of the online audio effect file. Supported audio formats: mp3, mp4, m4a, aac,
* 3gp, mkv, and wav.
* @param loopCount The number of times the audio effect loops:
* - `-1`: Play the audio effect in an indefinite loop until
* \ref IRtcEngine::stopEffect "stopEffect" or
* \ref IRtcEngine::stopAllEffects "stopAllEffects"
* - `0`: Play the audio effect once.
* - `1`: Play the audio effect twice.
* @param pitch The pitch of the audio effect. The value ranges between 0.5 and 2.0.
* The default value is `1.0` (original pitch). The lower the value, the lower the pitch.
* @param pan The spatial position of the audio effect. The value ranges between -1.0 and 1.0:
* - `-1.0`: The audio effect displays to the left.
* - `0.0`: The audio effect displays ahead.
* - `1.0`: The audio effect displays to the right.
* @param gain The volume of the audio effect. The value ranges between 0 and 100.
* The default value is `100` (original volume). The lower the value, the lower
* the volume of the audio effect.
* @param publish Sets whether to publish the audio effect to the remote:
* - true: Publish the audio effect to the remote.
* - false: (Default) Do not publish the audio effect to the remote.
*
* @return
* - 0: Success.
* - < 0: Failure.
*/
virtual int playEffectEx(const RtcConnection& connection, int soundId, const char* filePath, int loopCount, double pitch, double pan, int gain, bool publish = false, int startPos = 0) = 0;

};

} // namespace rtc
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,10 @@
#define FUNC_RTCENGINE_SETLOGFILESIZE "RtcEngine_setLogFileSize"
#define FUNC_RTCENGINE_UPLOADLOGFILE "RtcEngine_uploadLogFile"
#define FUNC_RTCENGINE_WRITELOG "RtcEngine_writeLog"
#define FUNC_RTCENGINE_SETLOCALRENDERTARGETFPS \
"RtcEngine_setLocalRenderTargetFps"
#define FUNC_RTCENGINE_SETREMOTERENDERTARGETFPS \
"RtcEngine_setRemoteRenderTargetFps"
#define FUNC_RTCENGINE_SETLOCALRENDERMODE "RtcEngine_setLocalRenderMode"
#define FUNC_RTCENGINE_SETREMOTERENDERMODE "RtcEngine_setRemoteRenderMode"
#define FUNC_RTCENGINE_SETLOCALRENDERMODE2 "RtcEngine_setLocalRenderMode2"
Expand Down Expand Up @@ -925,7 +929,8 @@
"RtcEngineEx_startOrUpdateChannelMediaRelayEx"
#define FUNC_RTCENGINEEX_SETHIGHPRIORITYUSERLISTEX \
"RtcEngineEx_setHighPriorityUserListEx"

#define FUNC_RTCENGINEEX_PRELOADEFFECTEX "RtcEngineEx_preloadEffectEx"
#define FUNC_RTCENGINEEX_PLAYEFFECTEX "RtcEngineEx_playEffectEx"
// class IRtcEngineEx end

// class IMusicContentCenter start
Expand Down
19 changes: 10 additions & 9 deletions internal/deps_summary.txt
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
Iris:
https://download.agora.io/sdk/release/iris_4.2.6.142-build.1_DCG_Android_Video_20240815_0148.zip
https://download.agora.io/sdk/release/iris_4.2.6.142-build.1_DCG_iOS_Video_20240815_0148.zip
https://download.agora.io/sdk/release/iris_4.2.6.142-build.1_DCG_Mac_Video_20240815_0148.zip
https://download.agora.io/sdk/release/iris_4.2.6.147-build.1_DCG_Windows_Video_20241122_1154.zip
implementation 'io.agora.rtc:iris-rtc:4.2.6.147-build.1'
pod 'AgoraIrisRTC_iOS', '4.2.6.147-build.1'
pod 'AgoraIrisRTC_macOS', '4.2.6.147-build.1'
https://download.agora.io/sdk/release/iris_4.2.6.20-build.1_DCG_Android_Video_20241217_0416.zip
https://download.agora.io/sdk/release/iris_4.2.6.20-build.1_DCG_iOS_Video_20241217_0419.zip
https://download.agora.io/sdk/release/iris_4.2.6.20-build.1_DCG_Mac_Video_20241217_0416.zip
https://download.agora.io/sdk/release/iris_4.2.6.20-build.1_DCG_Windows_Video_20241217_0416.zip
implementation 'io.agora.rtc:iris-rtc:4.2.6.20-build.1'
pod 'AgoraIrisRTC_iOS', '4.2.6.20-build.1'
pod 'AgoraIrisRTC_macOS', '4.2.6.20-build.1'

Native:
https://download.agora.io/sdk/release/Agora_Native_SDK_for_Android_rel.v4.2.6.10_59623_FULL_20240423_1956_300131.zip
https://download.agora.io/sdk/release/Agora_Native_SDK_for_iOS_rel.v4.2.6.10_41553_FULL_20240424_1218_300208.zip
https://download.agora.io/sdk/release/Agora_Native_SDK_for_Mac_rel.v4.2.6.15_21056_FULL_20240710_1438_318435.zip
https://download.agora.io/sdk/release/Agora_Native_SDK_for_Windows_rel.v4.2.6.15_25607_FULL_20240709_1059_318143.zip
implementation 'io.agora.rtc:agora-special-full:4.2.6.147.BASIC'
pod 'AgoraRtcEngine_Special_iOS', '4.2.6.147.BASIC'
implementation 'io.agora.rtc:agora-special-full:4.2.6.20'
implementation 'io.agora.rtc:full-screen-sharing:4.2.6.20'
pod 'AgoraRtcEngine_Special_iOS', '4.2.6.20'
pod 'AgoraRtcEngine_Special_macOS', '4.2.6.147.BASIC'
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.2.6.147-build.1'
s.dependency 'AgoraRtcEngine_Special_iOS', '4.2.6.147.BASIC'
s.dependency 'AgoraIrisRTC_iOS', '4.2.6.20-build.1'
s.dependency 'AgoraRtcEngine_Special_iOS', '4.2.6.20'
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/*.framework'
else
s.dependency 'AgoraRtcEngine_Special_macOS', '4.2.6.147.BASIC'
s.dependency 'AgoraIrisRTC_macOS', '4.2.6.147-build.1'
s.dependency 'AgoraRtcEngine_Special_macOS', '4.2.6.20'
s.dependency 'AgoraIrisRTC_macOS', '4.2.6.20-build.1'
end

s.platform = :osx, '10.11'
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: agora_rtc_engine
description: >-
Flutter plugin of Agora RTC SDK, allow you to simply integrate Agora Video
Calling or Live Video Streaming to your app with just a few lines of code.
version: 6.2.6-sp.426147
version: 6.2.6-sp.42620
homepage: https://www.agora.io
repository: https://github.com/AgoraIO-Extensions/Agora-Flutter-SDK/tree/main
environment:
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.2.6.142-build.1_DCG_Android_Video_20240815_0148.zip"
export IRIS_CDN_URL_IOS="https://download.agora.io/sdk/release/iris_4.2.6.142-build.1_DCG_iOS_Video_20240815_0148.zip"
export IRIS_CDN_URL_MACOS="https://download.agora.io/sdk/release/iris_4.2.6.142-build.1_DCG_Mac_Video_20240815_0148.zip"
export IRIS_CDN_URL_WINDOWS="https://download.agora.io/sdk/release/iris_4.2.6.147-build.1_DCG_Windows_Video_20241122_1154.zip"
export IRIS_CDN_URL_ANDROID="https://download.agora.io/sdk/release/iris_4.2.6.20-build.1_DCG_Android_Video_20241217_0416.zip"
export IRIS_CDN_URL_IOS="https://download.agora.io/sdk/release/iris_4.2.6.20-build.1_DCG_iOS_Video_20241217_0419.zip"
export IRIS_CDN_URL_MACOS="https://download.agora.io/sdk/release/iris_4.2.6.20-build.1_DCG_Mac_Video_20241217_0416.zip"
export IRIS_CDN_URL_WINDOWS="https://download.agora.io/sdk/release/iris_4.2.6.20-build.1_DCG_Windows_Video_20241217_0416.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.2.6.147-build.1_DCG_Windows_Video_20241122_1154.zip")
set(IRIS_SDK_DOWNLOAD_NAME "iris_4.2.6.147-build.1_DCG_Windows")
set(IRIS_SDK_DOWNLOAD_URL "https://download.agora.io/sdk/release/iris_4.2.6.20-build.1_DCG_Windows_Video_20241217_0416.zip")
set(IRIS_SDK_DOWNLOAD_NAME "iris_4.2.6.20-build.1_DCG_Windows")
set(RTC_SDK_DOWNLOAD_NAME "Agora_Native_SDK_for_Windows_FULL")
set(IRIS_SDK_VERSION "v3_6_2_fix.1")

Expand Down

0 comments on commit bfa8baa

Please sign in to comment.