Skip to content

Commit

Permalink
feat: upgrade native sdk 4.3.2 (#1795)
Browse files Browse the repository at this point in the history
Co-authored-by: littleGnAl <littleGnAl@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
3 people authored Jun 6, 2024
1 parent 5c3149e commit e937989
Show file tree
Hide file tree
Showing 65 changed files with 3,187 additions and 2,906 deletions.
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-build.1'
api 'io.agora.rtc:full-sdk:4.3.1'
api 'io.agora.rtc:full-screen-sharing:4.3.1'
api 'io.agora.rtc:iris-rtc:4.3.2-build.1'
api 'io.agora.rtc:full-sdk:4.3.2'
api 'io.agora.rtc:full-screen-sharing:4.3.2'
}
}

Expand Down
4 changes: 4 additions & 0 deletions android/src/main/cpp/iris_rtc_rendering_android.cc
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,10 @@ class YUVRendering final : public RenderingOp {
glViewport(0, 0, width, height);
CHECK_GL_ERROR()

// Ensure that the unpack alignment is set to 1 byte to avoid any alignment issues with YUV data.
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
CHECK_GL_ERROR()

glEnableVertexAttribArray(aPositionLoc_);
CHECK_GL_ERROR()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3124,7 +3124,7 @@ enum REMOTE_USER_STATE {
struct VideoTrackInfo {
VideoTrackInfo()
: isLocal(false), ownerUid(0), trackId(0), channelId(OPTIONAL_NULLPTR)
, streamType(VIDEO_STREAM_HIGH), codecType(VIDEO_CODEC_H265)
, codecType(VIDEO_CODEC_H265)
, encodedFrameOnly(false), sourceType(VIDEO_SOURCE_CAMERA_PRIMARY)
, observationPosition(agora::media::base::POSITION_POST_CAPTURER) {}
/**
Expand All @@ -3145,10 +3145,6 @@ struct VideoTrackInfo {
* The channel ID of the video track.
*/
const char* channelId;
/**
* The video stream type: #VIDEO_STREAM_TYPE.
*/
VIDEO_STREAM_TYPE streamType;
/**
* The video codec type: #VIDEO_CODEC_TYPE.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,28 @@
namespace agora {
namespace rtc {

/**
* Modes for playing songs.
*/
typedef enum
{
/**
* 0: The music player is in the origin mode, which means playing the original song.
*/
kMusicPlayModeOriginal = 0,

/**
* 1: The music player is in the accompany mode, which means playing the accompaniment only.
*/
kMusicPlayModeAccompany = 1,

/**
* 2: The music player is in the lead sing mode, which means playing the lead vocals.
*/
kMusicPlayModeLeadSing = 2,

} MusicPlayMode;

typedef enum
{
/**
Expand Down Expand Up @@ -329,6 +351,18 @@ class IMusicPlayer : public IMediaPlayer {
* - < 0: Failure.
*/
virtual int open(int64_t songCode, int64_t startPos = 0) = 0;

/**
* Set the mode for playing songs.
* You can call this method to switch from original to accompaniment or lead vocals.
* If you do not call this method to set the mode, the SDK plays the accompaniment by default.
*
* @param model The playing mode.
* @return
* - 0: Success.
* - < 0: Failure.
*/
virtual int setPlayMode(MusicPlayMode mode) = 0;
};

class IMusicContentCenter
Expand Down Expand Up @@ -383,6 +417,15 @@ class IMusicContentCenter
* - The empty pointer NULL, if the method call fails.
*/
virtual agora_refptr<IMusicPlayer> createMusicPlayer() = 0;

/**
* Destroy a music player source object and return result.
* @param music_player The pointer to \ref rtc::IMusicPlayer "IMusicPlayer".
* @return
* - 0: Success.
* - < 0: Failure.
*/
virtual int destroyMusicPlayer(agora_refptr<IMusicPlayer> music_player) = 0;

/**
* Get music chart collection of music.
Expand Down Expand Up @@ -501,12 +544,12 @@ class IMusicContentCenter
*
* @param requestId The request id you will get of this query, format is uuid.
* @param songCode The identifier of the media file that you want to play.
* @param LyricType The type of the lyric file. 0:xml or 1:lrc.
* @param lyricType The type of the lyric file. 0:xml or 1:lrc.
* @return
* - 0: Success.
* - < 0: Failure.
*/
virtual int getLyric(agora::util::AString& requestId, int64_t songCode, int32_t LyricType = 0) = 0;
virtual int getLyric(agora::util::AString& requestId, int64_t songCode, int32_t lyricType = 0) = 0;

/**
* Gets the metadata of a specific music. Once this method is called, the SDK triggers the onSongSimpleInfoResult callback to report the metadata of the music.
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-build.1_DCG_Android_Video_20240429_1017_481.zip
https://download.agora.io/sdk/release/iris_4.3.1-build.1_DCG_iOS_Video_20240428_0641_388.zip
https://download.agora.io/sdk/release/iris_4.3.1-build.1_DCG_Mac_Video_20240428_0641_389.zip
https://download.agora.io/sdk/release/iris_4.3.1-build.1_DCG_Windows_Video_20240428_0641_423.zip
implementation 'io.agora.rtc:iris-rtc:4.3.1-build.1'
pod 'AgoraIrisRTC_iOS', '4.3.1-build.1'
pod 'AgoraIrisRTC_macOS', '4.3.1-build.1'
https://download.agora.io/sdk/release/iris_4.3.2-build.1_DCG_Android_Video_20240604_0456_504.zip
https://download.agora.io/sdk/release/iris_4.3.2-build.1_DCG_iOS_Video_20240604_0459_409.zip
https://download.agora.io/sdk/release/iris_4.3.2-build.1_DCG_Mac_Video_20240604_0500_404.zip
https://download.agora.io/sdk/release/iris_4.3.2-build.1_DCG_Windows_Video_20240604_0456_441.zip
implementation 'io.agora.rtc:iris-rtc:4.3.2-build.1'
pod 'AgoraIrisRTC_iOS', '4.3.2-build.1'
pod 'AgoraIrisRTC_macOS', '4.3.2-build.1'

Native:
<NATIVE_CDN_URL_ANDROID>
<NATIVE_CDN_URL_IOS>
<NATIVE_CDN_URL_MACOS>
<NATIVE_CDN_URL_WINDOWS>
implementation 'io.agora.rtc:full-sdk:4.3.1'
implementation 'io.agora.rtc:full-screen-sharing:4.3.1'
pod 'AgoraRtcEngine_iOS', '4.3.1'
pod 'AgoraRtcEngine_macOS', '4.3.1'
implementation 'io.agora.rtc:full-sdk:4.3.2'
implementation 'io.agora.rtc:full-screen-sharing:4.3.2'
pod 'AgoraRtcEngine_iOS', '4.3.2'
pod 'AgoraRtcEngine_macOS', '4.3.2'
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-build.1'
s.dependency 'AgoraRtcEngine_iOS', '4.3.1'
s.dependency 'AgoraIrisRTC_iOS', '4.3.2-build.1'
s.dependency 'AgoraRtcEngine_iOS', '4.3.2'
end

s.platform = :ios, '9.0'
Expand Down
Loading

0 comments on commit e937989

Please sign in to comment.