Index: webrtc/modules/video_render/android/video_render_android_native_opengl2.h |
diff --git a/webrtc/modules/video_render/android/video_render_android_native_opengl2.h b/webrtc/modules/video_render/android/video_render_android_native_opengl2.h |
deleted file mode 100644 |
index 8be247b8342c28f1023d3c2da061b254bae26f07..0000000000000000000000000000000000000000 |
--- a/webrtc/modules/video_render/android/video_render_android_native_opengl2.h |
+++ /dev/null |
@@ -1,95 +0,0 @@ |
-/* |
- * Copyright (c) 2012 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 |
- * tree. An additional intellectual property rights grant can be found |
- * in the file PATENTS. All contributing project authors may |
- * be found in the AUTHORS file in the root of the source tree. |
- */ |
- |
-#ifndef WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_ANDROID_VIDEO_RENDER_ANDROID_NATIVE_OPENGL2_H_ |
-#define WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_ANDROID_VIDEO_RENDER_ANDROID_NATIVE_OPENGL2_H_ |
- |
-#include <jni.h> |
- |
-#include "webrtc/modules/video_render/android/video_render_android_impl.h" |
-#include "webrtc/modules/video_render/android/video_render_opengles20.h" |
-#include "webrtc/modules/video_render/video_render_defines.h" |
- |
-namespace webrtc { |
- |
-class CriticalSectionWrapper; |
- |
-class AndroidNativeOpenGl2Channel: public AndroidStream { |
- public: |
- AndroidNativeOpenGl2Channel( |
- uint32_t streamId, |
- JavaVM* jvm, |
- VideoRenderAndroid& renderer,jobject javaRenderObj); |
- ~AndroidNativeOpenGl2Channel(); |
- |
- int32_t Init(int32_t zOrder, const float left, const float top, |
- const float right, const float bottom); |
- |
- //Implement VideoRenderCallback |
- virtual int32_t RenderFrame(const uint32_t streamId, |
- const VideoFrame& videoFrame); |
- |
- //Implements AndroidStream |
- virtual void DeliverFrame(JNIEnv* jniEnv); |
- |
- private: |
- static jint JNICALL CreateOpenGLNativeStatic( |
- JNIEnv * env, |
- jobject, |
- jlong context, |
- jint width, |
- jint height); |
- jint CreateOpenGLNative(int width, int height); |
- |
- static void JNICALL DrawNativeStatic(JNIEnv * env,jobject, jlong context); |
- void DrawNative(); |
- uint32_t _id; |
- CriticalSectionWrapper& _renderCritSect; |
- |
- VideoFrame _bufferToRender; |
- VideoRenderAndroid& _renderer; |
- JavaVM* _jvm; |
- jobject _javaRenderObj; |
- |
- jmethodID _redrawCid; |
- jmethodID _registerNativeCID; |
- jmethodID _deRegisterNativeCID; |
- VideoRenderOpenGles20 _openGLRenderer; |
-}; |
- |
- |
-class AndroidNativeOpenGl2Renderer: private VideoRenderAndroid { |
- public: |
- AndroidNativeOpenGl2Renderer(const int32_t id, |
- const VideoRenderType videoRenderType, |
- void* window, |
- const bool fullscreen); |
- |
- ~AndroidNativeOpenGl2Renderer(); |
- static bool UseOpenGL2(void* window); |
- |
- int32_t Init(); |
- virtual AndroidStream* CreateAndroidRenderChannel( |
- int32_t streamId, |
- int32_t zOrder, |
- const float left, |
- const float top, |
- const float right, |
- const float bottom, |
- VideoRenderAndroid& renderer); |
- |
- private: |
- jobject _javaRenderObj; |
- jclass _javaRenderClass; |
-}; |
- |
-} // namespace webrtc |
- |
-#endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_ANDROID_VIDEO_RENDER_ANDROID_NATIVE_OPENGL2_H_ |