Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(775)

Unified Diff: webrtc/voice_engine/channel_manager.cc

Issue 1267683002: Hooked up RtcEventLog. It lives in Voice Engine and pointers are propagated to ACM and Call. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Moved RtcEventLog from SharedData to ChannelManager. Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/voice_engine/channel_manager.cc
diff --git a/webrtc/voice_engine/channel_manager.cc b/webrtc/voice_engine/channel_manager.cc
index 76664d4b12ccd9becadd39f81363fc6b72a8e38c..9169d71d440fb89f94b4ae7c738ed050de016def 100644
--- a/webrtc/voice_engine/channel_manager.cc
+++ b/webrtc/voice_engine/channel_manager.cc
@@ -49,7 +49,9 @@ ChannelManager::ChannelManager(uint32_t instance_id, const Config& config)
: instance_id_(instance_id),
last_channel_id_(-1),
lock_(CriticalSectionWrapper::CreateCriticalSection()),
- config_(config) {}
+ config_(config),
+ event_log_(RtcEventLog::Create()) {
+}
ChannelOwner ChannelManager::CreateChannel() {
return CreateChannelInternal(config_);
@@ -61,7 +63,8 @@ ChannelOwner ChannelManager::CreateChannel(const Config& external_config) {
ChannelOwner ChannelManager::CreateChannelInternal(const Config& config) {
Channel* channel;
- Channel::CreateChannel(channel, ++last_channel_id_, instance_id_, config);
+ Channel::CreateChannel(channel, ++last_channel_id_, instance_id_,
+ event_log_.get(), config);
ChannelOwner channel_owner(channel);
CriticalSectionScoped crit(lock_.get());
@@ -128,6 +131,10 @@ size_t ChannelManager::NumOfChannels() const {
return channels_.size();
}
+RtcEventLog* ChannelManager::GetEventLog() const {
+ return event_log_.get();
+}
+
ChannelManager::Iterator::Iterator(ChannelManager* channel_manager)
: iterator_pos_(0) {
channel_manager->GetAllChannels(&channels_);

Powered by Google App Engine
This is Rietveld 408576698