| 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 2a7359737a478b8670da4484615f2e9c7296b0c2..44e571b2328960ae9a82867622aa663261d28af1 100644
|
| --- a/webrtc/voice_engine/voe_rtp_rtcp_impl.cc
|
| +++ b/webrtc/voice_engine/voe_rtp_rtcp_impl.cc
|
| @@ -141,7 +141,7 @@ int VoERTP_RTCPImpl::SetReceiveAudioLevelIndicationStatus(int channel,
|
| // the range 1-14 inclusive.
|
| _shared->SetLastError(
|
| VE_INVALID_ARGUMENT, kTraceError,
|
| - "SetReceiveAbsoluteSenderTimeStatus() invalid id parameter");
|
| + "SetReceiveAudioLevelIndicationStatus() invalid id parameter");
|
| return -1;
|
| }
|
| // Set state and id for the specified channel.
|
| @@ -156,69 +156,6 @@ int VoERTP_RTCPImpl::SetReceiveAudioLevelIndicationStatus(int channel,
|
| return channel_ptr->SetReceiveAudioLevelIndicationStatus(enable, id);
|
| }
|
|
|
| -int VoERTP_RTCPImpl::SetSendAbsoluteSenderTimeStatus(int channel,
|
| - bool enable,
|
| - unsigned char id) {
|
| - WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
|
| - "SetSendAbsoluteSenderTimeStatus(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,
|
| - "SetSendAbsoluteSenderTimeStatus() invalid id parameter");
|
| - return -1;
|
| - }
|
| - // Set state and id for the specified channel.
|
| - voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
|
| - voe::Channel* channelPtr = ch.channel();
|
| - if (channelPtr == NULL) {
|
| - _shared->SetLastError(
|
| - VE_CHANNEL_NOT_VALID, kTraceError,
|
| - "SetSendAbsoluteSenderTimeStatus() failed to locate channel");
|
| - return -1;
|
| - }
|
| - return channelPtr->SetSendAbsoluteSenderTimeStatus(enable, id);
|
| -}
|
| -
|
| -int VoERTP_RTCPImpl::SetReceiveAbsoluteSenderTimeStatus(int channel,
|
| - bool enable,
|
| - unsigned char id) {
|
| - WEBRTC_TRACE(
|
| - kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
|
| - "SetReceiveAbsoluteSenderTimeStatus(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,
|
| - "SetReceiveAbsoluteSenderTimeStatus() invalid id parameter");
|
| - return -1;
|
| - }
|
| - // Set state and id for the specified channel.
|
| - voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
|
| - voe::Channel* channelPtr = ch.channel();
|
| - if (channelPtr == NULL) {
|
| - _shared->SetLastError(
|
| - VE_CHANNEL_NOT_VALID, kTraceError,
|
| - "SetReceiveAbsoluteSenderTimeStatus() failed to locate channel");
|
| - return -1;
|
| - }
|
| - return channelPtr->SetReceiveAbsoluteSenderTimeStatus(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);
|
|
|