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

Side by Side Diff: webrtc/voice_engine/voe_base_impl.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: Initial version 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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 int StopSend(int channel) override; 46 int StopSend(int channel) override;
47 47
48 int GetVersion(char version[1024]) override; 48 int GetVersion(char version[1024]) override;
49 49
50 int LastError() override; 50 int LastError() override;
51 51
52 AudioTransport* audio_transport() override { return this; } 52 AudioTransport* audio_transport() override { return this; }
53 53
54 int AssociateSendChannel(int channel, int accociate_send_channel) override; 54 int AssociateSendChannel(int channel, int accociate_send_channel) override;
55 55
56 RtcEventLog* GetEventLog() override;
57
56 // AudioTransport 58 // AudioTransport
57 int32_t RecordedDataIsAvailable(const void* audioSamples, uint32_t nSamples, 59 int32_t RecordedDataIsAvailable(const void* audioSamples, uint32_t nSamples,
58 uint8_t nBytesPerSample, uint8_t nChannels, 60 uint8_t nBytesPerSample, uint8_t nChannels,
59 uint32_t samplesPerSec, uint32_t totalDelayMS, 61 uint32_t samplesPerSec, uint32_t totalDelayMS,
60 int32_t clockDrift, uint32_t micLevel, 62 int32_t clockDrift, uint32_t micLevel,
61 bool keyPressed, 63 bool keyPressed,
62 uint32_t& newMicLevel) override; 64 uint32_t& newMicLevel) override;
63 int32_t NeedMorePlayData(uint32_t nSamples, uint8_t nBytesPerSample, 65 int32_t NeedMorePlayData(uint32_t nSamples, uint8_t nBytesPerSample,
64 uint8_t nChannels, uint32_t samplesPerSec, 66 uint8_t nChannels, uint32_t samplesPerSec,
65 void* audioSamples, uint32_t& nSamplesOut, 67 void* audioSamples, uint32_t& nSamplesOut,
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 VoiceEngineObserver* voiceEngineObserverPtr_; 126 VoiceEngineObserver* voiceEngineObserverPtr_;
125 CriticalSectionWrapper& callbackCritSect_; 127 CriticalSectionWrapper& callbackCritSect_;
126 128
127 AudioFrame audioFrame_; 129 AudioFrame audioFrame_;
128 voe::SharedData* shared_; 130 voe::SharedData* shared_;
129 }; 131 };
130 132
131 } // namespace webrtc 133 } // namespace webrtc
132 134
133 #endif // WEBRTC_VOICE_ENGINE_VOE_BASE_IMPL_H 135 #endif // WEBRTC_VOICE_ENGINE_VOE_BASE_IMPL_H
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698