diff options
| author | pwestin@webrtc.org <pwestin@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-03-13 23:20:57 +0000 |
|---|---|---|
| committer | pwestin@webrtc.org <pwestin@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-03-13 23:20:57 +0000 |
| commit | 912b7f727086279bfa950dce96953fe018f49580 (patch) | |
| tree | 4afcdf076abaae606bf7f4c500b8ad76e90301e0 /video_engine/vie_base_impl.cc | |
| parent | 40749c1740c81cf0e637f4d3434c5d24619b0580 (diff) | |
| download | webrtc-912b7f727086279bfa950dce96953fe018f49580.tar.gz | |
Revert r3667 and r3665
Review URL: https://webrtc-codereview.appspot.com/1199004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@3668 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'video_engine/vie_base_impl.cc')
| -rw-r--r-- | video_engine/vie_base_impl.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/video_engine/vie_base_impl.cc b/video_engine/vie_base_impl.cc index e35a2166..6348bc49 100644 --- a/video_engine/vie_base_impl.cc +++ b/video_engine/vie_base_impl.cc @@ -325,6 +325,14 @@ int ViEBaseImpl::StartReceive(const int video_channel) { shared_data_.SetLastError(kViEBaseInvalidChannelId); return -1; } + if (vie_channel->Receiving()) { + WEBRTC_TRACE(kTraceError, kTraceVideo, + ViEId(shared_data_.instance_id(), video_channel), + "%s: Channel %d already receive.", __FUNCTION__, + video_channel); + shared_data_.SetLastError(kViEBaseAlreadyReceiving); + return -1; + } if (vie_channel->StartReceive() != 0) { shared_data_.SetLastError(kViEBaseUnknownError); return -1; |