| Index: 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 c0b5f028bd2ed4be7e16c215c495b99152351aaf..4e507007107d09fa98cf4596d43c9e06a391a1fa 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 @@ class MediaCodecVideoEncoderFactory
|
| 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 @@ class MediaCodecVideoEncoderFactory
|
| 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_;
|
|
|