[Android]remove super resolution module and move super resolution config to live streaming module.

Author: xgfd3

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

@@ -35,7 +35,6 @@
 import io.agora.api.example.examples.advanced.SetVideoProfile;
 import io.agora.api.example.examples.advanced.SpatialSound;
 import io.agora.api.example.examples.advanced.StreamEncrypt;
-import io.agora.api.example.examples.advanced.SuperResolution;
 import io.agora.api.example.examples.advanced.SwitchExternalVideo;
 import io.agora.api.example.examples.advanced.VideoMetadata;
 import io.agora.api.example.examples.advanced.VideoQuickSwitch;
@@ -133,9 +132,6 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
             case R.id.action_mainFragment_to_hostacrosschannel:
                 fragment = new HostAcrossChannel();
                 break;
-            case R.id.action_mainFragment_to_superResolution:
-                fragment = new SuperResolution();
-                break;
             case R.id.action_mainFragment_to_set_video_profile:
                 fragment = new SetVideoProfile();
                 break;

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

@@ -51,15 +51,16 @@ public class LiveStreaming extends BaseFragment implements View.OnClickListener
     private static final String TAG = LiveStreaming.class.getSimpleName();
 
     private FrameLayout foreGroundVideo, backGroundVideo;
-    private Button join, publish, latency;
+    private Button join, publish, latency, super_resolution;
     private EditText et_channel;
     private RtcEngine engine;
     private int myUid;
     private int remoteUid;
     private boolean joined = false;
     private boolean isHost = false;
     private boolean isLowLatency = false;
-    private boolean isLocalVideoForeground = false;
+    private boolean isLocalVideoForeground = true;
+    private boolean enableSuperResolution = false;
     private SeekBar sbCameraRotate;
 
     @Nullable
@@ -76,6 +77,8 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         publish = view.findViewById(R.id.btn_publish);
         latency = view.findViewById(R.id.btn_latency);
         et_channel = view.findViewById(R.id.et_channel);
+        super_resolution = view.findViewById(R.id.btn_super_resolution);
+        super_resolution.setOnClickListener(this);
         latency.setEnabled(false);
         publish.setEnabled(false);
         view.findViewById(R.id.btn_join).setOnClickListener(this);
@@ -166,6 +169,8 @@ public void onClick(View v) {
                     joinChannel(channelId);
                 }).start();
             } else {
+                remoteUid = 0;
+                isHost = false;
                 joined = false;
                 /**After joining a channel, the user must call the leaveChannel method to end the
                  * call before joining another channel. This method returns 0 if the user leaves the
@@ -185,10 +190,17 @@ public void onClick(View v) {
                  *      2:If you call the leaveChannel method during CDN live streaming, the SDK
                  *          triggers the removeInjectStreamUrl method.*/
                 engine.leaveChannel();
-                join.setText(getString(R.string.join));
+                engine.stopPreview();
+
+
                 foreGroundVideo.removeAllViews();
                 backGroundVideo.removeAllViews();
-                engine.stopPreview();
+
+                publish.setText(getString(R.string.enable_publish));
+                join.setText(getString(R.string.join));
+                publish.setEnabled(false);
+                latency.setEnabled(false);
+                super_resolution.setEnabled(false);
             }
         } else if (v.getId() == R.id.btn_publish) {
             isHost = !isHost;
@@ -241,6 +253,11 @@ public void onClick(View v) {
                 localView.setZOrderMediaOverlay(true);
                 localView.setZOrderOnTop(true);
             }
+        }else if(v.getId() == R.id.btn_super_resolution){
+            int ret = engine.enableRemoteSuperResolution(remoteUid, !enableSuperResolution);
+            if(ret!=0){
+                Log.w(TAG, String.format("enableRemoteSuperResolution error code %d ", ret));
+            }
         }
 
     }
@@ -481,6 +498,8 @@ public void onUserJoined(int uid, int elapsed) {
 
                 // Setup remote video to render
                 engine.setupRemoteVideo(new VideoCanvas(surfaceView, RENDER_MODE_HIDDEN, remoteUid));
+
+                super_resolution.setEnabled(true);
             });
         }
 
@@ -498,13 +517,16 @@ 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));
+            remoteUid = 0;
             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));
+
+                    super_resolution.setEnabled(false);
                 }
             });
         }
@@ -525,5 +547,36 @@ public void run() {
                 }
             });
         }
+
+        /**
+         *
+         * @param uid       remote user id
+         * @param enabled   updated status of super resolution
+         * @param reason    possible reasons are:
+         *                  SR_STATE_REASON_SUCCESS(0)
+         *                  SR_STATE_REASON_STREAM_OVER_LIMITATION(1)
+         *                  SR_STATE_REASON_USER_COUNT_OVER_LIMITATION(2)
+         *                  SR_STATE_REASON_DEVICE_NOT_SUPPORTED(3)
+         */
+        @Override
+        public void onUserSuperResolutionEnabled(int uid, boolean enabled, int reason) {
+            super.onUserSuperResolutionEnabled(uid, enabled, reason);
+            if(uid == 0 && !enabled && reason == 3){
+                showLongToast(String.format("Unfortunately, Super Resolution can't enabled because your device doesn't support this feature."));
+                return;
+            }
+            if(remoteUid == uid){
+                if(reason!=0){
+                    showLongToast(String.format("Super Resolution can't enabled because of reason code: %d", reason));
+                }
+                enableSuperResolution = enabled;
+                handler.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        super_resolution.setText(enableSuperResolution?getText(R.string.closesuperr):getText(R.string.opensuperr));
+                    }
+                });
+            }
+        }
     };
 }