Merge pull request #246 from AgoraIO/staging

Staging

Author: xia ning

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

@@ -60,7 +60,6 @@ public class CustomAudioSource extends BaseFragment implements View.OnClickListe
     public RtcEngine engine;
     private static final Integer SAMPLE_RATE = 44100;
     private static final Integer SAMPLE_NUM_OF_CHANNEL = 2;
-    private AudioPlayer mAudioPlayer;
     private final int bufferSize = 88200;
     private final byte[] data = new byte[bufferSize];
 
@@ -159,13 +158,6 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
             engine = RtcEngine.create(getContext().getApplicationContext(), getString(R.string.agora_app_id),
                     iRtcEngineEventHandler);
 
-            // Notify the SDK that you want to use the external audio sink.
-//            engine.setExternalAudioSink(
-//                    true,      // Enable the external audio sink.
-//                    SAMPLE_RATE,     // Set the audio sample rate as 8k, 16k, 32k, 44.1k or 48kHz.
-//                    SAMPLE_NUM_OF_CHANNEL          // Number of channels. The maximum number is 2.
-//            );
-//            mAudioPlayer = new AudioPlayer(AudioManager.STREAM_VOICE_CALL, SAMPLE_RATE, SAMPLE_NUM_OF_CHANNEL, AudioFormat.ENCODING_PCM_16BIT);
         } catch (Exception e) {
             e.printStackTrace();
             requireActivity().onBackPressed();
@@ -182,8 +174,6 @@ public void onDestroy() {
         }
         handler.postAtFrontOfQueue(RtcEngine::destroy);
         engine = null;
-//        mAudioPlayer.stopPlayer();
-//        playerTask.cancel(true);
     }
 
     @Override
@@ -308,29 +298,6 @@ private void stopAudioRecord() {
         }
     }
 
-//    private final AsyncTask playerTask = new AsyncTask() {
-//        @Override
-//        protected Object doInBackground(Object[] objects) {
-//            while (true) {
-//                if (engine != null) {
-//                    /**
-//                     * Pulls the remote audio frame.
-//                     * Before calling this method, call the setExternalAudioSink(enabled: true) method to enable and set the external audio sink.
-//                     * After a successful method call, the app pulls the decoded and mixed audio data for playback.
-//                     * @Param data: The audio data that you want to pull. The data format is in byte[].
-//                     * @Param lengthInByte: The data length (byte) of the external audio data. The value of this parameter is related to the audio duration,
-//                     * and the values of the sampleRate and channels parameters that you set in setExternalAudioSink. Agora recommends setting the audio duration no shorter than 10 ms.
-//                     * The formula for lengthInByte is:
-//                     * lengthInByte = sampleRate/1000 × 2 × channels × audio duration (ms).
-//                     */
-//                    if (engine.pullPlaybackAudioFrame(data, bufferSize) == 0) {
-//                        mAudioPlayer.play(data, 0, data.length);
-//                    }
-//                }
-//            }
-//        }
-//    };
-
     /**
      * IRtcEngineEventHandler is an abstract class providing default implementation.
      * The SDK uses this class to report to the app on SDK runtime events.
@@ -412,12 +379,6 @@ public void onRemoteAudioStateChanged(int uid, int state, int reason, int elapse
             super.onRemoteAudioStateChanged(uid, state, reason, elapsed);
             Log.i(TAG, "onRemoteAudioStateChanged->" + uid + ", state->" + state + ", reason->" + reason);
         }
-
-        @Override
-        public void onUserJoined(int uid, int elapsed) {
-            mAudioPlayer.startPlayer();
-//            playerTask.execute();
-        }
     };
 
     @Override

Android/APIExample/lib-component/build.gradle

@@ -30,7 +30,7 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 
-    api 'io.agora.rtc:full-sdk:3.5.2'
+    api 'io.agora.rtc:full-sdk:3.6.0.1'
     api 'io.agora:player:1.3.0'
 
 }

iOS/APIExample/Examples/Advanced/AudioMixing/AudioMixing.swift

@@ -170,9 +170,9 @@ class AudioMixingMain: BaseViewController {
     @IBAction func onChangeTrack(_ sender:UISegmentedControl){
         switch sender.selectedSegmentIndex {
         case 0:
-            self.trackIndex = 1
+            self.trackIndex = 0
         case 1:
-            self.trackIndex = 2
+            self.trackIndex = 1
         default:
             break
         }

iOS/Podfile

@@ -6,12 +6,12 @@ target 'APIExample' do
   use_frameworks!
   pod 'Floaty', '~> 4.2.0'  
   pod 'AGEVideoLayout', '~> 1.0.2'
-  pod 'AgoraRtcEngine_iOS', '3.5.2'
+  pod 'AgoraRtcEngine_iOS', '3.6.0.1'
   pod 'AgoraMediaPlayer_iOS', '1.2.2'
 end
 
 target 'Agora-ScreenShare-Extension' do
 
   use_frameworks!
-  pod 'AgoraRtcEngine_iOS', '3.5.2'
+  pod 'AgoraRtcEngine_iOS', '3.6.0.1'
 end