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

Side by Side Diff: webrtc/video_engine/vie_channel_group.cc

Issue 1247293002: Add support for transport wide sequence numbers (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 5 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
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 434 matching lines...) Expand 10 before | Expand all | Expand 10 after
445 } 445 }
446 446
447 EncoderStateFeedback* ChannelGroup::GetEncoderStateFeedback() const { 447 EncoderStateFeedback* ChannelGroup::GetEncoderStateFeedback() const {
448 return encoder_state_feedback_.get(); 448 return encoder_state_feedback_.get();
449 } 449 }
450 450
451 int64_t ChannelGroup::GetPacerQueuingDelayMs() const { 451 int64_t ChannelGroup::GetPacerQueuingDelayMs() const {
452 return pacer_->QueueInMs(); 452 return pacer_->QueueInMs();
453 } 453 }
454 454
455 PacketRouter* ChannelGroup::GetPacketRouter() const {
456 return packet_router_.get();
457 }
458
455 void ChannelGroup::SetChannelRembStatus(bool sender, 459 void ChannelGroup::SetChannelRembStatus(bool sender,
456 bool receiver, 460 bool receiver,
457 ViEChannel* channel) { 461 ViEChannel* channel) {
458 // Update the channel state. 462 // Update the channel state.
459 channel->EnableRemb(sender || receiver); 463 channel->EnableRemb(sender || receiver);
460 // Update the REMB instance with necessary RTP modules. 464 // Update the REMB instance with necessary RTP modules.
461 RtpRtcp* rtp_module = channel->rtp_rtcp(); 465 RtpRtcp* rtp_module = channel->rtp_rtcp();
462 if (sender) { 466 if (sender) {
463 remb_->AddRembSender(rtp_module); 467 remb_->AddRembSender(rtp_module);
464 } else { 468 } else {
(...skipping 15 matching lines...) Expand all
480 CriticalSectionScoped lock(encoder_map_cs_.get()); 484 CriticalSectionScoped lock(encoder_map_cs_.get());
481 for (const auto& encoder : send_encoders_) 485 for (const auto& encoder : send_encoders_)
482 pad_up_to_bitrate_bps += encoder.second->GetPaddingNeededBps(); 486 pad_up_to_bitrate_bps += encoder.second->GetPaddingNeededBps();
483 } 487 }
484 pacer_->UpdateBitrate( 488 pacer_->UpdateBitrate(
485 target_bitrate_bps / 1000, 489 target_bitrate_bps / 1000,
486 PacedSender::kDefaultPaceMultiplier * target_bitrate_bps / 1000, 490 PacedSender::kDefaultPaceMultiplier * target_bitrate_bps / 1000,
487 pad_up_to_bitrate_bps / 1000); 491 pad_up_to_bitrate_bps / 1000);
488 } 492 }
489 } // namespace webrtc 493 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698