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

Side by Side Diff: webrtc/voice_engine/channel.h

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: Another rebase Created 5 years, 3 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
« no previous file with comments | « webrtc/voice_engine/BUILD.gn ('k') | webrtc/voice_engine/channel.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 44
45 namespace webrtc { 45 namespace webrtc {
46 46
47 class AudioDeviceModule; 47 class AudioDeviceModule;
48 class Config; 48 class Config;
49 class CriticalSectionWrapper; 49 class CriticalSectionWrapper;
50 class FileWrapper; 50 class FileWrapper;
51 class ProcessThread; 51 class ProcessThread;
52 class ReceiveStatistics; 52 class ReceiveStatistics;
53 class RemoteNtpTimeEstimator; 53 class RemoteNtpTimeEstimator;
54 class RtcEventLog;
54 class RTPPayloadRegistry; 55 class RTPPayloadRegistry;
55 class RtpReceiver; 56 class RtpReceiver;
56 class RTPReceiverAudio; 57 class RTPReceiverAudio;
57 class RtpRtcp; 58 class RtpRtcp;
58 class TelephoneEventHandler; 59 class TelephoneEventHandler;
59 class VoEMediaProcess; 60 class VoEMediaProcess;
60 class VoERTPObserver; 61 class VoERTPObserver;
61 class VoiceEngineObserver; 62 class VoiceEngineObserver;
62 63
63 struct CallStatistics; 64 struct CallStatistics;
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 { 164 {
164 public: 165 public:
165 friend class VoERtcpObserver; 166 friend class VoERtcpObserver;
166 167
167 enum {KNumSocketThreads = 1}; 168 enum {KNumSocketThreads = 1};
168 enum {KNumberOfSocketBuffers = 8}; 169 enum {KNumberOfSocketBuffers = 8};
169 virtual ~Channel(); 170 virtual ~Channel();
170 static int32_t CreateChannel(Channel*& channel, 171 static int32_t CreateChannel(Channel*& channel,
171 int32_t channelId, 172 int32_t channelId,
172 uint32_t instanceId, 173 uint32_t instanceId,
174 RtcEventLog* const event_log,
173 const Config& config); 175 const Config& config);
174 Channel(int32_t channelId, uint32_t instanceId, const Config& config); 176 Channel(int32_t channelId,
177 uint32_t instanceId,
178 RtcEventLog* const event_log,
179 const Config& config);
175 int32_t Init(); 180 int32_t Init();
176 int32_t SetEngineInformation( 181 int32_t SetEngineInformation(
177 Statistics& engineStatistics, 182 Statistics& engineStatistics,
178 OutputMixer& outputMixer, 183 OutputMixer& outputMixer,
179 TransmitMixer& transmitMixer, 184 TransmitMixer& transmitMixer,
180 ProcessThread& moduleProcessThread, 185 ProcessThread& moduleProcessThread,
181 AudioDeviceModule& audioDeviceModule, 186 AudioDeviceModule& audioDeviceModule,
182 VoiceEngineObserver* voiceEngineObserver, 187 VoiceEngineObserver* voiceEngineObserver,
183 CriticalSectionWrapper* callbackCritSect); 188 CriticalSectionWrapper* callbackCritSect);
184 int32_t UpdateLocalTimeStamp(); 189 int32_t UpdateLocalTimeStamp();
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after
578 rtc::scoped_ptr<NetworkPredictor> network_predictor_; 583 rtc::scoped_ptr<NetworkPredictor> network_predictor_;
579 // An associated send channel. 584 // An associated send channel.
580 rtc::scoped_ptr<CriticalSectionWrapper> assoc_send_channel_lock_; 585 rtc::scoped_ptr<CriticalSectionWrapper> assoc_send_channel_lock_;
581 ChannelOwner associate_send_channel_ GUARDED_BY(assoc_send_channel_lock_); 586 ChannelOwner associate_send_channel_ GUARDED_BY(assoc_send_channel_lock_);
582 }; 587 };
583 588
584 } // namespace voe 589 } // namespace voe
585 } // namespace webrtc 590 } // namespace webrtc
586 591
587 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_ 592 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_
OLDNEW
« no previous file with comments | « webrtc/voice_engine/BUILD.gn ('k') | webrtc/voice_engine/channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698