generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove Get/SetNetEQPlayoutMode APIs

Browse Source 
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
This commit is contained in:
henrik.lundin@webrtc.org 2014-09-22 14:30:10 +00:00
parent 07ca949346
commit 64a2f10f4b
4 changed files with 0 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
talk/media/webrtc/fakewebrtcvoiceengine.h
View File

@ -498,8 +498,6 @@ class FakeWebRtcVoiceEngine
WEBRTC_STUB(LastError, ()); WEBRTC_STUB(LastError, ());
WEBRTC_STUB(SetOnHoldStatus, (int, bool, webrtc::OnHoldModes)); WEBRTC_STUB(SetOnHoldStatus, (int, bool, webrtc::OnHoldModes));
WEBRTC_STUB(GetOnHoldStatus, (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::VoECodec
WEBRTC_FUNC(NumOfCodecs, ()) { WEBRTC_FUNC(NumOfCodecs, ()) {

55
webrtc/voice_engine/channel.cc
View File

@ -1391,61 +1391,6 @@ Channel::StopReceiving()
return 0; 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 int32_t
Channel::RegisterVoiceEngineObserver(VoiceEngineObserver& observer) Channel::RegisterVoiceEngineObserver(VoiceEngineObserver& observer)
{ {

2
webrtc/voice_engine/channel.h
View File

@ -194,8 +194,6 @@ public:
int32_t StartReceiving(); int32_t StartReceiving();
int32_t StopReceiving(); int32_t StopReceiving();
int32_t SetNetEQPlayoutMode(NetEqModes mode);
int32_t GetNetEQPlayoutMode(NetEqModes& mode);
int32_t RegisterVoiceEngineObserver(VoiceEngineObserver& observer); int32_t RegisterVoiceEngineObserver(VoiceEngineObserver& observer);
int32_t DeRegisterVoiceEngineObserver(); int32_t DeRegisterVoiceEngineObserver();

3
webrtc/voice_engine/include/voe_base.h
View File

@ -181,9 +181,6 @@ public:
OnHoldModes mode = kHoldSendAndPlay) { return -1; } OnHoldModes mode = kHoldSendAndPlay) { return -1; }
virtual int GetOnHoldStatus(int channel, bool& enabled, virtual int GetOnHoldStatus(int channel, bool& enabled,
OnHoldModes& mode) { return -1; } OnHoldModes& mode) { return -1; }
virtual int SetNetEQPlayoutMode(int channel, NetEqModes mode) { return -1; }
virtual int GetNetEQPlayoutMode(int channel,
NetEqModes& mode) { return -1; }
protected: protected:
VoEBase() {} VoEBase() {}