Fix rendering. Done and dusted 😎

rostopira · rostopira · commit f5c8a14eeb87 · 2018-12-04T10:04:07.000+03:00
diff --git a/android/src/main/java/com/cloudwebrtc/webrtc/FlutterRTCVideoRenderer.java b/android/src/main/java/com/cloudwebrtc/webrtc/FlutterRTCVideoRenderer.java
@@ -12,7 +12,6 @@
 import org.webrtc.EglBase;
 import org.webrtc.MediaStream;
 import org.webrtc.RendererCommon.RendererEvents;
-import org.webrtc.SurfaceViewRenderer;
 import org.webrtc.VideoTrack;
 
 import io.flutter.plugin.common.EventChannel;
@@ -21,7 +20,6 @@ public class FlutterRTCVideoRenderer implements EventChannel.StreamHandler {
 
     private static final String TAG = FlutterWebRTCPlugin.TAG;
     private final SurfaceTexture texture;
-    private final Context context;
     private int id = -1;
 
     public void Dispose(){
@@ -98,12 +96,12 @@ public void onFrameResolutionChanged(
     EventChannel eventChannel;
     EventChannel.EventSink eventSink;
 
-    public FlutterRTCVideoRenderer(SurfaceTexture texture, Context context) {
-        this.surfaceTextureRenderer = new SurfaceTextureRenderer(context, texture);
-        SurfaceViewRenderer svr = new SurfaceViewRenderer(context);
+    public FlutterRTCVideoRenderer(SurfaceTexture texture) {
+        this.surfaceTextureRenderer = new SurfaceTextureRenderer("");
+        surfaceTextureRenderer.init(EglUtils.getRootEglBaseContext(), rendererEvents);
+        surfaceTextureRenderer.surfaceCreated(texture);
 
         this.texture = texture;
-        this.context = context;
         this.eventSink = null;
     }
 
@@ -195,8 +193,8 @@ private void tryAddRendererToVideoTrack() {
             }
 
             surfaceTextureRenderer.release();
-            surfaceTextureRenderer = new SurfaceTextureRenderer(context, texture);
             surfaceTextureRenderer.init(sharedContext, rendererEvents);
+            surfaceTextureRenderer.surfaceCreated(texture);
 
             videoTrack.addSink(surfaceTextureRenderer);
         }
diff --git a/android/src/main/java/com/cloudwebrtc/webrtc/FlutterWebRTCPlugin.java b/android/src/main/java/com/cloudwebrtc/webrtc/FlutterWebRTCPlugin.java
@@ -4,7 +4,6 @@
 import android.content.Context;
 import android.hardware.Camera;
 import android.graphics.SurfaceTexture;
-import android.os.Process;
 import android.util.Log;
 import android.util.LongSparseArray;
 
@@ -232,7 +231,7 @@ public void onMethodCall(MethodCall call, Result result) {
         } else if (call.method.equals("createVideoRenderer")) {
             TextureRegistry.SurfaceTextureEntry entry = textures.createSurfaceTexture();
             SurfaceTexture surfaceTexture = entry.surfaceTexture();
-            FlutterRTCVideoRenderer render = new FlutterRTCVideoRenderer(surfaceTexture, getContext());
+            FlutterRTCVideoRenderer render = new FlutterRTCVideoRenderer(surfaceTexture);
             renders.put(entry.id(), render);
 
             EventChannel eventChannel =
diff --git a/android/src/main/java/com/cloudwebrtc/webrtc/SurfaceTextureRenderer.java b/android/src/main/java/com/cloudwebrtc/webrtc/SurfaceTextureRenderer.java
