| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 public: | 25 public: |
| 26 AndroidNativeOpenGl2Channel( | 26 AndroidNativeOpenGl2Channel( |
| 27 uint32_t streamId, | 27 uint32_t streamId, |
| 28 JavaVM* jvm, | 28 JavaVM* jvm, |
| 29 VideoRenderAndroid& renderer,jobject javaRenderObj); | 29 VideoRenderAndroid& renderer,jobject javaRenderObj); |
| 30 ~AndroidNativeOpenGl2Channel(); | 30 ~AndroidNativeOpenGl2Channel(); |
| 31 | 31 |
| 32 int32_t Init(int32_t zOrder, const float left, const float top, | 32 int32_t Init(int32_t zOrder, const float left, const float top, |
| 33 const float right, const float bottom); | 33 const float right, const float bottom); |
| 34 | 34 |
| 35 //Implement VideoRenderCallback | 35 //Implement rtc::VideoSinkInterface<VideoFrame> |
| 36 virtual int32_t RenderFrame(const uint32_t streamId, | 36 void OnFrame(const VideoFrame& videoFrame) override; |
| 37 const VideoFrame& videoFrame); | |
| 38 | 37 |
| 39 //Implements AndroidStream | 38 //Implements AndroidStream |
| 40 virtual void DeliverFrame(JNIEnv* jniEnv); | 39 virtual void DeliverFrame(JNIEnv* jniEnv); |
| 41 | 40 |
| 42 private: | 41 private: |
| 43 static jint JNICALL CreateOpenGLNativeStatic( | 42 static jint JNICALL CreateOpenGLNativeStatic( |
| 44 JNIEnv * env, | 43 JNIEnv * env, |
| 45 jobject, | 44 jobject, |
| 46 jlong context, | 45 jlong context, |
| 47 jint width, | 46 jint width, |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 VideoRenderAndroid& renderer); | 85 VideoRenderAndroid& renderer); |
| 87 | 86 |
| 88 private: | 87 private: |
| 89 jobject _javaRenderObj; | 88 jobject _javaRenderObj; |
| 90 jclass _javaRenderClass; | 89 jclass _javaRenderClass; |
| 91 }; | 90 }; |
| 92 | 91 |
| 93 } // namespace webrtc | 92 } // namespace webrtc |
| 94 | 93 |
| 95 #endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_ANDROID_VIDEO_RENDER_ANDROID_N
ATIVE_OPENGL2_H_ | 94 #endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_ANDROID_VIDEO_RENDER_ANDROID_N
ATIVE_OPENGL2_H_ |
| OLD | NEW |