adapt 3.7.200

Author: xianing

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

@@ -246,7 +246,7 @@ private void joinChannel(String channelId) {
         }
         /** Allows a user to join a channel.
          if you do not specify the uid, we will generate the uid for you*/
-        engine.enableAudioVolumeIndication(1000, 3);
+        engine.enableAudioVolumeIndication(1000, 3, true);
 
         ChannelMediaOptions option = new ChannelMediaOptions();
         option.autoSubscribeAudio = true;

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

@@ -490,8 +490,8 @@ public int getVideoFormatPreference() {
         }
 
         @Override
-        public int getRotationApplied() {
-            return 0;
+        public boolean getRotationApplied() {
+            return false;
         }
 
         @Override

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

@@ -25,6 +25,7 @@
 import io.agora.api.example.utils.CommonUtil;
 import io.agora.mediaplayer.IMediaPlayer;
 import io.agora.mediaplayer.IMediaPlayerObserver;
+import io.agora.mediaplayer.data.SrcInfo;
 import io.agora.rtc2.ChannelMediaOptions;
 import io.agora.rtc2.Constants;
 import io.agora.rtc2.IRtcEngineEventHandler;
@@ -547,8 +548,8 @@ public void run() {
     }
 
     @Override
-    public void onPlayerEvent(io.agora.mediaplayer.Constants.MediaPlayerEvent mediaPlayerEvent) {
-        Log.e(TAG, " onPlayerEvent mediaPlayerEvent " + mediaPlayerEvent);
+    public void onPlayerEvent(io.agora.mediaplayer.Constants.MediaPlayerEvent mediaPlayerEvent, long l, String s) {
+
     }
 
     @Override
@@ -560,8 +561,28 @@ public void onPlayBufferUpdated(long l) {
 
     }
 
+    @Override
+    public void onPreloadEvent(String s, io.agora.mediaplayer.Constants.MediaPlayerPreloadEvent mediaPlayerPreloadEvent) {
+
+    }
+
     @Override
     public void onCompleted() {
         Log.e(TAG, "onCompleted");
     }
+
+    @Override
+    public void onAgoraCDNTokenWillExpire() {
+
+    }
+
+    @Override
+    public void onPlayerSrcInfoChanged(SrcInfo srcInfo, SrcInfo srcInfo1) {
+
+    }
+
+    @Override
+    public void onPlayerIdsRenew(String s) {
+
+    }
 }

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

@@ -289,7 +289,7 @@ private void joinChannel(String channelId) {
         if (TextUtils.equals(accessToken, "") || TextUtils.equals(accessToken, "<#YOUR ACCESS TOKEN#>")) {
             accessToken = null;
         }
-        engine.enableAudioVolumeIndication(1000, 3);
+        engine.enableAudioVolumeIndication(1000, 3, false);
         ChannelMediaOptions option = new ChannelMediaOptions();
         option.autoSubscribeAudio = true;
         option.autoSubscribeVideo = true;

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

@@ -332,8 +332,8 @@ public int getVideoFormatPreference() {
         }
 
         @Override
-        public int getRotationApplied() {
-            return 0;
+        public boolean getRotationApplied() {
+            return false;
         }
 
         @Override

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

@@ -246,7 +246,7 @@ private void joinChannel(String channelId) {
          *                 method to send the video frame to the Agora SDK:
          *                   true: Use the push mode.
          *                   false: Use the pull mode (not supported).*/
-        engine.setExternalVideoSource(true, true, false);
+        engine.setExternalVideoSource(true, true, Constants.ExternalVideoSourceType.VIDEO_FRAME);
 
         /**Please configure accessToken in the string_config file.
          * A temporary token generated in Console. A temporary token is valid for 24 hours. For details, see

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

@@ -235,7 +235,7 @@ private void joinChannel(String channelId) {
         if (TextUtils.equals(accessToken, "") || TextUtils.equals(accessToken, "<#YOUR ACCESS TOKEN#>")) {
             accessToken = null;
         }
-        engine.enableAudioVolumeIndication(1000, 3);
+        engine.enableAudioVolumeIndication(1000, 3, false);
         ChannelMediaOptions option = new ChannelMediaOptions();
         option.autoSubscribeAudio = true;
         option.autoSubscribeVideo = true;

Android/APIExample/app/src/main/java/io/agora/api/example/examples/basic/JoinChannelAudio.java

@@ -1,6 +1,7 @@
 package io.agora.api.example.examples.basic;
 
 import android.content.Context;
+import android.media.AudioRecordingConfiguration;
 import android.os.Bundle;
 import android.os.Handler;
 import android.text.TextUtils;
@@ -111,6 +112,7 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState)
             config.mEventHandler = iRtcEngineEventHandler;
             config.mAudioScenario = Constants.AudioScenario.getValue(Constants.AudioScenario.HIGH_DEFINITION);
             engine = RtcEngine.create(config);
+            engine.startAudioRecording();
         }
         catch (Exception e)
         {
@@ -221,7 +223,7 @@ private void joinChannel(String channelId)
         }
         /** Allows a user to join a channel.
          if you do not specify the uid, we will generate the uid for you*/
-        engine.enableAudioVolumeIndication(1000, 3);
+        engine.enableAudioVolumeIndication(1000, 3, true);
 
         ChannelMediaOptions option = new ChannelMediaOptions();
         option.autoSubscribeAudio = true;

macOS/APIExample/Examples/Advanced/AudioMixing/AudioMixing.swift

@@ -469,7 +469,7 @@ class AudioMixing: BaseViewController {
 
     @IBAction func onStartAudioMixing(_ sender: NSButton) {
         if let filepath = Bundle.main.path(forResource: "audiomixing", ofType: "mp3") {
-            let result = agoraKit.startAudioMixing("", loopback: false, replace: false, cycle: -1)
+            let result = agoraKit.startAudioMixing(filepath, loopback: false, replace: false, cycle: -1)
             if result != 0 {
                 self.showAlert(title: "Error", message: "startAudioMixing call failed: \(result), please check your params")
             } else {