Merge branch 'dev/4.0.0-GA' of github.com:AgoraIO/API-Examples into dev/4.0.0-GA

Author: zhaoyongqiang

Android/APIExample/app/src/main/java/io/agora/api/example/common/BaseFragment.java

@@ -59,11 +59,15 @@ protected final void runOnUIThread(Runnable runnable){
     }
 
     protected final void runOnUIThread(Runnable runnable, long delay){
-        if(handler != null && runnable != null){
+        if(handler != null && runnable != null && getContext() != null){
             if (delay <= 0 && handler.getLooper().getThread() == Thread.currentThread()) {
                 runnable.run();
             }else{
-                handler.postDelayed(runnable, delay);
+                handler.postDelayed(() -> {
+                    if(getContext() != null){
+                        runnable.run();
+                    }
+                }, delay);
             }
         }
     }

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

@@ -286,7 +286,7 @@ public void onJoinChannelSuccess(String channel, int uid, int elapsed) {
             user.height = canvas_height;
             user.uid = localUid;
             liveTranscoding.addUser(user);
-            engine.setLiveTranscoding(liveTranscoding);
+            engine.updateRtmpTranscoding(liveTranscoding);
         }
 
 
@@ -360,32 +360,32 @@ public void run() {
         public void onRtmpStreamingStateChanged(String url, int state, int errCode) {
             super.onRtmpStreamingStateChanged(url, state, errCode);
             showLongToast(String.format("onRtmpStreamingStateChanged state %s errCode %s", state, errCode));
+            if(state == Constants.RTMP_STREAM_PUBLISH_STATE_IDLE){
+                if (cdnStreaming) {
+                    runOnUIThread(() -> {
+                        LeaveChannelOptions leaveChannelOptions = new LeaveChannelOptions();
+                        leaveChannelOptions.stopMicrophoneRecording = false;
+                        engine.leaveChannel(leaveChannelOptions);
+                        fl_remote.removeAllViews();
+                        fl_remote_2.removeAllViews();
+                        fl_remote_3.removeAllViews();
+                        remoteViews.clear();
+                        engine.startPreview();
+                        engine.setDirectCdnStreamingVideoConfiguration(videoEncoderConfiguration);
+                        int ret = startCdnStreaming();
+                        if (ret != 0) {
+                            showLongToast(String.format("startCdnStreaming failed! error code: %d", ret));
+                            stopStreaming();
+                        }
+                    });
+                }
+            }
         }
 
         @Override
         public void onTranscodingUpdated() {
             showLongToast("RTMP transcoding updated successfully!");
         }
-
-        @Override
-        public void onStreamUnpublished(String url) {
-            if(cdnStreaming){
-                LeaveChannelOptions leaveChannelOptions = new LeaveChannelOptions();
-                leaveChannelOptions.stopMicrophoneRecording = false;
-                engine.leaveChannel(leaveChannelOptions);
-                fl_remote.removeAllViews();
-                fl_remote_2.removeAllViews();
-                fl_remote_3.removeAllViews();
-                remoteViews.clear();
-                engine.startPreview();
-                engine.setDirectCdnStreamingVideoConfiguration(videoEncoderConfiguration);
-                int ret = startCdnStreaming();
-                if(ret != 0){
-                    showLongToast(String.format("startCdnStreaming failed! error code: %d", ret));
-                    stopStreaming();
-                }
-            }
-        }
     };
 
     private void updateTranscodeLayout() {
@@ -431,14 +431,14 @@ private void updateTranscodeLayout() {
                     Log.i(TAG, "ignored user as only 2x2 video layout supported in this demo. uid:" + uid);
             }
         }
-        engine.setLiveTranscoding(liveTranscoding);
+        engine.updateRtmpTranscoding(liveTranscoding);
     }
 
     private final IDirectCdnStreamingEventHandler iDirectCdnStreamingEventHandler = new IDirectCdnStreamingEventHandler() {
 
         @Override
         public void onDirectCdnStreamingStateChanged(DirectCdnStreamingState directCdnStreamingState, DirectCdnStreamingError directCdnStreamingError, String s) {
-            handler.post(new Runnable() {
+            runOnUIThread(new Runnable() {
                 @Override
                 public void run() {
                     switch (directCdnStreamingState) {

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

@@ -287,7 +287,9 @@ public void onLeaveChannel(RtcStats stats) {
             Log.i(TAG, String.format("local user %d leaveChannel!", myUid));
             showLongToast(String.format("local user %d leaveChannel!", myUid));
             lastI420Frame = null;
-            mSurfaceView.requestRender();
+            if(mSurfaceView != null){
+                mSurfaceView.requestRender();
+            }
         }
 
         /**Occurs when the local user joins a specified channel.
@@ -439,7 +441,9 @@ public void onUserJoined(int uid, int elapsed)
         public void onUserOffline(int uid, int reason) {
             Log.i(TAG, String.format("user %d offline! reason:%d", uid, reason));
             showLongToast(String.format("user %d offline! reason:%d", uid, reason));
-            mSurfaceView.requestRender();
+            if(mSurfaceView != null){
+                mSurfaceView.requestRender();
+            }
             remoteUid = 0;
         }
     };

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

@@ -174,8 +174,10 @@ public void onClick(View v) {
                  *          the onLeaveChannel callback.
                  *      2:If you call the leaveChannel method during CDN live streaming, the SDK
                  *          triggers the removeInjectStreamUrl method.*/
+                engine.stopPreview();
                 engine.leaveChannel();
                 join.setText(getString(R.string.join));
+                remoteUid = 0;
             }
         } else if (v.getId() == R.id.btn_publish) {
             isHost = !isHost;
@@ -235,7 +237,10 @@ public void onClick(View v) {
             }
         } else if (v.getId() == R.id.btn_take_shot) {
             if (remoteUid != 0) {
-                engine.takeSnapshot(remoteUid, "/sdcard/APIExample_snapshot_" + et_channel.getText().toString() + "_" + remoteUid + ".png");
+                int ret = engine.takeSnapshot(remoteUid, "/sdcard/APIExample_snapshot_" + et_channel.getText().toString() + "_" + remoteUid + ".png");
+                if(ret != Constants.ERR_OK){
+                    showLongToast("takeSnapshot error code=" + ret + ",msg=" + RtcEngine.getErrorDescription(ret));
+                }
             } else {
                 showLongToast(getString(R.string.remote_screenshot_tip));
             }
@@ -453,16 +458,18 @@ public void onUserJoined(int uid, int elapsed) {
         public void onUserOffline(int uid, int reason) {
             Log.i(TAG, String.format("user %d offline! reason:%d", uid, reason));
             showLongToast(String.format("user %d offline! reason:%d", uid, reason));
-            if(uid == remoteUid)
-            handler.post(new Runnable() {
-                @Override
-                public void run() {
-                    /**Clear render view
-                     Note: The video will stay at its last frame, to completely remove it you will need to
-                     remove the SurfaceView from its parent*/
-                    engine.setupRemoteVideo(new VideoCanvas(null, RENDER_MODE_HIDDEN, uid));
-                }
-            });
+            if(uid == remoteUid) {
+                remoteUid = 0;
+                runOnUIThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        /**Clear render view
+                         Note: The video will stay at its last frame, to completely remove it you will need to
+                         remove the SurfaceView from its parent*/
+                        engine.setupRemoteVideo(new VideoCanvas(null, RENDER_MODE_HIDDEN, uid));
+                    }
+                });
+            }
         }
 
         /**

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

@@ -128,6 +128,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         publish = view.findViewById(R.id.publish);
 
         progressBar = view.findViewById(R.id.ctrl_progress_bar);
+        progressBar.setMax(100);
         progressBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
             @Override
             public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
@@ -204,8 +205,6 @@ public void onClick(View v) {
                 engine.stopPreview();
                 join.setText(getString(R.string.join));
                 mediaPlayer.stop();
-                mediaPlayer.destroy();
-                mediaPlayer.unRegisterPlayerObserver(this);
                 open.setEnabled(false);
                 setMediaPlayerViewEnable(false);
             }
@@ -514,7 +513,7 @@ public void run() {
 
     @Override
     public void onPlayerStateChanged(io.agora.mediaplayer.Constants.MediaPlayerState mediaPlayerState, io.agora.mediaplayer.Constants.MediaPlayerError mediaPlayerError) {
-        Log.e(TAG, "onPlayerStateChanged mediaPlayerState " + mediaPlayerState);
+        Log.e(TAG, "onPlayerStateChanged mediaPlayerState " + mediaPlayerState + ", error=" + mediaPlayerError);
         if (mediaPlayerState.equals(PLAYER_STATE_OPEN_COMPLETED)) {
             setMediaPlayerViewEnable(true);
         } else if (mediaPlayerState.equals(PLAYER_STATE_IDLE) || mediaPlayerState.equals(PLAYER_STATE_STOPPED) || mediaPlayerState.equals(PLAYER_STATE_PLAYBACK_COMPLETED) ) {

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

@@ -41,6 +41,7 @@
 )
 public class PlayAudioFiles extends BaseFragment implements View.OnClickListener, SeekBar.OnSeekBarChangeListener {
     private static final String TAG = PlayAudioFiles.class.getSimpleName();
+    private static final int EFFECT_SOUND_ID = 0;
     private EditText et_channel;
     private Button mute, join, speaker, bgm, effect;
     private SeekBar mixingPublishVolBar, mixingPlayoutVolBar, mixingVolBar;
@@ -143,24 +144,31 @@ private void preloadAudioEffect(){
         // Only mp3, aac, m4a, 3gp, and wav files are supported.
         // You may need to record the sound IDs and their file paths.
         int id = 0;
-        int preloadRet = audioEffectManager.preloadEffect(id++, Constant.EFFECT_FILE_PATH);
+        audioEffectManager.preloadEffect(id++, Constant.EFFECT_FILE_PATH);
+    }
+
+    private void playEffect() {
         /** Plays an audio effect file.
          * Returns
          * 0: Success.
          * < 0: Failure.
          */
         int playRet = audioEffectManager.playEffect(
-                0,  // The sound ID of the audio effect file to be played.
+                EFFECT_SOUND_ID,  // The sound ID of the audio effect file to be played.
                 Constant.EFFECT_FILE_PATH,  // The file path of the audio effect file.
                 -1,   // The number of playback loops. -1 means an infinite loop.
                 1,    // pitch	The pitch of the audio effect. The value ranges between 0.5 and 2. The default value is 1 (no change to the pitch). The lower the value, the lower the pitch.
                 0.0,  // Sets the spatial position of the effect. 0 means the effect shows ahead.
                 100,  // Sets the volume. The value ranges between 0 and 100. 100 is the original volume.
                 true // Sets whether to publish the audio effect.
         );
-        // Pauses all audio effects.
-        int pauseRet = audioEffectManager.pauseAllEffects();
-        Log.i(TAG, "result preloadRet:" + preloadRet + ", playRet:"+ playRet + ", pauseRet:"+ pauseRet);
+        Log.i(TAG, "result playRet:"+ playRet);
+    }
+
+    private void stopEffect() {
+        audioEffectManager.stopEffect(
+                EFFECT_SOUND_ID  // The sound ID of the audio effect file to be played.
+                );
     }
 
     @Override
@@ -246,7 +254,7 @@ else if (v.getId() == R.id.btn_speaker)
             speaker.setActivated(!speaker.isActivated());
             speaker.setText(getString(speaker.isActivated() ? R.string.speaker : R.string.earpiece));
             /**Turn off / on the speaker and change the audio playback route.*/
-            engine.setDefaultAudioRoutetoSpeakerphone(speaker.isActivated());
+            engine.setEnableSpeakerphone(speaker.isActivated());
         }
         else if(v.getId() == R.id.btn_bgm)
         {
@@ -266,11 +274,11 @@ else if (v.getId() == R.id.btn_effect)
             effect.setText(!effect.isActivated() ? getString(R.string.effect_on): getString(R.string.effect_off));
             if(effect.isActivated()){
                 // Resumes playing all audio effects.
-                audioEffectManager.resumeAllEffects();
+                playEffect();
             }
             else {
                 // Pauses all audio effects.
-                audioEffectManager.pauseAllEffects();
+                stopEffect();
             }
         }
     }

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

@@ -137,9 +137,9 @@ public void onDestroy() {
             engine.leaveChannel();
             engine.stopPreview();
         }
-        handler.post(RtcEngine::destroy);
         engine = null;
         super.onDestroy();
+        handler.post(RtcEngine::destroy);
     }
 
     @Override

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

@@ -192,9 +192,9 @@ public void onDestroy() {
                 textureBufferHelper = null;
             }
         }
