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

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

Issue 1418123003: Adding reduced size RTCP configuration down to the video stream level. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fixing TODO comments. Created 5 years, 1 month 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 493 matching lines...) Expand 10 before | Expand all | Expand 10 after
504 } 504 }
505 505
506 return rtp_states; 506 return rtp_states;
507 } 507 }
508 508
509 void VideoSendStream::SignalNetworkState(NetworkState state) { 509 void VideoSendStream::SignalNetworkState(NetworkState state) {
510 // When network goes up, enable RTCP status before setting transmission state. 510 // When network goes up, enable RTCP status before setting transmission state.
511 // When it goes down, disable RTCP afterwards. This ensures that any packets 511 // When it goes down, disable RTCP afterwards. This ensures that any packets
512 // sent due to the network state changed will not be dropped. 512 // sent due to the network state changed will not be dropped.
513 if (state == kNetworkUp) 513 if (state == kNetworkUp)
514 vie_channel_->SetRTCPMode(RtcpMode::kCompound); 514 vie_channel_->SetRTCPMode(config_.rtp.rtcp_mode);
515 vie_encoder_->SetNetworkTransmissionState(state == kNetworkUp); 515 vie_encoder_->SetNetworkTransmissionState(state == kNetworkUp);
516 if (state == kNetworkDown) 516 if (state == kNetworkDown)
517 vie_channel_->SetRTCPMode(RtcpMode::kOff); 517 vie_channel_->SetRTCPMode(RtcpMode::kOff);
518 } 518 }
519 519
520 int64_t VideoSendStream::GetRtt() const { 520 int64_t VideoSendStream::GetRtt() const {
521 webrtc::RtcpStatistics rtcp_stats; 521 webrtc::RtcpStatistics rtcp_stats;
522 uint16_t frac_lost; 522 uint16_t frac_lost;
523 uint32_t cumulative_lost; 523 uint32_t cumulative_lost;
524 uint32_t extended_max_sequence_number; 524 uint32_t extended_max_sequence_number;
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
566 vie_encoder_->SetSsrcs(used_ssrcs); 566 vie_encoder_->SetSsrcs(used_ssrcs);
567 567
568 // Restart the media flow 568 // Restart the media flow
569 vie_encoder_->Restart(); 569 vie_encoder_->Restart();
570 570
571 return true; 571 return true;
572 } 572 }
573 573
574 } // namespace internal 574 } // namespace internal
575 } // namespace webrtc 575 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698