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

Side by Side Diff: webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc

Issue 1226143013: Merge methods for configuring NACK/FEC/hybrid. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase 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 816 matching lines...) Expand 10 before | Expand all | Expand 10 after
827 } 827 }
828 return -1; 828 return -1;
829 } 829 }
830 830
831 int32_t ModuleRtpRtcpImpl::SendRTCPSliceLossIndication( 831 int32_t ModuleRtpRtcpImpl::SendRTCPSliceLossIndication(
832 const uint8_t picture_id) { 832 const uint8_t picture_id) {
833 return rtcp_sender_.SendRTCP( 833 return rtcp_sender_.SendRTCP(
834 GetFeedbackState(), kRtcpSli, 0, 0, false, picture_id); 834 GetFeedbackState(), kRtcpSli, 0, 0, false, picture_id);
835 } 835 }
836 836
837 int32_t ModuleRtpRtcpImpl::SetGenericFECStatus( 837 void ModuleRtpRtcpImpl::SetGenericFECStatus(
838 const bool enable, 838 const bool enable,
839 const uint8_t payload_type_red, 839 const uint8_t payload_type_red,
840 const uint8_t payload_type_fec) { 840 const uint8_t payload_type_fec) {
841 return rtp_sender_.SetGenericFECStatus(enable, 841 rtp_sender_.SetGenericFECStatus(enable, payload_type_red, payload_type_fec);
842 payload_type_red,
843 payload_type_fec);
844 } 842 }
845 843
846 int32_t ModuleRtpRtcpImpl::GenericFECStatus( 844 void ModuleRtpRtcpImpl::GenericFECStatus(bool& enable,
847 bool& enable, 845 uint8_t& payload_type_red,
848 uint8_t& payload_type_red, 846 uint8_t& payload_type_fec) {
849 uint8_t& payload_type_fec) { 847 rtp_sender_.GenericFECStatus(&enable, &payload_type_red,
850 return rtp_sender_.GenericFECStatus(&enable, &payload_type_red,
851 &payload_type_fec); 848 &payload_type_fec);
852 } 849 }
853 850
854 int32_t ModuleRtpRtcpImpl::SetFecParameters( 851 int32_t ModuleRtpRtcpImpl::SetFecParameters(
855 const FecProtectionParams* delta_params, 852 const FecProtectionParams* delta_params,
856 const FecProtectionParams* key_params) { 853 const FecProtectionParams* key_params) {
857 return rtp_sender_.SetFecParameters(delta_params, key_params); 854 return rtp_sender_.SetFecParameters(delta_params, key_params);
858 } 855 }
859 856
860 void ModuleRtpRtcpImpl::SetRemoteSSRC(const uint32_t ssrc) { 857 void ModuleRtpRtcpImpl::SetRemoteSSRC(const uint32_t ssrc) {
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
997 void ModuleRtpRtcpImpl::RegisterSendChannelRtpStatisticsCallback( 994 void ModuleRtpRtcpImpl::RegisterSendChannelRtpStatisticsCallback(
998 StreamDataCountersCallback* callback) { 995 StreamDataCountersCallback* callback) {
999 rtp_sender_.RegisterRtpStatisticsCallback(callback); 996 rtp_sender_.RegisterRtpStatisticsCallback(callback);
1000 } 997 }
1001 998
1002 StreamDataCountersCallback* 999 StreamDataCountersCallback*
1003 ModuleRtpRtcpImpl::GetSendChannelRtpStatisticsCallback() const { 1000 ModuleRtpRtcpImpl::GetSendChannelRtpStatisticsCallback() const {
1004 return rtp_sender_.GetRtpStatisticsCallback(); 1001 return rtp_sender_.GetRtpStatisticsCallback();
1005 } 1002 }
1006 } // namespace webrtc 1003 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h ('k') | webrtc/modules/rtp_rtcp/source/rtp_sender.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698