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

Side by Side Diff: webrtc/voice_engine/channel.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: Rebased to latest revision of webrtc to resolve patching conflict on try bots. 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 unified diff | Download patch
OLDNEW
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 3436 matching lines...) Expand 10 before | Expand all | Expand 10 after
3447 CriticalSectionScoped lock(assoc_send_channel_lock_.get()); 3447 CriticalSectionScoped lock(assoc_send_channel_lock_.get());
3448 Channel* channel = associate_send_channel_.channel(); 3448 Channel* channel = associate_send_channel_.channel();
3449 if (channel && channel->ChannelId() == channel_id) { 3449 if (channel && channel->ChannelId() == channel_id) {
3450 // If this channel is associated with a send channel of the specified 3450 // If this channel is associated with a send channel of the specified
3451 // Channel ID, disassociate with it. 3451 // Channel ID, disassociate with it.
3452 ChannelOwner ref(NULL); 3452 ChannelOwner ref(NULL);
3453 associate_send_channel_ = ref; 3453 associate_send_channel_ = ref;
3454 } 3454 }
3455 } 3455 }
3456 3456
3457 void Channel::SetEventLog(RtcEventLog* event_log) {
3458 audio_coding_->SetEventLog(event_log);
3459 }
3460
3457 int Channel::RegisterExternalMediaProcessing( 3461 int Channel::RegisterExternalMediaProcessing(
3458 ProcessingTypes type, 3462 ProcessingTypes type,
3459 VoEMediaProcess& processObject) 3463 VoEMediaProcess& processObject)
3460 { 3464 {
3461 WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId,_channelId), 3465 WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId,_channelId),
3462 "Channel::RegisterExternalMediaProcessing()"); 3466 "Channel::RegisterExternalMediaProcessing()");
3463 3467
3464 CriticalSectionScoped cs(&_callbackCritSect); 3468 CriticalSectionScoped cs(&_callbackCritSect);
3465 3469
3466 if (kPlaybackPerChannel == type) 3470 if (kPlaybackPerChannel == type)
(...skipping 664 matching lines...) Expand 10 before | Expand all | Expand 10 after
4131 int64_t min_rtt = 0; 4135 int64_t min_rtt = 0;
4132 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) 4136 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt)
4133 != 0) { 4137 != 0) {
4134 return 0; 4138 return 0;
4135 } 4139 }
4136 return rtt; 4140 return rtt;
4137 } 4141 }
4138 4142
4139 } // namespace voe 4143 } // namespace voe
4140 } // namespace webrtc 4144 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698