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

Side by Side Diff: webrtc/video/video_send_stream.cc

Issue 1984243003: Set ViEEncoder sink_ on construction. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 7 months 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/video/encoder_state_feedback_unittest.cc ('k') | webrtc/video/vie_encoder.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 361 matching lines...) Expand 10 before | Expand all | Expand 10 after
372 stop_encoder_thread_(0), 372 stop_encoder_thread_(0),
373 overuse_detector_( 373 overuse_detector_(
374 Clock::GetRealTimeClock(), 374 Clock::GetRealTimeClock(),
375 GetCpuOveruseOptions(config.encoder_settings.full_overuse_time), 375 GetCpuOveruseOptions(config.encoder_settings.full_overuse_time),
376 this, 376 this,
377 config.post_encode_callback, 377 config.post_encode_callback,
378 &stats_proxy_), 378 &stats_proxy_),
379 vie_encoder_(num_cpu_cores, 379 vie_encoder_(num_cpu_cores,
380 module_process_thread_, 380 module_process_thread_,
381 &stats_proxy_, 381 &stats_proxy_,
382 &overuse_detector_), 382 &overuse_detector_,
383 this),
383 encoder_feedback_(Clock::GetRealTimeClock(), 384 encoder_feedback_(Clock::GetRealTimeClock(),
384 config.rtp.ssrcs, 385 config.rtp.ssrcs,
385 &vie_encoder_), 386 &vie_encoder_),
386 video_sender_(vie_encoder_.video_sender()), 387 video_sender_(vie_encoder_.video_sender()),
387 bandwidth_observer_(congestion_controller_->GetBitrateController() 388 bandwidth_observer_(congestion_controller_->GetBitrateController()
388 ->CreateRtcpBandwidthObserver()), 389 ->CreateRtcpBandwidthObserver()),
389 rtp_rtcp_modules_(CreateRtpRtcpModules( 390 rtp_rtcp_modules_(CreateRtpRtcpModules(
390 config.send_transport, 391 config.send_transport,
391 &encoder_feedback_, 392 &encoder_feedback_,
392 bandwidth_observer_.get(), 393 bandwidth_observer_.get(),
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
547 encoder_settings->video_codec.startBitrate = 548 encoder_settings->video_codec.startBitrate =
548 bitrate_allocator_->AddObserver( 549 bitrate_allocator_->AddObserver(
549 this, encoder_settings->video_codec.minBitrate * 1000, 550 this, encoder_settings->video_codec.minBitrate * 1000,
550 encoder_settings->video_codec.maxBitrate * 1000, 551 encoder_settings->video_codec.maxBitrate * 1000,
551 !config_.suspend_below_min_bitrate) / 552 !config_.suspend_below_min_bitrate) /
552 1000; 553 1000;
553 554
554 payload_router_.SetSendStreams(encoder_settings->streams); 555 payload_router_.SetSendStreams(encoder_settings->streams);
555 vie_encoder_.SetEncoder(encoder_settings->video_codec, 556 vie_encoder_.SetEncoder(encoder_settings->video_codec,
556 encoder_settings->min_transmit_bitrate_bps, 557 encoder_settings->min_transmit_bitrate_bps,
557 payload_router_.MaxPayloadLength(), this); 558 payload_router_.MaxPayloadLength());
558 559
559 // vie_encoder_.SetEncoder must be called before this. 560 // vie_encoder_.SetEncoder must be called before this.
560 if (config_.suspend_below_min_bitrate) 561 if (config_.suspend_below_min_bitrate)
561 video_sender_->SuspendBelowMinBitrate(); 562 video_sender_->SuspendBelowMinBitrate();
562 563
563 // Clear stats for disabled layers. 564 // Clear stats for disabled layers.
564 for (size_t i = encoder_settings->streams.size(); 565 for (size_t i = encoder_settings->streams.size();
565 i < config_.rtp.ssrcs.size(); ++i) { 566 i < config_.rtp.ssrcs.size(); ++i) {
566 stats_proxy_.OnInactiveSsrc(config_.rtp.ssrcs[i]); 567 stats_proxy_.OnInactiveSsrc(config_.rtp.ssrcs[i]);
567 } 568 }
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
801 &module_nack_rate); 802 &module_nack_rate);
802 *sent_video_rate_bps += module_video_rate; 803 *sent_video_rate_bps += module_video_rate;
803 *sent_nack_rate_bps += module_nack_rate; 804 *sent_nack_rate_bps += module_nack_rate;
804 *sent_fec_rate_bps += module_fec_rate; 805 *sent_fec_rate_bps += module_fec_rate;
805 } 806 }
806 return 0; 807 return 0;
807 } 808 }
808 809
809 } // namespace internal 810 } // namespace internal
810 } // namespace webrtc 811 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/encoder_state_feedback_unittest.cc ('k') | webrtc/video/vie_encoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698