admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VoERTP_RTCP: Remove GetREDStatus and SetREDStatus

Browse Source 
They always fail, because RED isn't supported.

BUG=webrtc:5922

Review-Url: https://codereview.webrtc.org/2055753002
Cr-Commit-Position: refs/heads/master@{#13743}
This commit is contained in:
kwiberg 2016-08-15 03:34:48 -07:00 committed by Commit bot
parent 5bcc00e538
commit 0ccff57024
4 changed files with 3 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
webrtc/voice_engine/include/voe_rtp_rtcp.h
View File

@ -187,20 +187,6 @@ class WEBRTC_DLLEXPORT VoERTP_RTCP {
int channel,
std::vector<ReportBlock>* receive_blocks) = 0;
// Sets the Redundant Coding (RED) status on a specific |channel|.
// TODO(minyue): Make SetREDStatus() pure virtual when fakewebrtcvoiceengine
// in talk is ready.
virtual int SetREDStatus(int channel, bool enable, int redPayloadtype = -1) {
return -1;
}
// Gets the RED status on a specific |channel|.
// TODO(minyue): Make GetREDStatus() pure virtual when fakewebrtcvoiceengine
// in talk is ready.
virtual int GetREDStatus(int channel, bool& enabled, int& redPayloadtype) {
return -1;
}
// This function enables Negative Acknowledgment (NACK) using RTCP,
// implemented based on RFC 4585. NACK retransmits RTP packets if lost on
// the network. This creates a lossless transport at the expense of delay.

11
webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc
View File

@ -456,14 +456,9 @@ void RunTest(std::string out_path) {
if (option_selection < option_index) {
res = codec->GetCodec(option_selection, cinst);
VALIDATE;
if (strcmp(cinst.plname, "red") == 0) {
printf("Enabling RED\n");
res = rtp_rtcp->SetREDStatus(chan, true, cinst.pltype);
} else {
SetStereoIfOpus(opus_stereo, &cinst);
printf("Set primary codec\n");
res = codec->SetSendCodec(chan, cinst);
}
SetStereoIfOpus(opus_stereo, &cinst);
printf("Set primary codec\n");
res = codec->SetSendCodec(chan, cinst);
VALIDATE;
} else if (option_selection == option_index++) {
enable_cng = !enable_cng;

19
webrtc/voice_engine/voe_rtp_rtcp_impl.cc
View File

@ -359,25 +359,6 @@ int VoERTP_RTCPImpl::GetRemoteRTCPReportBlocks(
return channel_ptr->GetRemoteRTCPReportBlocks(report_blocks);
}
int VoERTP_RTCPImpl::SetREDStatus(int channel,
bool enable,
int redPayloadtype) {
WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
"SetREDStatus(channel=%d, enable=%d, redPayloadtype=%d)",
channel, enable, redPayloadtype);
_shared->SetLastError(VE_FUNC_NOT_SUPPORTED, kTraceError,
"SetREDStatus() RED is not supported");
return -1;
}
int VoERTP_RTCPImpl::GetREDStatus(int channel,
bool& enabled,
int& redPayloadtype) {
_shared->SetLastError(VE_FUNC_NOT_SUPPORTED, kTraceError,
"GetREDStatus() RED is not supported");
return -1;
}
int VoERTP_RTCPImpl::SetNACKStatus(int channel, bool enable, int maxNoPackets) {
WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
"SetNACKStatus(channel=%d, enable=%d, maxNoPackets=%d)", channel,

5
webrtc/voice_engine/voe_rtp_rtcp_impl.h
View File

@ -71,11 +71,6 @@ class VoERTP_RTCPImpl : public VoERTP_RTCP {
int channel,
std::vector<ReportBlock>* report_blocks) override;
// RED
int SetREDStatus(int channel, bool enable, int redPayloadtype = -1) override;
int GetREDStatus(int channel, bool& enabled, int& redPayloadtype) override;
// NACK
int SetNACKStatus(int channel, bool enable, int maxNoPackets) override;