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

Side by Side Diff: webrtc/modules/video_render/video_render_internal_impl.cc

Issue 1419673014: Remove frame time scheduing in IncomingVideoStream (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Remove unnecessary if Created 5 years 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
« no previous file with comments | « webrtc/modules/video_render/video_render_impl.cc ('k') | webrtc/video/video_receive_stream.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
(...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 right, bottom); 413 right, bottom);
414 if (ptrRenderCallback == NULL) 414 if (ptrRenderCallback == NULL)
415 { 415 {
416 WEBRTC_TRACE(kTraceError, kTraceVideoRenderer, _id, 416 WEBRTC_TRACE(kTraceError, kTraceVideoRenderer, _id,
417 "%s: Can't create incoming stream in renderer", 417 "%s: Can't create incoming stream in renderer",
418 __FUNCTION__); 418 __FUNCTION__);
419 return NULL; 419 return NULL;
420 } 420 }
421 421
422 // Create platform independant code 422 // Create platform independant code
423 IncomingVideoStream* ptrIncomingStream = new IncomingVideoStream(streamId); 423 IncomingVideoStream* ptrIncomingStream =
424 new IncomingVideoStream(streamId, false);
424 ptrIncomingStream->SetRenderCallback(ptrRenderCallback); 425 ptrIncomingStream->SetRenderCallback(ptrRenderCallback);
425 VideoRenderCallback* moduleCallback = ptrIncomingStream->ModuleCallback(); 426 VideoRenderCallback* moduleCallback = ptrIncomingStream->ModuleCallback();
426 427
427 // Store the stream 428 // Store the stream
428 _streamRenderMap[streamId] = ptrIncomingStream; 429 _streamRenderMap[streamId] = ptrIncomingStream;
429 430
430 return moduleCallback; 431 return moduleCallback;
431 } 432 }
432 433
433 int32_t ModuleVideoRenderImpl::DeleteIncomingRenderStream( 434 int32_t ModuleVideoRenderImpl::DeleteIncomingRenderStream(
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
817 // This stream doesn't exist 818 // This stream doesn't exist
818 WEBRTC_TRACE(kTraceError, kTraceVideoRenderer, _id, 819 WEBRTC_TRACE(kTraceError, kTraceVideoRenderer, _id,
819 "%s: stream doesn't exist", __FUNCTION__); 820 "%s: stream doesn't exist", __FUNCTION__);
820 return -1; 821 return -1;
821 } 822 }
822 assert(item->second != NULL); 823 assert(item->second != NULL);
823 return item->second->SetTimeoutImage(videoFrame, timeout); 824 return item->second->SetTimeoutImage(videoFrame, timeout);
824 } 825 }
825 826
826 } // namespace webrtc 827 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/video_render/video_render_impl.cc ('k') | webrtc/video/video_receive_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698