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

Unified Diff: webrtc/voice_engine/voe_rtp_rtcp_impl.cc

Issue 2667423004: Remove the unused and untested functions from VoERTP_RTCP. (Closed)
Patch Set: rebase Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/voice_engine/voe_rtp_rtcp_impl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/voice_engine/voe_rtp_rtcp_impl.cc
diff --git a/webrtc/voice_engine/voe_rtp_rtcp_impl.cc b/webrtc/voice_engine/voe_rtp_rtcp_impl.cc
index 8cdb4f47796a83fb66d2349ae0db698568723729..b69ddf382d6e7042587a614b498aec2f141ee4a7 100644
--- a/webrtc/voice_engine/voe_rtp_rtcp_impl.cc
+++ b/webrtc/voice_engine/voe_rtp_rtcp_impl.cc
@@ -118,38 +118,6 @@ int VoERTP_RTCPImpl::SetSendAudioLevelIndicationStatus(int channel,
return channelPtr->SetSendAudioLevelIndicationStatus(enable, id);
}
-int VoERTP_RTCPImpl::SetReceiveAudioLevelIndicationStatus(int channel,
- bool enable,
- unsigned char id) {
- WEBRTC_TRACE(
- kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
- "SetReceiveAudioLevelIndicationStatus(channel=%d, enable=%d, id=%u)",
- channel, enable, id);
- if (!_shared->statistics().Initialized()) {
- _shared->SetLastError(VE_NOT_INITED, kTraceError);
- return -1;
- }
- if (enable && (id < kVoiceEngineMinRtpExtensionId ||
- id > kVoiceEngineMaxRtpExtensionId)) {
- // [RFC5285] The 4-bit id is the local identifier of this element in
- // the range 1-14 inclusive.
- _shared->SetLastError(
- VE_INVALID_ARGUMENT, kTraceError,
- "SetReceiveAudioLevelIndicationStatus() invalid id parameter");
- return -1;
- }
- // Set state and id for the specified channel.
- voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
- voe::Channel* channel_ptr = ch.channel();
- if (channel_ptr == NULL) {
- _shared->SetLastError(
- VE_CHANNEL_NOT_VALID, kTraceError,
- "SetReceiveAudioLevelIndicationStatus() failed to locate channel");
- return -1;
- }
- return channel_ptr->SetReceiveAudioLevelIndicationStatus(enable, id);
-}
-
int VoERTP_RTCPImpl::SetRTCPStatus(int channel, bool enable) {
WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
"SetRTCPStatus(channel=%d, enable=%d)", channel, enable);
@@ -215,49 +183,6 @@ int VoERTP_RTCPImpl::GetRemoteRTCP_CNAME(int channel, char cName[256]) {
return channelPtr->GetRemoteRTCP_CNAME(cName);
}
-int VoERTP_RTCPImpl::GetRemoteRTCPData(
- int channel,
- unsigned int& NTPHigh, // from sender info in SR
- unsigned int& NTPLow, // from sender info in SR
- unsigned int& timestamp, // from sender info in SR
- unsigned int& playoutTimestamp, // derived locally
- unsigned int* jitter, // from report block 1 in SR/RR
- unsigned short* fractionLost) // from report block 1 in SR/RR
-{
- if (!_shared->statistics().Initialized()) {
- _shared->SetLastError(VE_NOT_INITED, kTraceError);
- return -1;
- }
- voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
- voe::Channel* channelPtr = ch.channel();
- if (channelPtr == NULL) {
- _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
- "GetRemoteRTCP_CNAME() failed to locate channel");
- return -1;
- }
- return channelPtr->GetRemoteRTCPData(NTPHigh, NTPLow, timestamp,
- playoutTimestamp, jitter, fractionLost);
-}
-
-int VoERTP_RTCPImpl::GetRTPStatistics(int channel,
- unsigned int& averageJitterMs,
- unsigned int& maxJitterMs,
- unsigned int& discardedPackets) {
- if (!_shared->statistics().Initialized()) {
- _shared->SetLastError(VE_NOT_INITED, kTraceError);
- return -1;
- }
- voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
- voe::Channel* channelPtr = ch.channel();
- if (channelPtr == NULL) {
- _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
- "GetRTPStatistics() failed to locate channel");
- return -1;
- }
- return channelPtr->GetRTPStatistics(averageJitterMs, maxJitterMs,
- discardedPackets);
-}
-
int VoERTP_RTCPImpl::GetRTCPStatistics(int channel, CallStatistics& stats) {
if (!_shared->statistics().Initialized()) {
_shared->SetLastError(VE_NOT_INITED, kTraceError);
@@ -273,37 +198,4 @@ int VoERTP_RTCPImpl::GetRTCPStatistics(int channel, CallStatistics& stats) {
return channelPtr->GetRTPStatistics(stats);
}
-int VoERTP_RTCPImpl::GetRemoteRTCPReportBlocks(
- int channel, std::vector<ReportBlock>* report_blocks) {
- if (!_shared->statistics().Initialized()) {
- _shared->SetLastError(VE_NOT_INITED, kTraceError);
- return -1;
- }
- voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
- voe::Channel* channel_ptr = ch.channel();
- if (channel_ptr == NULL) {
- _shared->SetLastError(
- VE_CHANNEL_NOT_VALID, kTraceError,
- "GetRemoteRTCPReportBlocks() failed to locate channel");
- return -1;
- }
- return channel_ptr->GetRemoteRTCPReportBlocks(report_blocks);
-}
-
-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,
- enable, maxNoPackets);
-
- voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
- voe::Channel* channelPtr = ch.channel();
- if (channelPtr == NULL) {
- _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
- "SetNACKStatus() failed to locate channel");
- return -1;
- }
- channelPtr->SetNACKStatus(enable, maxNoPackets);
- return 0;
-}
-
} // namespace webrtc
« no previous file with comments | « webrtc/voice_engine/voe_rtp_rtcp_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698