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

Author: xianing

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

@@ -459,10 +459,10 @@ public boolean onMediaPlayerVideoFrame(VideoFrame videoFrame, int i) {
         }
 
         @Override
-        public boolean onRenderVideoFrame(int i, RtcConnection rtcConnection, VideoFrame videoFrame) {
+        public boolean onRenderVideoFrame(String s, int i, VideoFrame videoFrame) {
 //            Log.d(TAG, "onRenderVideoFrame: " + i + "   connection: " + rtcConnection.id + "  buffer: " + videoFrame.getBuffer());
             if (mSurfaceView != null && videoFrame != lastI420Frame){
-                Log.d(TAG, "onRenderVideoFrame: " + i + "   connection: " + rtcConnection.id + "  buffer: " + videoFrame.getBuffer());
+                Log.d(TAG, "onRenderVideoFrame: " + i + "   connection: " + s + "  buffer: " + videoFrame.getBuffer());
                 lastI420Frame = videoFrame;
                 textureBufferHelper.invoke(new Callable<Void>() {
                     @Override

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

@@ -34,6 +34,8 @@
 import io.agora.rtc2.video.VideoCanvas;
 import io.agora.rtc2.video.VideoEncoderConfiguration;
 
+import java.util.Random;
+
 import static io.agora.api.example.common.model.Examples.ADVANCED;
 import static io.agora.rtc2.video.VideoCanvas.RENDER_MODE_FIT;
 import static io.agora.rtc2.video.VideoCanvas.RENDER_MODE_HIDDEN;
@@ -260,7 +262,9 @@ private boolean joinSecondChannel() {
         ChannelMediaOptions mediaOptions = new ChannelMediaOptions();
         mediaOptions.autoSubscribeAudio = true;
         mediaOptions.autoSubscribeVideo = true;
-        int ret = engine.joinChannelEx(null, channel2, 0, mediaOptions, iRtcEngineEventHandler2, rtcConnection2);
+        rtcConnection2.channelId = channel2;
+        rtcConnection2.localUid = new Random().nextInt(512)+512;
+        int ret = engine.joinChannelEx(null,rtcConnection2,mediaOptions,iRtcEngineEventHandler2);
         return (ret == 0);
     }
 

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

@@ -335,7 +335,7 @@ public boolean onMixedAudioFrame(int i, int i1, int i2, int i3, int i4, ByteBuff
         }
 
         @Override
-        public boolean onPlaybackAudioFrameBeforeMixing(String s, int i, int i1, int i2, int i3, int i4, ByteBuffer byteBuffer, long l, int i5) {
+        public boolean onPlaybackAudioFrameBeforeMixing(int i, int i1, int i2, int i3, int i4, int i5, ByteBuffer byteBuffer, long l, int i6) {
             return false;
         }
     };

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

@@ -290,7 +290,7 @@ public boolean onMediaPlayerVideoFrame(VideoFrame videoFrame, int i) {
         }
 
         @Override
-        public boolean onRenderVideoFrame(int i, RtcConnection rtcConnection, VideoFrame videoFrame) {
+        public boolean onRenderVideoFrame(String s, int i, VideoFrame videoFrame) {
             return false;
         }
 

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

@@ -50,6 +50,8 @@
 import io.agora.rtc2.video.VideoCanvas;
 import io.agora.rtc2.video.VideoEncoderConfiguration;
 
+import java.util.Random;
+
 import static android.app.Activity.RESULT_OK;
 import static io.agora.api.example.common.Constant.TEXTUREVIEW;
 import static io.agora.api.example.common.model.Examples.ADVANCED;
@@ -226,12 +228,12 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
                     mediaOptions.publishCameraTrack = true;
                     mediaOptions.clientRoleType = Constants.CLIENT_ROLE_BROADCASTER;
                     mediaOptions.channelProfile = Constants.CHANNEL_PROFILE_LIVE_BROADCASTING;
-                    String channelId = et_channel.getText().toString();
-                    engine.joinChannelEx(null, channelId, 0, mediaOptions, iRtcEngineEventHandler, rtcConnection2);
+                    rtcConnection2.channelId = et_channel.getText().toString();
+                    rtcConnection2.localUid = new Random().nextInt(512)+512;
+                    engine.joinChannelEx(null ,rtcConnection2,mediaOptions,iRtcEngineEventHandler);
                 }
                 else{
-                    String channelId = et_channel.getText().toString();
-                    engine.leaveChannelEx(channelId, rtcConnection2);
+                    engine.leaveChannelEx(rtcConnection2);
                 }
         }
     }

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

@@ -24,6 +24,7 @@
 import com.yanzhenjie.permission.runtime.Permission;
 
 import java.io.File;
+import java.util.Random;
 
 import io.agora.api.example.R;
 import io.agora.api.example.annotation.Example;
@@ -189,12 +190,12 @@ else if(compoundButton.getId() == R.id.localAudio)
                 mediaOptions.enableAudioRecordingOrPlayout = false;
                 mediaOptions.clientRoleType = Constants.CLIENT_ROLE_BROADCASTER;
                 mediaOptions.channelProfile = Constants.CHANNEL_PROFILE_LIVE_BROADCASTING;
-                String channelId = et_channel.getText().toString();
-                engine.joinChannelEx(null, channelId, 0, mediaOptions, iRtcEngineEventHandlerEx, rtcConnection2);
+                rtcConnection2.channelId = et_channel.getText().toString();
+                rtcConnection2.localUid = new Random().nextInt(512)+512;
+                engine.joinChannelEx(null,rtcConnection2, mediaOptions, iRtcEngineEventHandlerEx);
             }
             else{
-                String channelId = et_channel.getText().toString();
-                engine.leaveChannelEx(channelId, rtcConnection2);
+                engine.leaveChannelEx(rtcConnection2);
                 stopPCMRecord();
             }
         }

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

@@ -145,7 +145,7 @@ private void readFile(File file) {
                                  *   0: Success.
                                  *   < 0: Failure.*/
                                 CustomAudioSource.engine.pushExternalAudioFrame(
-                                        ByteBuffer.wrap(buffer), 0, CustomAudioSource.rtcConnection2.id);
+                                        ByteBuffer.wrap(buffer), 0, CustomAudioSource.rtcConnection2.localUid);
                             } catch (Exception e) {
                                 e.printStackTrace();
                             }

