zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge methods for configuring NACK/FEC/hybrid.

Browse Source 
BUG=webrtc:1695
R=stefan@webrtc.org

Review URL: https://codereview.webrtc.org/1226143013

Cr-Commit-Position: refs/heads/master@{#9580}
This commit is contained in:
pbos
2015-07-14 09:36:34 -07:00
committed by Commit bot
parent caa498abbf
commit ba8c15b857
20 changed files with 126 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
View File

@ -834,20 +834,17 @@ int32_t ModuleRtpRtcpImpl::SendRTCPSliceLossIndication(
GetFeedbackState(), kRtcpSli, 0, 0, false, picture_id);
}
int32_t ModuleRtpRtcpImpl::SetGenericFECStatus(
void ModuleRtpRtcpImpl::SetGenericFECStatus(
const bool enable,
const uint8_t payload_type_red,
const uint8_t payload_type_fec) {
return rtp_sender_.SetGenericFECStatus(enable,
payload_type_red,
payload_type_fec);
rtp_sender_.SetGenericFECStatus(enable, payload_type_red, payload_type_fec);
}
int32_t ModuleRtpRtcpImpl::GenericFECStatus(
bool& enable,
uint8_t& payload_type_red,
uint8_t& payload_type_fec) {
return rtp_sender_.GenericFECStatus(&enable, &payload_type_red,
void ModuleRtpRtcpImpl::GenericFECStatus(bool& enable,
uint8_t& payload_type_red,
uint8_t& payload_type_fec) {
rtp_sender_.GenericFECStatus(&enable, &payload_type_red,
&payload_type_fec);
}