flutter-webrtc · cloudwebrtc · Oct 13, 2020 · Sep 28, 2020 · Oct 2, 2020 · Oct 6, 2020
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ WebRTC plugin for Flutter Mobile/Desktop/Web
 | Audio/Video | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | [WIP] | [WIP] | |
 | Data Channel | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | [WIP] | [WIP] | |
 | Screen Capture | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | | | |
-| Unified-Plan | | |  | | | | |
+| Unified-Plan | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | | | |
 | MediaRecorder| :warning: | :warning: | :heavy_check_mark: | | | | |
 
 ## Usage

diff --git a/android/build.gradle b/android/build.gradle
@@ -25,7 +25,7 @@ android {
     compileSdkVersion 28
 
     defaultConfig {
-        minSdkVersion 18
+        minSdkVersion 21
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'proguard-rules.pro'
     }
@@ -41,6 +41,6 @@ android {
 }
 
 dependencies {
-    api 'org.webrtc:google-webrtc:1.0.30039'
+    api 'org.webrtc:google-webrtc:1.0.32006'
     implementation "androidx.annotation:annotation:1.1.0"
 }
diff --git a/android/src/main/java/com/cloudwebrtc/webrtc/FlutterRTCVideoRenderer.java b/android/src/main/java/com/cloudwebrtc/webrtc/FlutterRTCVideoRenderer.java
@@ -170,9 +170,10 @@ private void setVideoTrack(VideoTrack videoTrack) {
             this.videoTrack = videoTrack;
 
             if (videoTrack != null) {
+                Log.w(TAG, "FlutterRTCVideoRenderer.setVideoTrack, set video track to " + videoTrack.id());
                 tryAddRendererToVideoTrack();
             } else {
-                Log.w(TAG, "VideoTrack is null");
+                Log.w(TAG, "FlutterRTCVideoRenderer.setVideoTrack, set video track to null");
             }
         }
     }

diff --git a/android/src/main/java/com/cloudwebrtc/webrtc/GetUserMediaImpl.java b/android/src/main/java/com/cloudwebrtc/webrtc/GetUserMediaImpl.java
@@ -211,6 +211,12 @@ public void onResume() {
         this.applicationContext = applicationContext;
     }
 
+    static private void resultError(String method, String error, Result result) {
+        String errorMsg = method + "(): " + error;
+        result.error(method, errorMsg,null);
+        Log.d(TAG, errorMsg);
+    }
+
     /**
      * Includes default constraints set for the audio media type.
      *
@@ -396,7 +402,7 @@ void getUserMedia(
         // requestedMediaTypes is the empty set, the method invocation fails
         // with a TypeError.
         if (requestPermissions.isEmpty()) {
-            result.error("TypeError", "constraints requests no media types", null);
+            resultError("getUserMedia", "TypeError, constraints requests no media types", result);
             return;
         }
 
@@ -423,7 +429,7 @@ public void invoke(Object... args) {
                         // getUserMedia() algorithm, if the user has denied
                         // permission, fail "with a new DOMException object whose
                         // name attribute has the value NotAllowedError."
-                        result.error("DOMException", "NotAllowedError", null);
+                        resultError("getUserMedia", "DOMException, NotAllowedError", result);
                     }
                 });
     }
@@ -453,7 +459,7 @@ protected void onReceiveResult(int requestCode, Bundle resultData) {
                         Intent mediaProjectionData = resultData.getParcelable(PROJECTION_DATA);
 
                         if (resultCode != Activity.RESULT_OK) {
-                            result.error(null, "User didn't give permission to capture the screen.", null);
+                            resultError("screenRequestPremissions", "User didn't give permission to capture the screen.", result);
                             return;
                         }
 
@@ -465,13 +471,11 @@ protected void onReceiveResult(int requestCode, Bundle resultData) {
                                         new MediaProjection.Callback() {
                                             @Override
                                             public void onStop() {
-                                                Log.e(TAG, "User revoked permission to capture the screen.");
-                                                result.error(null, "User revoked permission to capture the screen.", null);
+                                                resultError("MediaProjection.Callback()", "User revoked permission to capture the screen.", result);
                                             }
                                         });
                         if (videoCapturer == null) {
-                            result.error(
-                                    /* type */ "GetDisplayMediaFailed", "Failed to create new VideoCapturer!", null);
+                            resultError("screenRequestPremissions", "GetDisplayMediaFailed, User revoked permission to capture the screen.", result);
                             return;
                         }
 
@@ -573,7 +577,7 @@ private void getUserMedia(
             // specified by
             // https://www.w3.org/TR/mediacapture-streams/#dom-mediadevices-getusermedia
             // with respect to distinguishing the various causes of failure.
-            result.error(/* type */ "GetUserMediaFailed", "Failed to create new track", null);
+            resultError("getUserMedia", "Failed to create new track.", result);
             return;
         }
 