-        handler.post(RtcEngine::destroy);
         engine = null;
         super.onDestroy();
+        handler.post(RtcEngine::destroy);
     }
 
     @Override

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

@@ -161,6 +161,9 @@ public void onDestroy()
             engine.leaveChannel();
             engine.stopPreview();
         }
+        if(retryTask != null){
+            retryTask.cancel(true);
+        }
         handler.post(RtcEngine::destroy);
         engine = null;
     }
@@ -541,6 +544,9 @@ public void onRemoteVideoStateChanged(int uid, int state, int reason, int elapse
         public void onRtmpStreamingStateChanged(String url, int state, int errCode) {
             super.onRtmpStreamingStateChanged(url, state, errCode);
             Log.i(TAG, "onRtmpStreamingStateChanged->" + url + ", state->" + state + ", errCode->" + errCode);
+            if(retryTask == null){
+                return;
+            }
             if(state == RTMP_STREAM_PUBLISH_STATE.RTMP_STREAM_PUBLISH_STATE_RUNNING.getValue())
             {
                 /**After confirming the successful push, make changes to the UI.*/
@@ -631,7 +637,7 @@ public void onUserJoined(int uid, int elapsed)
                 /**The transcoding images are arranged vertically according to the adding order*/
                 LiveTranscoding.TranscodingUser transcodingUser = new LiveTranscoding.TranscodingUser();
                 transcodingUser.x = 0;
-                transcodingUser.y = localTranscodingUser.height;
+                transcodingUser.y = transcoding.height / MAXUserCount;
                 transcodingUser.width = transcoding.width;
                 transcodingUser.height = transcoding.height / MAXUserCount;
                 transcodingUser.uid = uid;

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

@@ -182,9 +182,9 @@ public void onDestroy() {
             engine.leaveChannel();
             engine.stopPreview();
         }
-        handler.post(RtcEngine::destroy);
         engine = null;
         super.onDestroy();
+        handler.post(RtcEngine::destroy);
     }