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/common_video/libyuv/include/webrtc_libyuv.h" | 11 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" |
12 #include "webrtc/modules/video_render/android/video_render_android_surface_view.
h" | 12 #include "webrtc/modules/video_render/android/video_render_android_surface_view.
h" |
13 #include "webrtc/system_wrappers/include/critical_section_wrapper.h" | 13 #include "webrtc/system_wrappers/include/critical_section_wrapper.h" |
14 #include "webrtc/system_wrappers/include/tick_util.h" | |
15 | 14 |
16 #ifdef ANDROID_LOG | 15 #ifdef ANDROID_LOG |
17 #include <android/log.h> | 16 #include <android/log.h> |
18 #include <stdio.h> | 17 #include <stdio.h> |
19 | 18 |
20 #undef WEBRTC_TRACE | 19 #undef WEBRTC_TRACE |
21 #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__) |
22 #else | 21 #else |
23 #include "webrtc/system_wrappers/include/trace.h" | 22 #include "webrtc/system_wrappers/include/trace.h" |
24 #endif | 23 #endif |
(...skipping 440 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
465 _renderCritSect.Leave(); | 464 _renderCritSect.Leave(); |
466 return; | 465 return; |
467 } | 466 } |
468 } | 467 } |
469 _renderCritSect.Leave(); | 468 _renderCritSect.Leave(); |
470 // Draw the Surface | 469 // Draw the Surface |
471 jniEnv->CallVoidMethod(_javaRenderObj, _drawByteBufferCid); | 470 jniEnv->CallVoidMethod(_javaRenderObj, _drawByteBufferCid); |
472 } | 471 } |
473 | 472 |
474 } // namespace webrtc | 473 } // namespace webrtc |
OLD | NEW |