@@ -753,7 +757,7 @@ private void requestPermissions(
     void switchCamera(String id, Result result) {
         VideoCapturer videoCapturer = mVideoCapturers.get(id);
         if (videoCapturer == null) {
-            result.error(null, "Video capturer not found for id: " + id, null);
+            resultError("switchCamera", "Video capturer not found for id: " + id, result);
             return;
         }
 
@@ -767,7 +771,7 @@ public void onCameraSwitchDone(boolean b) {
 
                     @Override
                     public void onCameraSwitchError(String s) {
-                        result.error("Switching camera failed", s, null);
+                        resultError("switchCamera", "Switching camera failed: " + id, result);
                     }
                 });
     }
@@ -818,7 +822,7 @@ void stopRecording(Integer id) {
     void hasTorch(String trackId, Result result) {
         VideoCapturer videoCapturer = mVideoCapturers.get(trackId);
         if (videoCapturer == null) {
-            result.error(null, "Video capturer not found for id: " + trackId, null);
+            resultError("hasTorch", "Video capturer not found for id: " + trackId, result);
             return;
         }
 
@@ -837,8 +841,7 @@ void hasTorch(String trackId, Result result) {
                         (CameraDevice) getPrivateProperty(session.getClass(), session, "cameraDevice");
             } catch (NoSuchFieldWithNameException e) {
                 // Most likely the upstream Camera2Capturer class have changed
-                Log.e(TAG, "[TORCH] Failed to get `" + e.fieldName + "` from `" + e.className + "`");
-                result.error(null, "Failed to get `" + e.fieldName + "` from `" + e.className + "`", null);
+                resultError("hasTorch", "[TORCH] Failed to get `" + e.fieldName + "` from `" + e.className + "`", result);
                 return;
             }
 
@@ -866,8 +869,7 @@ void hasTorch(String trackId, Result result) {
                 camera = (Camera) getPrivateProperty(session.getClass(), session, "camera");
             } catch (NoSuchFieldWithNameException e) {
                 // Most likely the upstream Camera1Capturer class have changed
-                Log.e(TAG, "[TORCH] Failed to get `" + e.fieldName + "` from `" + e.className + "`");
-                result.error(null, "Failed to get `" + e.fieldName + "` from `" + e.className + "`", null);
+                resultError("hasTorch", "[TORCH] Failed to get `" + e.fieldName + "` from `" + e.className + "`", result);
                 return;
             }
 
@@ -879,15 +881,14 @@ void hasTorch(String trackId, Result result) {
             return;
         }
 
-        Log.e(TAG, "[TORCH] Video capturer not compatible");
-        result.error(null, "Video capturer not compatible", null);
+        resultError("hasTorch", "[TORCH] Video capturer not compatible", result);
     }
 
     @RequiresApi(api = VERSION_CODES.LOLLIPOP)
     void setTorch(String trackId, boolean torch, Result result) {
         VideoCapturer videoCapturer = mVideoCapturers.get(trackId);
         if (videoCapturer == null) {
-            result.error(null, "Video capturer not found for id: " + trackId, null);
+            resultError("setTorch", "Video capturer not found for id: " + trackId, result);
             return;
         }
 
@@ -919,8 +920,7 @@ void setTorch(String trackId, boolean torch, Result result) {
                         (Handler) getPrivateProperty(session.getClass(), session, "cameraThreadHandler");
             } catch (NoSuchFieldWithNameException e) {
                 // Most likely the upstream Camera2Capturer class have changed
-                Log.e(TAG, "[TORCH] Failed to get `" + e.fieldName + "` from `" + e.className + "`");
-                result.error(null, "Failed to get `" + e.fieldName + "` from `" + e.className + "`", null);
+                resultError("setTorch", "[TORCH] Failed to get `" + e.fieldName + "` from `" + e.className + "`", result);
                 return;
             }
 
@@ -959,8 +959,7 @@ void setTorch(String trackId, boolean torch, Result result) {
                 camera = (Camera) getPrivateProperty(session.getClass(), session, "camera");
             } catch (NoSuchFieldWithNameException e) {
                 // Most likely the upstream Camera1Capturer class have changed
-                Log.e(TAG, "[TORCH] Failed to get `" + e.fieldName + "` from `" + e.className + "`");
-                result.error(null, "Failed to get `" + e.fieldName + "` from `" + e.className + "`", null);
+                resultError("setTorch", "[TORCH] Failed to get `" + e.fieldName + "` from `" + e.className + "`", result);
                 return;
             }
 
@@ -972,9 +971,7 @@ void setTorch(String trackId, boolean torch, Result result) {
             result.success(null);
             return;
         }
-
-        Log.e(TAG, "[TORCH] Video capturer not compatible");
-        result.error(null, "Video capturer not compatible", null);
+        resultError("setTorch", "[TORCH] Video capturer not compatible", result);
     }
 
     private Object getPrivateProperty(Class klass, Object object, String fieldName)