| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| (...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 429 shared_->SetLastError(VE_NOT_INITED, kTraceError); | 429 shared_->SetLastError(VE_NOT_INITED, kTraceError); |
| 430 return -1; | 430 return -1; |
| 431 } | 431 } |
| 432 voe::ChannelOwner ch = shared_->channel_manager().GetChannel(channel); | 432 voe::ChannelOwner ch = shared_->channel_manager().GetChannel(channel); |
| 433 voe::Channel* channelPtr = ch.channel(); | 433 voe::Channel* channelPtr = ch.channel(); |
| 434 if (channelPtr == nullptr) { | 434 if (channelPtr == nullptr) { |
| 435 shared_->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, | 435 shared_->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, |
| 436 "StartReceive() failed to locate channel"); | 436 "StartReceive() failed to locate channel"); |
| 437 return -1; | 437 return -1; |
| 438 } | 438 } |
| 439 channelPtr->ResetDiscardedPacketCount(); | |
| 440 return 0; | 439 return 0; |
| 441 } | 440 } |
| 442 | 441 |
| 443 int VoEBaseImpl::StartPlayout(int channel) { | 442 int VoEBaseImpl::StartPlayout(int channel) { |
| 444 rtc::CritScope cs(shared_->crit_sec()); | 443 rtc::CritScope cs(shared_->crit_sec()); |
| 445 if (!shared_->statistics().Initialized()) { | 444 if (!shared_->statistics().Initialized()) { |
| 446 shared_->SetLastError(VE_NOT_INITED, kTraceError); | 445 shared_->SetLastError(VE_NOT_INITED, kTraceError); |
| 447 return -1; | 446 return -1; |
| 448 } | 447 } |
| 449 voe::ChannelOwner ch = shared_->channel_manager().GetChannel(channel); | 448 voe::ChannelOwner ch = shared_->channel_manager().GetChannel(channel); |
| (...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 767 shared_->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, | 766 shared_->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, |
| 768 "AssociateSendChannel() failed to locate accociate_send_channel"); | 767 "AssociateSendChannel() failed to locate accociate_send_channel"); |
| 769 return -1; | 768 return -1; |
| 770 } | 769 } |
| 771 | 770 |
| 772 channel_ptr->set_associate_send_channel(ch); | 771 channel_ptr->set_associate_send_channel(ch); |
| 773 return 0; | 772 return 0; |
| 774 } | 773 } |
| 775 | 774 |
| 776 } // namespace webrtc | 775 } // namespace webrtc |
| OLD | NEW |