commit 0f0e7a6f18ce142f53c7c39c1fe64297415ebe74
author Magnus Jedvert <magjed@webrtc.org> Wed Jul 11 14:53:21 2018 +0200
committer Commit Bot <commit-bot@chromium.org> Wed Jul 11 13:46:05 2018 +0000
tree aef0aaa01700fb070fa3403c74d429e28c64b1fa
parent 2234121cfb1f96e6067873688c0b0d06cbfb4260

Android: Remove use of EGLContexts in PeerConnectionFactory

Since the legacy video codecs seem to be around for some time more, we
need to make them injectable and provide a migration path for clients
that still use them so that we can clean up PeerConnectionFactory.

This CL moves the creation of EglContexts into the legacy codec
factories. Clients can then migrate to setEGLContext() instead of using
setVideoHwAccelerationOptions().

Bug: webrtc:9502
Change-Id: I608607b32db73ce3df7704a061e66d9d53946af5
Reviewed-on: https://webrtc-review.googlesource.com/87941
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Commit-Queue: Magnus Jedvert <magjed@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23934}

sdk/android/api/org/webrtc/MediaCodecVideoEncoder.java

diff --git a/sdk/android/api/org/webrtc/MediaCodecVideoEncoder.java b/sdk/android/api/org/webrtc/MediaCodecVideoEncoder.java
index 63aa272..311a3ec 100644
--- a/sdk/android/api/org/webrtc/MediaCodecVideoEncoder.java
+++ b/sdk/android/api/org/webrtc/MediaCodecVideoEncoder.java
@@ -30,6 +30,7 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Nullable;
+import org.webrtc.EglBase;
 import org.webrtc.EglBase14;
 import org.webrtc.VideoFrame;
 
@@ -37,6 +38,7 @@
 // This class is an implementation detail of the Java PeerConnection API.
 @TargetApi(19)
 @SuppressWarnings("deprecation")
+@Deprecated
 public class MediaCodecVideoEncoder {
   // This class is constructed, operated, and destroyed by its C++ incarnation,
   // so the class and its methods have non-public visibility.  The API this
@@ -79,6 +81,7 @@
   private static int codecErrors = 0;
   // List of disabled codec types - can be set from application.
   private static Set<String> hwEncoderDisabledTypes = new HashSet<String>();
+  @Nullable private static EglBase staticEglBase;
 
   @Nullable private Thread mediaCodecThread;
   @Nullable private MediaCodec mediaCodec;
@@ -147,6 +150,36 @@
     }
   }
 
+  /**
+   * Set EGL context used by HW encoding. The EGL context must be shared with the video capturer
+   * and any local render.
+   */
+  public static void setEglContext(EglBase.Context eglContext) {
+    if (staticEglBase != null) {
+      Logging.w(TAG, "Egl context already set.");
+      staticEglBase.release();
+    }
+    staticEglBase = EglBase.create(eglContext);
+  }
+
+  /** Dispose the EGL context used by HW encoding. */
+  public static void disposeEglContext() {
+    if (staticEglBase != null) {
+      staticEglBase.release();
+      staticEglBase = null;
+    }
+  }
+
+  @Nullable
+  static EglBase.Context getEglContext() {
+    return staticEglBase == null ? null : staticEglBase.getEglBaseContext();
+  }
+
+  @CalledByNative
+  static boolean hasEgl14Context() {
+    return staticEglBase instanceof EglBase14;
+  }
+
   // List of supported HW VP8 encoders.
   private static final MediaCodecProperties qcomVp8HwProperties = new MediaCodecProperties(
       "OMX.qcom.", Build.VERSION_CODES.KITKAT, BitrateAdjustmentType.NO_ADJUSTMENT);
@@ -446,8 +479,7 @@
 
   @CalledByNativeUnchecked
   boolean initEncode(VideoCodecType type, int profile, int width, int height, int kbps, int fps,
-      @Nullable EglBase14.Context sharedContext) {
-    final boolean useSurface = sharedContext != null;
+      boolean useSurface) {
     Logging.d(TAG,
         "Java initEncode: " + type + ". Profile: " + profile + " : " + width + " x " + height
             + ". @ " + kbps + " kbps. Fps: " + fps + ". Encode from texture : " + useSurface);
@@ -548,7 +580,7 @@
       mediaCodec.configure(format, null, null, MediaCodec.CONFIGURE_FLAG_ENCODE);
 
       if (useSurface) {
-        eglBase = new EglBase14(sharedContext, EglBase.CONFIG_RECORDABLE);
+        eglBase = new EglBase14((EglBase14.Context) getEglContext(), EglBase.CONFIG_RECORDABLE);
         // Create an input surface and keep a reference since we must release the surface when done.
         inputSurface = mediaCodec.createInputSurface();
         eglBase.createSurface(inputSurface);