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

Side by Side Diff: webrtc/modules/video_render/video_render_internal_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 <assert.h> 11 #include <assert.h>
12 12
13 #include "webrtc/common_video/interface/incoming_video_stream.h" 13 #include "webrtc/common_video/interface/incoming_video_stream.h"
14 #include "webrtc/engine_configurations.h" 14 #include "webrtc/engine_configurations.h"
15 #include "webrtc/modules/video_render/i_video_render.h" 15 #include "webrtc/modules/video_render/i_video_render.h"
16 #include "webrtc/modules/video_render/include/video_render_defines.h" 16 #include "webrtc/modules/video_render/include/video_render_defines.h"
17 #include "webrtc/modules/video_render/video_render_impl.h" 17 #include "webrtc/modules/video_render/video_render_impl.h"
18 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" 18 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
19 #include "webrtc/system_wrappers/interface/trace.h" 19 #include "webrtc/system_wrappers/include/trace.h"
20 20
21 #if defined (_WIN32) 21 #if defined (_WIN32)
22 #include "webrtc/modules/video_render/windows/video_render_windows_impl.h" 22 #include "webrtc/modules/video_render/windows/video_render_windows_impl.h"
23 #define STANDARD_RENDERING kRenderWindows 23 #define STANDARD_RENDERING kRenderWindows
24 24
25 // WEBRTC_IOS should go before WEBRTC_MAC because WEBRTC_MAC 25 // WEBRTC_IOS should go before WEBRTC_MAC because WEBRTC_MAC
26 // gets defined if WEBRTC_IOS is defined 26 // gets defined if WEBRTC_IOS is defined
27 #elif defined(WEBRTC_IOS) 27 #elif defined(WEBRTC_IOS)
28 #define STANDARD_RENDERING kRenderiOS 28 #define STANDARD_RENDERING kRenderiOS
29 #include "webrtc/modules/video_render/ios/video_render_ios_impl.h" 29 #include "webrtc/modules/video_render/ios/video_render_ios_impl.h"
(...skipping 787 matching lines...) Expand 10 before | Expand all | Expand 10 after
817 // This stream doesn't exist 817 // This stream doesn't exist
818 WEBRTC_TRACE(kTraceError, kTraceVideoRenderer, _id, 818 WEBRTC_TRACE(kTraceError, kTraceVideoRenderer, _id,
819 "%s: stream doesn't exist", __FUNCTION__); 819 "%s: stream doesn't exist", __FUNCTION__);
820 return -1; 820 return -1;
821 } 821 }
822 assert(item->second != NULL); 822 assert(item->second != NULL);
823 return item->second->SetTimeoutImage(videoFrame, timeout); 823 return item->second->SetTimeoutImage(videoFrame, timeout);
824 } 824 }
825 825
826 } // namespace webrtc 826 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/video_render/video_render_impl.cc ('k') | webrtc/modules/video_render/windows/video_render_direct3d9.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698