windows/APIExample/APIExample/Advanced/CustomAudioCapture/CAgoraCaptureAudioDlg.cpp

@@ -63,6 +63,11 @@ bool CExtendAudioFrameObserver::onPlaybackAudioFrameBeforeMixing(media::base::us
 	return true;
 }
 
+bool CExtendAudioFrameObserver::onPlaybackAudioFrameBeforeMixing(rtc::uid_t uid, AudioFrame& audioFrame)
+{
+	return true;
+}
+
 //EID_JOINCHANNEL_SUCCESS message window handler
 LRESULT CAgoraCaptureAduioDlg::OnEIDJoinChannelSuccess(WPARAM wParam, LPARAM lParam)
 {

windows/APIExample/APIExample/Advanced/CustomAudioCapture/CAgoraCaptureAudioDlg.h

@@ -44,7 +44,9 @@ class CExtendAudioFrameObserver :
 		True: Buffer data in AudioFrame is valid, the data will be sent;
 		False: The buffer data in the AudioFrame is invalid and will be discarded.
 	*/
-	virtual bool onPlaybackAudioFrameBeforeMixing(media::base::user_id_t uid, AudioFrame& audioFrame);
+	virtual bool onPlaybackAudioFrameBeforeMixing(media::base::user_id_t uid, AudioFrame& audioFrame)override;
+
+	virtual bool onPlaybackAudioFrameBeforeMixing(rtc::uid_t uid, AudioFrame& audioFrame) override;
 };
 
 

windows/APIExample/APIExample/Advanced/CustomVideoCapture/CAgoraCaptureVideoDlg.cpp

@@ -58,7 +58,7 @@ bool CExtendVideoFrameObserver::onCaptureVideoFrame(VideoFrame & videoFrame)
 	return true;
 }
 
-bool CExtendVideoFrameObserver::onRenderVideoFrame(rtc::uid_t uid, rtc::conn_id_t connectionId, VideoFrame & videoFrame)
+bool CExtendVideoFrameObserver::onRenderVideoFrame(const char* channelId, rtc::uid_t remoteUid, VideoFrame& videoFrame)
 {
 	return false;
 }