| Index: webrtc/voice_engine/channel.cc
|
| diff --git a/webrtc/voice_engine/channel.cc b/webrtc/voice_engine/channel.cc
|
| index deea05772716abfaabadcf0725ece599ace6cb36..c434b1d61cd0c6621fba8f78c0a9b1c2c9ca5368 100644
|
| --- a/webrtc/voice_engine/channel.cc
|
| +++ b/webrtc/voice_engine/channel.cc
|
| @@ -1222,26 +1222,10 @@ int32_t Channel::StopSend() {
|
| return 0;
|
| }
|
|
|
| -int32_t Channel::StartReceiving() {
|
| +void Channel::ResetDiscardedPacketCount() {
|
| WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, _channelId),
|
| - "Channel::StartReceiving()");
|
| - if (channel_state_.Get().receiving) {
|
| - return 0;
|
| - }
|
| - channel_state_.SetReceiving(true);
|
| + "Channel::ResetDiscardedPacketCount()");
|
| _numberOfDiscardedPackets = 0;
|
| - return 0;
|
| -}
|
| -
|
| -int32_t Channel::StopReceiving() {
|
| - WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, _channelId),
|
| - "Channel::StopReceiving()");
|
| - if (!channel_state_.Get().receiving) {
|
| - return 0;
|
| - }
|
| -
|
| - channel_state_.SetReceiving(false);
|
| - return 0;
|
| }
|
|
|
| int32_t Channel::RegisterVoiceEngineObserver(VoiceEngineObserver& observer) {
|
| @@ -1370,12 +1354,6 @@ int32_t Channel::SetRecPayloadType(const CodecInst& codec) {
|
| "SetRecPayloadType() unable to set PT while playing");
|
| return -1;
|
| }
|
| - if (channel_state_.Get().receiving) {
|
| - _engineStatisticsPtr->SetLastError(
|
| - VE_ALREADY_LISTENING, kTraceError,
|
| - "SetRecPayloadType() unable to set PT while listening");
|
| - return -1;
|
| - }
|
|
|
| if (codec.pltype == -1) {
|
| // De-register the selected codec (RTP/RTCP module and ACM)
|
|
|