Merge branch 'dev/4.5.1' of https://github.com/AgoraIO/API-Examples into dev/4.5.1

Author: qinhui

Android/APIExample-Audio/app/src/main/java/io/agora/api/example/examples/advanced/ProcessAudioRawData.java

@@ -328,7 +328,7 @@ public boolean onEarMonitoringAudioFrame(int type, int samplesPerChannel, int by
         }
 
         @Override
-        public boolean onPlaybackAudioFrameBeforeMixing(String channelId, int uid, int type, int samplesPerChannel, int bytesPerSample, int channels, int samplesPerSec, ByteBuffer buffer, long renderTimeMs, int avsync_type, int rtpTimestamp) {
+        public boolean onPlaybackAudioFrameBeforeMixing(String channelId, int uid, int type, int samplesPerChannel, int bytesPerSample, int channels, int samplesPerSec, ByteBuffer buffer, long renderTimeMs, int avsync_type, int rtpTimestamp, long presentationMs) {
             return false;
         }
 

Android/APIExample-Audio/gradle.properties

@@ -21,4 +21,4 @@ android.enableJetifier=true
 # read enable simple filter section on README first before set this flag to TRUE
 simpleFilter = false
 
-rtc_sdk_version = 4.5.0
+rtc_sdk_version = 4.5.1

Android/APIExample-Compose/app/src/main/java/io/agora/api/example/compose/samples/OriginAudioData.kt

@@ -354,7 +354,8 @@ private class OriginAudioDataRewriter(
         buffer: ByteBuffer?,
         renderTimeMs: Long,
         avsync_type: Int,
-        rtpTimestamp: Int
+        rtpTimestamp: Int,
+        presentationMs: Long
     ) = false
 
     override fun getObservedAudioFramePosition() =

Android/APIExample-Compose/gradle.properties

@@ -22,4 +22,4 @@ kotlin.code.style=official
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
 
-rtc_sdk_version = 4.5.0
+rtc_sdk_version = 4.5.1

Android/APIExample-Compose/gradle/libs.versions.toml

@@ -12,7 +12,7 @@ composeBom = "2023.08.00"
 loggingInterceptor = "4.10.0"
 materialIconsExtended = "1.6.0"
 navigationCompose = "2.7.7"
-#agoraSdk = "4.5.0"
+#agoraSdk = "4.5.1"
 okhttp = "4.10.0"
 
 [libraries]

Android/APIExample/agora-simple-filter/src/main/cpp/AgoraRtcKit/NGIAgoraLocalUser.h

@@ -1577,7 +1577,7 @@ class ILocalUserObserver {
   /**
    * datastream from this connection.
    */
-  virtual void onStreamMessage(user_id_t userId, int streamId, const char* data, size_t length) {}
+  virtual void onStreamMessage(user_id_t userId, int streamId, const char* data, size_t length, uint64_t sendTs = 0) {}
 
   /**
    * Occurs when the remote user state is updated.

Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/ProcessAudioRawData.java

@@ -340,7 +340,7 @@ public boolean onEarMonitoringAudioFrame(int type, int samplesPerChannel, int by
         }
 
         @Override
-        public boolean onPlaybackAudioFrameBeforeMixing(String channelId, int uid, int type, int samplesPerChannel, int bytesPerSample, int channels, int samplesPerSec, ByteBuffer buffer, long renderTimeMs, int avsync_type, int rtpTimestamp) {
+        public boolean onPlaybackAudioFrameBeforeMixing(String channelId, int uid, int type, int samplesPerChannel, int bytesPerSample, int channels, int samplesPerSec, ByteBuffer buffer, long renderTimeMs, int avsync_type, int rtpTimestamp, long presentationMs) {
             return false;
         }
 

Android/APIExample/gradle.properties

@@ -23,4 +23,4 @@ simpleFilter = false
 # read enable stream encrypt section on README first before set this flag to TRUE
 streamEncrypt = false
 
-rtc_sdk_version = 4.5.0
+rtc_sdk_version = 4.5.1

iOS/APIExample-Audio/Podfile

@@ -7,10 +7,10 @@ target 'APIExample-Audio' do
 
   pod 'Floaty', '~> 4.2.0'
   pod 'AGEVideoLayout', '~> 1.0.2'
-  pod 'AgoraAudio_iOS', '4.5.0'
+  pod 'AgoraAudio_iOS', '4.5.1'
 #  pod 'sdk', :path => 'sdk.podspec'
 end
 
 pre_install do |installer|
-  # system("sh .download_script.sh 4.5.0 true")
+  # system("sh .download_script.sh 4.5.1 true")
 end

iOS/APIExample-OC/Podfile

@@ -2,7 +2,7 @@
 # platform :ios, '9.0'
 
 def common_pods
-  pod 'AgoraRtcEngine_iOS', '4.5.0'
+  pod 'AgoraRtcEngine_iOS', '4.5.1'
 #  pod 'sdk', :path => 'sdk.podspec'
 end
 
@@ -26,5 +26,5 @@ target 'SimpleFilter' do
 end
 
 pre_install do |installer|
-  # system("sh .download_script.sh 4.5.0 true")
+  # system("sh .download_script.sh 4.5.1 true")
 end