Merge pull request #215 from oOJohn6Oo/fix

[BGF] Push to CDN, Play audio, Set Video Properties crash fixes.

Author: xia ning

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

@@ -260,36 +260,40 @@ else if (v.getId() == R.id.btn_effect)
     }
 
     private void stopProgressTimer() {
-        if(!progressTimer.isCancelled()){
-            progressTimer.cancel(true);
-        }
+        handler.removeCallbacksAndMessages(null);
+//        if(!progressTimer.isCancelled()){
+//            progressTimer.cancel(true);
+//        }
     }
 
     private void startProgressTimer() {
-        if(!progressTimer.getStatus().equals(AsyncTask.Status.RUNNING)){
-            progressTimer.execute();
-        }
+        final int result = (int) ((float) engine.getAudioMixingCurrentPosition() / (float) engine.getAudioMixingDuration(Constant.MIX_FILE_PATH) * 100);
+        mixingProgressBar.setProgress(Long.valueOf(result).intValue());
+        handler.postDelayed(this::startProgressTimer, 500);
+//        if(!progressTimer.getStatus().equals(AsyncTask.Status.RUNNING)){
+//            progressTimer.execute();
+//        }
     }
 
-    private final AsyncTask progressTimer = new AsyncTask() {
-        @Override
-        protected Object doInBackground(Object[] objects) {
-            while(true){
-                try {
-                    handler.post(new Runnable() {
-                        @Override
-                        public void run() {
-                            final int result = (int) ((float) engine.getAudioMixingCurrentPosition() / (float) engine.getAudioMixingDuration(Constant.MIX_FILE_PATH) * 100);
-                            mixingProgressBar.setProgress(Long.valueOf(result).intValue());
-                        }
-                    });
-                    Thread.sleep(500);
-                } catch (InterruptedException e) {
-                    Log.e(TAG, e.getMessage());
-                }
-            }
-        }
-    };
+//    private final AsyncTask progressTimer = new AsyncTask() {
+//        @Override
+//        protected Object doInBackground(Object[] objects) {
+//            while(true){
+//                try {
+//                    handler.post(new Runnable() {
+//                        @Override
+//                        public void run() {
+//                            final int result = (int) ((float) engine.getAudioMixingCurrentPosition() / (float) engine.getAudioMixingDuration(Constant.MIX_FILE_PATH) * 100);
+//                            mixingProgressBar.setProgress(Long.valueOf(result).intValue());
+//                        }
+//                    });
+//                    Thread.sleep(500);
+//                } catch (InterruptedException e) {
+//                    Log.e(TAG, e.getMessage());
+//                }
+//            }
+//        }
+//    };
 
     /**
      * @param channelId Specify the channel name that you want to join.

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

@@ -137,6 +137,7 @@ public void onDestroy() {
         if (engine != null) {
             engine.leaveChannel();
         }
+        if(retryTask!=null) retryTask.cancel(true);
         handler.post(RtcEngine::destroy);
         engine = null;
     }
@@ -313,6 +314,22 @@ private void startPublish() {
          *   This method adds only one stream HTTP/HTTPS URL address each time it is called.*/
         int code = engine.addPublishStreamUrl(et_url.getText().toString(), transCodeSwitch.isChecked());
         if(code == 0){
+            retryTask = new AsyncTask() {
+                @Override
+                protected Object doInBackground(Object[] objects) {
+                    Integer result = null;
+                    for (int i = 0; i < MAX_RETRY_TIMES; i++) {
+                        try {
+                            Thread.sleep(60 * 1000);
+                        } catch (InterruptedException e) {
+                            Log.e(TAG, e.getMessage());
+                            break;
+                        }
+                        result = engine.addPublishStreamUrl(et_url.getText().toString(), transCodeSwitch.isChecked());
+                    }
+                    return result;
+                }
+            };
             retryTask.execute();
         }
         /**Prevent repeated entry*/
@@ -338,6 +355,7 @@ private void stopPublish() {
          *   This method applies to Live Broadcast only.
          *   This method removes only one stream RTMP URL address each time it is called.*/
         unpublishing = true;
+        retryTask.cancel(true);
         int ret = engine.removePublishStreamUrl(et_url.getText().toString());
     }
 
@@ -688,19 +706,5 @@ public void run() {
         }
     };
 
-    private final AsyncTask retryTask = new AsyncTask() {
-        @Override
-        protected Object doInBackground(Object[] objects) {
-            Integer result = null;
-            for (int i = 0; i < MAX_RETRY_TIMES; i++) {
-                try {
-                    Thread.sleep(60 * 1000);
-                } catch (InterruptedException e) {
-                    Log.e(TAG, e.getMessage());
-                }
-                result = engine.addPublishStreamUrl(et_url.getText().toString(), transCodeSwitch.isChecked());
-            }
-            return result;
-        }
-    };
+    private AsyncTask retryTask;
 }

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

@@ -38,6 +38,7 @@
 import static io.agora.rtc.video.VideoCanvas.RENDER_MODE_HIDDEN;
 import static io.agora.rtc.video.VideoEncoderConfiguration.FRAME_RATE.FRAME_RATE_FPS_15;
 import static io.agora.rtc.video.VideoEncoderConfiguration.ORIENTATION_MODE.ORIENTATION_MODE_ADAPTIVE;
+import static io.agora.rtc.video.VideoEncoderConfiguration.ORIENTATION_MODE.ORIENTATION_MODE_FIXED_LANDSCAPE;
 import static io.agora.rtc.video.VideoEncoderConfiguration.STANDARD_BITRATE;
 import static io.agora.rtc.video.VideoEncoderConfiguration.VD_640x360;
 
@@ -277,9 +278,9 @@ private void joinChannel(String channelId)
 
         engine.setVideoEncoderConfiguration(new VideoEncoderConfiguration(
                 value,
-                VideoEncoderConfiguration.FRAME_RATE.valueOf(framerate.getSelectedItem().toString()),
-                Integer.valueOf(et_bitrate.getText().toString()),
-                VideoEncoderConfiguration.ORIENTATION_MODE.valueOf(orientation.getSelectedItem().toString())
+                VideoEncoderConfiguration.FRAME_RATE.values()[framerate.getSelectedItemPosition()],
+                Integer.parseInt(et_bitrate.getText().toString()),
+                VideoEncoderConfiguration.ORIENTATION_MODE.values()[orientation.getSelectedItemPosition()]
         ));
 
         /**Please configure accessToken in the string_config file.