Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(152)

Side by Side Diff: webrtc/modules/video_render/android/video_render_android_impl.cc

Issue 1413333002: system_wrappers: rename interface -> include (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased again! Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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_impl.h" 11 #include "webrtc/modules/video_render/android/video_render_android_impl.h"
12 12
13 #include "webrtc/modules/video_render/video_render_internal.h" 13 #include "webrtc/modules/video_render/video_render_internal.h"
14 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" 14 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
15 #include "webrtc/system_wrappers/interface/event_wrapper.h" 15 #include "webrtc/system_wrappers/include/event_wrapper.h"
16 #include "webrtc/system_wrappers/interface/tick_util.h" 16 #include "webrtc/system_wrappers/include/tick_util.h"
17 17
18 #ifdef ANDROID 18 #ifdef ANDROID
19 #include <android/log.h> 19 #include <android/log.h>
20 #include <stdio.h> 20 #include <stdio.h>
21 21
22 #undef WEBRTC_TRACE 22 #undef WEBRTC_TRACE
23 #define WEBRTC_TRACE(a,b,c,...) __android_log_print(ANDROID_LOG_DEBUG, "*WEBRTC N*", __VA_ARGS__) 23 #define WEBRTC_TRACE(a,b,c,...) __android_log_print(ANDROID_LOG_DEBUG, "*WEBRTC N*", __VA_ARGS__)
24 #else 24 #else
25 #include "webrtc/system_wrappers/interface/trace.h" 25 #include "webrtc/system_wrappers/include/trace.h"
26 #endif 26 #endif
27 27
28 namespace webrtc { 28 namespace webrtc {
29 29
30 JavaVM* VideoRenderAndroid::g_jvm = NULL; 30 JavaVM* VideoRenderAndroid::g_jvm = NULL;
31 31
32 int32_t SetRenderAndroidVM(JavaVM* javaVM) { 32 int32_t SetRenderAndroidVM(JavaVM* javaVM) {
33 WEBRTC_TRACE(kTraceDebug, kTraceVideoRenderer, -1, "%s", __FUNCTION__); 33 WEBRTC_TRACE(kTraceDebug, kTraceVideoRenderer, -1, "%s", __FUNCTION__);
34 VideoRenderAndroid::g_jvm = javaVM; 34 VideoRenderAndroid::g_jvm = javaVM;
35 return 0; 35 return 0;
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 const void* colorKey, 312 const void* colorKey,
313 const float left, const float top, 313 const float left, const float top,
314 const float right, 314 const float right,
315 const float bottom) { 315 const float bottom) {
316 WEBRTC_TRACE(kTraceError, kTraceVideoRenderer, _id, 316 WEBRTC_TRACE(kTraceError, kTraceVideoRenderer, _id,
317 "%s - not supported on Android", __FUNCTION__); 317 "%s - not supported on Android", __FUNCTION__);
318 return -1; 318 return -1;
319 } 319 }
320 320
321 } // namespace webrtc 321 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698