diff options
| author | pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-12-16 12:24:44 +0000 |
|---|---|---|
| committer | pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-12-16 12:24:44 +0000 |
| commit | 46f72884ad5c4078fa324626aa69e4860e4d4ae2 (patch) | |
| tree | ac270ec362c11938d27ec02fc46722abb518b5d9 /video_engine/vie_rtp_rtcp_impl.cc | |
| parent | 1b3b8cb33688a0538a0ad151f164362a559d17e6 (diff) | |
| download | webrtc-46f72884ad5c4078fa324626aa69e4860e4d4ae2.tar.gz | |
Revert r5294 to re-roll r5293.
To fix races in test each stream now owns its own encoder/decoder.
R=mflodman@webrtc.org
BUG=
Review URL: https://webrtc-codereview.appspot.com/5919004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@5297 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'video_engine/vie_rtp_rtcp_impl.cc')
| -rw-r--r-- | video_engine/vie_rtp_rtcp_impl.cc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/video_engine/vie_rtp_rtcp_impl.cc b/video_engine/vie_rtp_rtcp_impl.cc index e07ab6c1..2bd47bec 100644 --- a/video_engine/vie_rtp_rtcp_impl.cc +++ b/video_engine/vie_rtp_rtcp_impl.cc @@ -796,8 +796,16 @@ int ViERTP_RTCPImpl::SetReceiveAbsoluteSendTimeStatus(int video_channel, ViEId(shared_data_->instance_id(), video_channel), "ViERTP_RTCPImpl::SetReceiveAbsoluteSendTimeStatus(%d, %d, %d)", video_channel, enable, id); - if (!shared_data_->channel_manager()->SetReceiveAbsoluteSendTimeStatus( - video_channel, enable, id)) { + ViEChannelManagerScoped cs(*(shared_data_->channel_manager())); + ViEChannel* vie_channel = cs.Channel(video_channel); + if (!vie_channel) { + WEBRTC_TRACE(kTraceError, kTraceVideo, + ViEId(shared_data_->instance_id(), video_channel), + "%s: Channel %d doesn't exist", __FUNCTION__, video_channel); + shared_data_->SetLastError(kViERtpRtcpInvalidChannelId); + return -1; + } + if (vie_channel->SetReceiveAbsoluteSendTimeStatus(enable, id) != 0) { shared_data_->SetLastError(kViERtpRtcpUnknownError); return -1; } |