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 |
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
190 right, bottom); | 190 right, bottom); |
191 if (ptrRenderCallback == NULL) | 191 if (ptrRenderCallback == NULL) |
192 { | 192 { |
193 WEBRTC_TRACE(kTraceError, kTraceVideoRenderer, _id, | 193 WEBRTC_TRACE(kTraceError, kTraceVideoRenderer, _id, |
194 "%s: Can't create incoming stream in renderer", | 194 "%s: Can't create incoming stream in renderer", |
195 __FUNCTION__); | 195 __FUNCTION__); |
196 return NULL; | 196 return NULL; |
197 } | 197 } |
198 | 198 |
199 // Create platform independant code | 199 // Create platform independant code |
200 IncomingVideoStream* ptrIncomingStream = new IncomingVideoStream(streamId); | 200 IncomingVideoStream* ptrIncomingStream = |
| 201 new IncomingVideoStream(streamId, false); |
201 ptrIncomingStream->SetRenderCallback(ptrRenderCallback); | 202 ptrIncomingStream->SetRenderCallback(ptrRenderCallback); |
202 VideoRenderCallback* moduleCallback = ptrIncomingStream->ModuleCallback(); | 203 VideoRenderCallback* moduleCallback = ptrIncomingStream->ModuleCallback(); |
203 | 204 |
204 // Store the stream | 205 // Store the stream |
205 _streamRenderMap[streamId] = ptrIncomingStream; | 206 _streamRenderMap[streamId] = ptrIncomingStream; |
206 | 207 |
207 return moduleCallback; | 208 return moduleCallback; |
208 } | 209 } |
209 | 210 |
210 int32_t ModuleVideoRenderImpl::DeleteIncomingRenderStream( | 211 int32_t ModuleVideoRenderImpl::DeleteIncomingRenderStream( |
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
594 // This stream doesn't exist | 595 // This stream doesn't exist |
595 WEBRTC_TRACE(kTraceError, kTraceVideoRenderer, _id, | 596 WEBRTC_TRACE(kTraceError, kTraceVideoRenderer, _id, |
596 "%s: stream doesn't exist", __FUNCTION__); | 597 "%s: stream doesn't exist", __FUNCTION__); |
597 return -1; | 598 return -1; |
598 } | 599 } |
599 assert(item->second != NULL); | 600 assert(item->second != NULL); |
600 return item->second->SetTimeoutImage(videoFrame, timeout); | 601 return item->second->SetTimeoutImage(videoFrame, timeout); |
601 } | 602 } |
602 | 603 |
603 } // namespace webrtc | 604 } // namespace webrtc |
OLD | NEW |