commit 461121c67b4d3625ace6e4fea762c2bef48937a7
author perkj <perkj@webrtc.org> Mon Feb 15 06:28:36 2016 -0800
committer Commit bot <commit-bot@chromium.org> Mon Feb 15 14:28:40 2016 +0000
tree 99b4be7c7cdb04089e3abe54763d03da178e30a5
parent 8259c2de0266b11a4707416c8280912f300ce41f

Replaced eglbase_jni with with holding a EglBase in PeerConnectionFactory.

Review URL: https://codereview.webrtc.org/1695763002

Cr-Commit-Position: refs/heads/master@{#11627}

webrtc/api/java/jni/androidmediaencoder_jni.h

diff --git a/webrtc/api/java/jni/androidmediaencoder_jni.h b/webrtc/api/java/jni/androidmediaencoder_jni.h
index c0b5f02..4e50700 100644
--- a/webrtc/api/java/jni/androidmediaencoder_jni.h
+++ b/webrtc/api/java/jni/androidmediaencoder_jni.h
@@ -13,7 +13,7 @@
 
 #include <vector>
 
-#include "webrtc/api/java/jni/eglbase_jni.h"
+#include "webrtc/api/java/jni/jni_helpers.h"
 #include "webrtc/media/engine/webrtcvideoencoderfactory.h"
 
 namespace webrtc_jni {
@@ -25,7 +25,7 @@
   MediaCodecVideoEncoderFactory();
   virtual ~MediaCodecVideoEncoderFactory();
 
-  void SetEGLContext(JNIEnv* jni, jobject render_egl_context);
+  void SetEGLContext(JNIEnv* jni, jobject egl_context);
 
   // WebRtcVideoEncoderFactory implementation.
   webrtc::VideoEncoder* CreateVideoEncoder(webrtc::VideoCodecType type)
@@ -34,7 +34,7 @@
   void DestroyVideoEncoder(webrtc::VideoEncoder* encoder) override;
 
  private:
-  EglBase egl_base_;
+  jobject egl_context_;
 
   // Empty if platform support is lacking, const after ctor returns.
   std::vector<VideoCodec> supported_codecs_;