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

Side by Side Diff: webrtc/video/video_receive_stream.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_internal_impl.cc ('k') | webrtc/video_renderer.h » ('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) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 vie_channel_->RegisterExternalDecoder( 265 vie_channel_->RegisterExternalDecoder(
266 decoder.payload_type, decoder.decoder, decoder.is_renderer, 266 decoder.payload_type, decoder.decoder, decoder.is_renderer,
267 decoder.is_renderer ? decoder.expected_delay_ms 267 decoder.is_renderer ? decoder.expected_delay_ms
268 : config.render_delay_ms)); 268 : config.render_delay_ms));
269 269
270 VideoCodec codec = CreateDecoderVideoCodec(decoder); 270 VideoCodec codec = CreateDecoderVideoCodec(decoder);
271 271
272 RTC_CHECK_EQ(0, vie_channel_->SetReceiveCodec(codec)); 272 RTC_CHECK_EQ(0, vie_channel_->SetReceiveCodec(codec));
273 } 273 }
274 274
275 incoming_video_stream_.reset(new IncomingVideoStream(0)); 275 incoming_video_stream_.reset(new IncomingVideoStream(
276 0, config.renderer ? config.renderer->SmoothsRenderedFrames() : false));
276 incoming_video_stream_->SetExpectedRenderDelay(config.render_delay_ms); 277 incoming_video_stream_->SetExpectedRenderDelay(config.render_delay_ms);
277 incoming_video_stream_->SetExternalCallback(this); 278 incoming_video_stream_->SetExternalCallback(this);
278 vie_channel_->SetIncomingVideoStream(incoming_video_stream_.get()); 279 vie_channel_->SetIncomingVideoStream(incoming_video_stream_.get());
279 280
280 vie_channel_->RegisterPreDecodeImageCallback(this); 281 vie_channel_->RegisterPreDecodeImageCallback(this);
281 vie_channel_->RegisterPreRenderCallback(this); 282 vie_channel_->RegisterPreRenderCallback(this);
282 } 283 }
283 284
284 VideoReceiveStream::~VideoReceiveStream() { 285 VideoReceiveStream::~VideoReceiveStream() {
285 LOG(LS_INFO) << "~VideoReceiveStream: " << config_.ToString(); 286 LOG(LS_INFO) << "~VideoReceiveStream: " << config_.ToString();
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 return 0; 379 return 0;
379 } 380 }
380 381
381 void VideoReceiveStream::SignalNetworkState(NetworkState state) { 382 void VideoReceiveStream::SignalNetworkState(NetworkState state) {
382 vie_channel_->SetRTCPMode(state == kNetworkUp ? config_.rtp.rtcp_mode 383 vie_channel_->SetRTCPMode(state == kNetworkUp ? config_.rtp.rtcp_mode
383 : RtcpMode::kOff); 384 : RtcpMode::kOff);
384 } 385 }
385 386
386 } // namespace internal 387 } // namespace internal
387 } // namespace webrtc 388 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/video_render/video_render_internal_impl.cc ('k') | webrtc/video_renderer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698