Index: webrtc/api/android/jni/androidmediaencoder_jni.h |
diff --git a/webrtc/api/android/jni/androidmediaencoder_jni.h b/webrtc/api/android/jni/androidmediaencoder_jni.h |
index 74442ddfbcd217c3c3b3b274ad02f02eb17f9e67..9680ca8c3b3e23f1db648b4e5c58ed8cdc9402a6 100644 |
--- a/webrtc/api/android/jni/androidmediaencoder_jni.h |
+++ b/webrtc/api/android/jni/androidmediaencoder_jni.h |
@@ -1,5 +1,5 @@ |
/* |
- * Copyright 2015 The WebRTC project authors. All Rights Reserved. |
+ * Copyright 2016 The WebRTC project authors. All Rights Reserved. |
* |
* Use of this source code is governed by a BSD-style license |
* that can be found in the LICENSE file in the root of the source |
@@ -7,43 +7,5 @@ |
* in the file PATENTS. All contributing project authors may |
* be found in the AUTHORS file in the root of the source tree. |
*/ |
- |
-#ifndef WEBRTC_API_JAVA_JNI_ANDROIDMEDIAENCODER_JNI_H_ |
-#define WEBRTC_API_JAVA_JNI_ANDROIDMEDIAENCODER_JNI_H_ |
- |
-#include <vector> |
- |
-#include "webrtc/api/android/jni/jni_helpers.h" |
-#include "webrtc/media/engine/webrtcvideoencoderfactory.h" |
- |
-namespace webrtc_jni { |
- |
-// Implementation of Android MediaCodec based encoder factory. |
-class MediaCodecVideoEncoderFactory |
- : public cricket::WebRtcVideoEncoderFactory { |
- public: |
- MediaCodecVideoEncoderFactory(); |
- virtual ~MediaCodecVideoEncoderFactory(); |
- |
- void SetEGLContext(JNIEnv* jni, jobject egl_context); |
- |
- // WebRtcVideoEncoderFactory implementation. |
- webrtc::VideoEncoder* CreateVideoEncoder( |
- const cricket::VideoCodec& codec) override; |
- const std::vector<cricket::VideoCodec>& supported_codecs() const override; |
- void DestroyVideoEncoder(webrtc::VideoEncoder* encoder) override; |
- |
- private: |
- // Disable overloaded virtual function warning. TODO(magjed): Remove once |
- // http://crbug/webrtc/6402 is fixed. |
- using cricket::WebRtcVideoEncoderFactory::CreateVideoEncoder; |
- |
- jobject egl_context_; |
- |
- // Empty if platform support is lacking, const after ctor returns. |
- std::vector<cricket::VideoCodec> supported_codecs_; |
-}; |
- |
-} // namespace webrtc_jni |
- |
-#endif // WEBRTC_API_JAVA_JNI_ANDROIDMEDIAENCODER_JNI_H_ |
+// TODO(magjed): Update external dependencies and remove this. |
+#include "webrtc/sdk/android/src/jni/androidmediaencoder_jni.h" |