| Index: webrtc/voice_engine/channel_manager.cc
|
| diff --git a/webrtc/voice_engine/channel_manager.cc b/webrtc/voice_engine/channel_manager.cc
|
| index b8ffe6e796c239734e4748fd1e5d87305bdc527f..b81c8a63cc98a185ea5f40667e35f786590b28b3 100644
|
| --- a/webrtc/voice_engine/channel_manager.cc
|
| +++ b/webrtc/voice_engine/channel_manager.cc
|
| @@ -10,6 +10,7 @@
|
|
|
| #include "webrtc/voice_engine/channel_manager.h"
|
|
|
| +#include "webrtc/base/timeutils.h"
|
| #include "webrtc/voice_engine/channel.h"
|
|
|
| namespace webrtc {
|
| @@ -45,12 +46,18 @@ ChannelOwner::ChannelRef::ChannelRef(class Channel* channel)
|
| : channel(channel), ref_count(1) {}
|
|
|
| ChannelManager::ChannelManager(uint32_t instance_id)
|
| - : instance_id_(instance_id), last_channel_id_(-1) {}
|
| + : instance_id_(instance_id),
|
| + last_channel_id_(-1),
|
| + random_(rtc::TimeNanos()) {}
|
|
|
| ChannelOwner ChannelManager::CreateChannel(
|
| const VoEBase::ChannelConfig& config) {
|
| Channel* channel;
|
| Channel::CreateChannel(channel, ++last_channel_id_, instance_id_, config);
|
| + // TODO(solenberg): Delete this, users should configure ssrc
|
| + // explicitly.
|
| + channel->SetLocalSSRC(random_.Rand<uint32_t>());
|
| +
|
| ChannelOwner channel_owner(channel);
|
|
|
| rtc::CritScope crit(&lock_);
|
|
|