Merge branch 'refs/heads/dev/4.5.0' into dev/4.5.0_android

Author: weileifrank

iOS/APIExample-Audio/APIExample-Audio/Examples/Advanced/CustomAudioRender/CustomAudioRender.swift

@@ -71,6 +71,9 @@ class CustomAudioRenderMain: BaseViewController {
         // Set audio route to speaker
         agoraKit.setDefaultAudioRouteToSpeakerphone(true)
 
+        // It is necessary to use publishMicrophoneTrack(true) and pullPlaybackAudio should utilize gameStreaming.
+        agoraKit.setAudioScenario(.gameStreaming)
+        
         // important!! this example is using onPlaybackAudioFrame to do custom rendering
         // by default the audio output will still be processed by SDK hence below api call is mandatory to disable that behavior
 //        agoraKit.adjustPlaybackSignalVolume(0)
@@ -88,7 +91,7 @@ class CustomAudioRenderMain: BaseViewController {
         // the token has to match the ones used for channel join
         let option = AgoraRtcChannelMediaOptions()
         option.publishCameraTrack = false
-        option.publishMicrophoneTrack = false
+        option.publishMicrophoneTrack = true
         option.autoSubscribeAudio = true
         option.autoSubscribeVideo = false
         option.channelProfile = .liveBroadcasting

iOS/APIExample/APIExample/Examples/Advanced/CustomAudioRender/CustomAudioRender.swift

@@ -71,6 +71,8 @@ class CustomAudioRenderMain: BaseViewController {
         agoraKit.enableAudio()
         // Set audio route to speaker
         agoraKit.setDefaultAudioRouteToSpeakerphone(true)
+        // It is necessary to use publishMicrophoneTrack(true) and pullPlaybackAudio should utilize gameStreaming.
+        agoraKit.setAudioScenario(.gameStreaming)
 
         // start joining channel
         // 1. Users can only see each other after they join the
@@ -80,7 +82,7 @@ class CustomAudioRenderMain: BaseViewController {
         // the token has to match the ones used for channel join
         let option = AgoraRtcChannelMediaOptions()
         option.publishCameraTrack = false
-        option.publishMicrophoneTrack = false
+        option.publishMicrophoneTrack = true
         option.autoSubscribeAudio = true
         option.autoSubscribeVideo = false
         option.channelProfile = .liveBroadcasting

iOS/APIExample/APIExample/Examples/Advanced/TransparentRender/TransparentRender.swift

@@ -95,7 +95,10 @@ class TransparentRenderViewController: BaseViewController {
         setupLocalAlphaCavans()
     }
 
-    override func viewDidDisappear(_ animated: Bool) {
+    
+    override func viewWillDisappear(_ animated: Bool) {
+        super.viewWillDisappear(animated)
+        agoraKit.destroyMediaPlayer(mediaPlayer)
         agoraKit.leaveChannel()
         agoraKit.disableVideo()
         agoraKit.stopPreview()

macOS/APIExample/Examples/Advanced/CustomAudioRender/CustomAudioRender.swift

@@ -172,7 +172,8 @@ class CustomAudioRender: BaseViewController {
             // set live broadcaster mode
             agoraKit.setChannelProfile(.liveBroadcasting)
 
-            
+            // It is necessary to use publishMicrophoneTrack(true) and pullPlaybackAudio should utilize gameStreaming.
+            agoraKit.setAudioScenario(.gameStreaming)
 
             // start joining channel
             // 1. Users can only see each other after they join the
@@ -183,7 +184,7 @@ class CustomAudioRender: BaseViewController {
             isProcessing = true
             let option = AgoraRtcChannelMediaOptions()
             option.publishCameraTrack = false
-            option.publishMicrophoneTrack = false
+            option.publishMicrophoneTrack = true
             option.autoSubscribeAudio = true
             option.autoSubscribeVideo = false
             option.channelProfile = .liveBroadcasting

windows/APIExample/APIExample/Advanced/CrossChannel/CAgoraCrossChannelDlg.cpp

@@ -166,6 +166,7 @@ void CAgoraCrossChannelDlg::ResumeStatus()
 {
 	InitCtrlText();
 	m_lstInfo.ResetContent();
+	m_cmbCrossChannelList.ResetContent();
 	m_staDetails.SetWindowText(_T(""));
 	m_edtChannel.SetWindowText(_T(""));
 	m_edtCrossChannel.SetWindowText(_T(""));