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

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

Issue 1373903003: Unify newapi::RtcpMode and RTCPMethod. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 2 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 454 matching lines...) Expand 10 before | Expand all | Expand 10 after
465 } 465 }
466 466
467 uint32_t ViEChannel::DiscardedPackets() const { 467 uint32_t ViEChannel::DiscardedPackets() const {
468 return vcm_->DiscardedPackets(); 468 return vcm_->DiscardedPackets();
469 } 469 }
470 470
471 int ViEChannel::ReceiveDelay() const { 471 int ViEChannel::ReceiveDelay() const {
472 return vcm_->Delay(); 472 return vcm_->Delay();
473 } 473 }
474 474
475 void ViEChannel::SetRTCPMode(const RTCPMethod rtcp_mode) { 475 void ViEChannel::SetRTCPMode(const RtcpMode rtcp_mode) {
476 for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) 476 for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_)
477 rtp_rtcp->SetRTCPStatus(rtcp_mode); 477 rtp_rtcp->SetRTCPStatus(rtcp_mode);
478 } 478 }
479 479
480 void ViEChannel::SetProtectionMode(bool enable_nack, 480 void ViEChannel::SetProtectionMode(bool enable_nack,
481 bool enable_fec, 481 bool enable_fec,
482 int payload_type_red, 482 int payload_type_red,
483 int payload_type_fec) { 483 int payload_type_fec) {
484 // Validate payload types. 484 // Validate payload types.
485 if (enable_fec) { 485 if (enable_fec) {
(...skipping 767 matching lines...) Expand 10 before | Expand all | Expand 10 after
1253 CriticalSectionScoped cs(crit_.get()); 1253 CriticalSectionScoped cs(crit_.get());
1254 receive_stats_callback_ = receive_statistics_proxy; 1254 receive_stats_callback_ = receive_statistics_proxy;
1255 } 1255 }
1256 1256
1257 void ViEChannel::SetIncomingVideoStream( 1257 void ViEChannel::SetIncomingVideoStream(
1258 IncomingVideoStream* incoming_video_stream) { 1258 IncomingVideoStream* incoming_video_stream) {
1259 CriticalSectionScoped cs(crit_.get()); 1259 CriticalSectionScoped cs(crit_.get());
1260 incoming_video_stream_ = incoming_video_stream; 1260 incoming_video_stream_ = incoming_video_stream;
1261 } 1261 }
1262 } // namespace webrtc 1262 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698