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 |
11 #include "webrtc/modules/video_render/android/video_render_android_native_opengl
2.h" | 11 #include "webrtc/modules/video_render/android/video_render_android_native_opengl
2.h" |
12 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" | 12 #include "webrtc/system_wrappers/include/critical_section_wrapper.h" |
13 #include "webrtc/system_wrappers/interface/tick_util.h" | 13 #include "webrtc/system_wrappers/include/tick_util.h" |
14 | 14 |
15 #ifdef ANDROID_LOG | 15 #ifdef ANDROID_LOG |
16 #include <android/log.h> | 16 #include <android/log.h> |
17 #include <stdio.h> | 17 #include <stdio.h> |
18 | 18 |
19 #undef WEBRTC_TRACE | 19 #undef WEBRTC_TRACE |
20 #define WEBRTC_TRACE(a,b,c,...) __android_log_print(ANDROID_LOG_DEBUG, "*WEBRTC
*", __VA_ARGS__) | 20 #define WEBRTC_TRACE(a,b,c,...) __android_log_print(ANDROID_LOG_DEBUG, "*WEBRTC
*", __VA_ARGS__) |
21 #else | 21 #else |
22 #include "webrtc/system_wrappers/interface/trace.h" | 22 #include "webrtc/system_wrappers/include/trace.h" |
23 #endif | 23 #endif |
24 | 24 |
25 namespace webrtc { | 25 namespace webrtc { |
26 | 26 |
27 AndroidNativeOpenGl2Renderer::AndroidNativeOpenGl2Renderer( | 27 AndroidNativeOpenGl2Renderer::AndroidNativeOpenGl2Renderer( |
28 const int32_t id, | 28 const int32_t id, |
29 const VideoRenderType videoRenderType, | 29 const VideoRenderType videoRenderType, |
30 void* window, | 30 void* window, |
31 const bool fullscreen) : | 31 const bool fullscreen) : |
32 VideoRenderAndroid(id, videoRenderType, window, fullscreen), | 32 VideoRenderAndroid(id, videoRenderType, window, fullscreen), |
(...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
441 WEBRTC_TRACE(kTraceInfo, kTraceVideoRenderer, -1, "%s:", __FUNCTION__); | 441 WEBRTC_TRACE(kTraceInfo, kTraceVideoRenderer, -1, "%s:", __FUNCTION__); |
442 return renderChannel->CreateOpenGLNative(width, height); | 442 return renderChannel->CreateOpenGLNative(width, height); |
443 } | 443 } |
444 | 444 |
445 jint AndroidNativeOpenGl2Channel::CreateOpenGLNative( | 445 jint AndroidNativeOpenGl2Channel::CreateOpenGLNative( |
446 int width, int height) { | 446 int width, int height) { |
447 return _openGLRenderer.Setup(width, height); | 447 return _openGLRenderer.Setup(width, height); |
448 } | 448 } |
449 | 449 |
450 } // namespace webrtc | 450 } // namespace webrtc |
OLD | NEW |