From 64a2f10f4b566a91b358e77c4ecdf09ebb33ac59 Mon Sep 17 00:00:00 2001 From: "henrik.lundin@webrtc.org" Date: Mon, 22 Sep 2014 14:30:10 +0000 Subject: [PATCH] Remove Get/SetNetEQPlayoutMode APIs These are not used anymore. R=henrika@webrtc.org, pbos@webrtc.org Review URL: https://webrtc-codereview.appspot.com/26569004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7262 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/media/webrtc/fakewebrtcvoiceengine.h | 2 - webrtc/voice_engine/channel.cc | 55 ----------------------- webrtc/voice_engine/channel.h | 2 - webrtc/voice_engine/include/voe_base.h | 3 -- 4 files changed, 62 deletions(-) diff --git a/talk/media/webrtc/fakewebrtcvoiceengine.h b/talk/media/webrtc/fakewebrtcvoiceengine.h index c984a01da..52a50ff28 100644 --- a/talk/media/webrtc/fakewebrtcvoiceengine.h +++ b/talk/media/webrtc/fakewebrtcvoiceengine.h @@ -498,8 +498,6 @@ class FakeWebRtcVoiceEngine WEBRTC_STUB(LastError, ()); WEBRTC_STUB(SetOnHoldStatus, (int, bool, webrtc::OnHoldModes)); WEBRTC_STUB(GetOnHoldStatus, (int, bool&, webrtc::OnHoldModes&)); - WEBRTC_STUB(SetNetEQPlayoutMode, (int, webrtc::NetEqModes)); - WEBRTC_STUB(GetNetEQPlayoutMode, (int, webrtc::NetEqModes&)); // webrtc::VoECodec WEBRTC_FUNC(NumOfCodecs, ()) { diff --git a/webrtc/voice_engine/channel.cc b/webrtc/voice_engine/channel.cc index 6d6b099cd..93a241be3 100644 --- a/webrtc/voice_engine/channel.cc +++ b/webrtc/voice_engine/channel.cc @@ -1391,61 +1391,6 @@ Channel::StopReceiving() return 0; } -int32_t -Channel::SetNetEQPlayoutMode(NetEqModes mode) -{ - WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId,_channelId), - "Channel::SetNetEQPlayoutMode()"); - AudioPlayoutMode playoutMode(voice); - switch (mode) - { - case kNetEqDefault: - playoutMode = voice; - break; - case kNetEqStreaming: - playoutMode = streaming; - break; - case kNetEqFax: - playoutMode = fax; - break; - case kNetEqOff: - playoutMode = off; - break; - } - if (audio_coding_->SetPlayoutMode(playoutMode) != 0) - { - _engineStatisticsPtr->SetLastError( - VE_AUDIO_CODING_MODULE_ERROR, kTraceError, - "SetNetEQPlayoutMode() failed to set playout mode"); - return -1; - } - return 0; -} - -int32_t -Channel::GetNetEQPlayoutMode(NetEqModes& mode) -{ - const AudioPlayoutMode playoutMode = audio_coding_->PlayoutMode(); - switch (playoutMode) - { - case voice: - mode = kNetEqDefault; - break; - case streaming: - mode = kNetEqStreaming; - break; - case fax: - mode = kNetEqFax; - break; - case off: - mode = kNetEqOff; - } - WEBRTC_TRACE(kTraceStateInfo, kTraceVoice, - VoEId(_instanceId,_channelId), - "Channel::GetNetEQPlayoutMode() => mode=%u", mode); - return 0; -} - int32_t Channel::RegisterVoiceEngineObserver(VoiceEngineObserver& observer) { diff --git a/webrtc/voice_engine/channel.h b/webrtc/voice_engine/channel.h index d030daf38..535922fae 100644 --- a/webrtc/voice_engine/channel.h +++ b/webrtc/voice_engine/channel.h @@ -194,8 +194,6 @@ public: int32_t StartReceiving(); int32_t StopReceiving(); - int32_t SetNetEQPlayoutMode(NetEqModes mode); - int32_t GetNetEQPlayoutMode(NetEqModes& mode); int32_t RegisterVoiceEngineObserver(VoiceEngineObserver& observer); int32_t DeRegisterVoiceEngineObserver(); diff --git a/webrtc/voice_engine/include/voe_base.h b/webrtc/voice_engine/include/voe_base.h index 3a78f7b63..65a717586 100644 --- a/webrtc/voice_engine/include/voe_base.h +++ b/webrtc/voice_engine/include/voe_base.h @@ -181,9 +181,6 @@ public: OnHoldModes mode = kHoldSendAndPlay) { return -1; } virtual int GetOnHoldStatus(int channel, bool& enabled, OnHoldModes& mode) { return -1; } - virtual int SetNetEQPlayoutMode(int channel, NetEqModes mode) { return -1; } - virtual int GetNetEQPlayoutMode(int channel, - NetEqModes& mode) { return -1; } protected: VoEBase() {}