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

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: Pass bool into IncomingVideoStream, Remove thread in disabled case 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
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 252 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 vie_channel_->RegisterExternalDecoder( 263 vie_channel_->RegisterExternalDecoder(
264 decoder.payload_type, decoder.decoder, decoder.is_renderer, 264 decoder.payload_type, decoder.decoder, decoder.is_renderer,
265 decoder.is_renderer ? decoder.expected_delay_ms 265 decoder.is_renderer ? decoder.expected_delay_ms
266 : config.render_delay_ms)); 266 : config.render_delay_ms));
267 267
268 VideoCodec codec = CreateDecoderVideoCodec(decoder); 268 VideoCodec codec = CreateDecoderVideoCodec(decoder);
269 269
270 RTC_CHECK_EQ(0, vie_channel_->SetReceiveCodec(codec)); 270 RTC_CHECK_EQ(0, vie_channel_->SetReceiveCodec(codec));
271 } 271 }
272 272
273 incoming_video_stream_.reset(new IncomingVideoStream(0)); 273 incoming_video_stream_.reset(new IncomingVideoStream(
274 0, config.renderer->PrerendererSmoothingDisabled()));
274 incoming_video_stream_->SetExpectedRenderDelay(config.render_delay_ms); 275 incoming_video_stream_->SetExpectedRenderDelay(config.render_delay_ms);
275 incoming_video_stream_->SetExternalCallback(this); 276 incoming_video_stream_->SetExternalCallback(this);
276 vie_channel_->SetIncomingVideoStream(incoming_video_stream_.get()); 277 vie_channel_->SetIncomingVideoStream(incoming_video_stream_.get());
277 278
278 vie_channel_->RegisterPreDecodeImageCallback(this); 279 vie_channel_->RegisterPreDecodeImageCallback(this);
279 vie_channel_->RegisterPreRenderCallback(this); 280 vie_channel_->RegisterPreRenderCallback(this);
280 } 281 }
281 282
282 VideoReceiveStream::~VideoReceiveStream() { 283 VideoReceiveStream::~VideoReceiveStream() {
283 LOG(LS_INFO) << "~VideoReceiveStream: " << config_.ToString(); 284 LOG(LS_INFO) << "~VideoReceiveStream: " << config_.ToString();
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 return 0; 377 return 0;
377 } 378 }
378 379
379 void VideoReceiveStream::SignalNetworkState(NetworkState state) { 380 void VideoReceiveStream::SignalNetworkState(NetworkState state) {
380 vie_channel_->SetRTCPMode(state == kNetworkUp ? config_.rtp.rtcp_mode 381 vie_channel_->SetRTCPMode(state == kNetworkUp ? config_.rtp.rtcp_mode
381 : RtcpMode::kOff); 382 : RtcpMode::kOff);
382 } 383 }
383 384
384 } // namespace internal 385 } // namespace internal
385 } // namespace webrtc 386 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698