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 <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/external/video_render_external_impl.h" | 15 #include "webrtc/modules/video_render/external/video_render_external_impl.h" |
16 #include "webrtc/modules/video_render/i_video_render.h" | 16 #include "webrtc/modules/video_render/i_video_render.h" |
17 #include "webrtc/modules/video_render/include/video_render_defines.h" | 17 #include "webrtc/modules/video_render/include/video_render_defines.h" |
18 #include "webrtc/modules/video_render/video_render_impl.h" | 18 #include "webrtc/modules/video_render/video_render_impl.h" |
19 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" | 19 #include "webrtc/system_wrappers/include/critical_section_wrapper.h" |
20 #include "webrtc/system_wrappers/interface/trace.h" | 20 #include "webrtc/system_wrappers/include/trace.h" |
21 | 21 |
22 namespace webrtc { | 22 namespace webrtc { |
23 | 23 |
24 VideoRender* | 24 VideoRender* |
25 VideoRender::CreateVideoRender(const int32_t id, | 25 VideoRender::CreateVideoRender(const int32_t id, |
26 void* window, | 26 void* window, |
27 const bool fullscreen, | 27 const bool fullscreen, |
28 const VideoRenderType videoRenderType/*=kRenderDe
fault*/) | 28 const VideoRenderType videoRenderType/*=kRenderDe
fault*/) |
29 { | 29 { |
30 VideoRenderType resultVideoRenderType = videoRenderType; | 30 VideoRenderType resultVideoRenderType = videoRenderType; |
(...skipping 563 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
594 // This stream doesn't exist | 594 // This stream doesn't exist |
595 WEBRTC_TRACE(kTraceError, kTraceVideoRenderer, _id, | 595 WEBRTC_TRACE(kTraceError, kTraceVideoRenderer, _id, |
596 "%s: stream doesn't exist", __FUNCTION__); | 596 "%s: stream doesn't exist", __FUNCTION__); |
597 return -1; | 597 return -1; |
598 } | 598 } |
599 assert(item->second != NULL); | 599 assert(item->second != NULL); |
600 return item->second->SetTimeoutImage(videoFrame, timeout); | 600 return item->second->SetTimeoutImage(videoFrame, timeout); |
601 } | 601 } |
602 | 602 |
603 } // namespace webrtc | 603 } // namespace webrtc |
OLD | NEW |