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/linux/video_x11_channel.h" | 11 #include "webrtc/modules/video_render/linux/video_x11_channel.h" |
12 #include "webrtc/modules/video_render/linux/video_x11_render.h" | 12 #include "webrtc/modules/video_render/linux/video_x11_render.h" |
13 | 13 |
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/trace.h" | 15 #include "webrtc/system_wrappers/include/trace.h" |
16 | 16 |
17 namespace webrtc { | 17 namespace webrtc { |
18 | 18 |
19 VideoX11Render::VideoX11Render(Window window) : | 19 VideoX11Render::VideoX11Render(Window window) : |
20 _window(window), | 20 _window(window), |
21 _critSect(*CriticalSectionWrapper::CreateCriticalSection()) | 21 _critSect(*CriticalSectionWrapper::CreateCriticalSection()) |
22 { | 22 { |
23 } | 23 } |
24 | 24 |
25 VideoX11Render::~VideoX11Render() | 25 VideoX11Render::~VideoX11Render() |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
144 } | 144 } |
145 } | 145 } |
146 | 146 |
147 WEBRTC_TRACE(kTraceError, kTraceVideoRenderer, -1, | 147 WEBRTC_TRACE(kTraceError, kTraceVideoRenderer, -1, |
148 "No VideoX11Channel object exists for stream id: %d", | 148 "No VideoX11Channel object exists for stream id: %d", |
149 streamId); | 149 streamId); |
150 return -1; | 150 return -1; |
151 } | 151 } |
152 | 152 |
153 } // namespace webrtc | 153 } // namespace webrtc |
OLD | NEW |