Index: webrtc/modules/video_render/android/video_render_android_surface_view.h |
diff --git a/webrtc/modules/video_render/android/video_render_android_surface_view.h b/webrtc/modules/video_render/android/video_render_android_surface_view.h |
deleted file mode 100644 |
index 0f029b54f3488744aeb5ff3e43ae288488730e88..0000000000000000000000000000000000000000 |
--- a/webrtc/modules/video_render/android/video_render_android_surface_view.h |
+++ /dev/null |
@@ -1,83 +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_SURFACE_VIEW_H_ |
-#define WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_ANDROID_VIDEO_RENDER_ANDROID_SURFACE_VIEW_H_ |
- |
-#include <jni.h> |
- |
-#include "webrtc/modules/video_render/android/video_render_android_impl.h" |
-#include "webrtc/modules/video_render/video_render_defines.h" |
- |
-namespace webrtc { |
- |
-class CriticalSectionWrapper; |
- |
-class AndroidSurfaceViewChannel : public AndroidStream { |
- public: |
- AndroidSurfaceViewChannel(uint32_t streamId, |
- JavaVM* jvm, |
- VideoRenderAndroid& renderer, |
- jobject javaRenderObj); |
- ~AndroidSurfaceViewChannel(); |
- |
- 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: |
- uint32_t _id; |
- CriticalSectionWrapper& _renderCritSect; |
- |
- VideoFrame _bufferToRender; |
- VideoRenderAndroid& _renderer; |
- JavaVM* _jvm; |
- jobject _javaRenderObj; |
- |
- jobject _javaByteBufferObj; |
- unsigned char* _directBuffer; |
- jmethodID _createByteBufferCid; |
- jmethodID _drawByteBufferCid; |
- |
- jmethodID _setCoordinatesCid; |
- int _bitmapWidth; |
- int _bitmapHeight; |
-}; |
- |
-class AndroidSurfaceViewRenderer : private VideoRenderAndroid { |
- public: |
- AndroidSurfaceViewRenderer(const int32_t id, |
- const VideoRenderType videoRenderType, |
- void* window, |
- const bool fullscreen); |
- ~AndroidSurfaceViewRenderer(); |
- 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_SURFACE_VIEW_H_ |