| OLD | NEW | 
|---|
| 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 | 
| 11 #ifndef WEBRTC_VOICE_ENGINE_VOE_BASE_IMPL_H | 11 #ifndef WEBRTC_VOICE_ENGINE_VOE_BASE_IMPL_H | 
| 12 #define WEBRTC_VOICE_ENGINE_VOE_BASE_IMPL_H | 12 #define WEBRTC_VOICE_ENGINE_VOE_BASE_IMPL_H | 
| 13 | 13 | 
| 14 #include "webrtc/voice_engine/include/voe_base.h" | 14 #include "webrtc/voice_engine/include/voe_base.h" | 
| 15 | 15 | 
|  | 16 #include "webrtc/base/criticalsection.h" | 
| 16 #include "webrtc/modules/include/module_common_types.h" | 17 #include "webrtc/modules/include/module_common_types.h" | 
| 17 #include "webrtc/rtc_base/criticalsection.h" |  | 
| 18 #include "webrtc/voice_engine/shared_data.h" | 18 #include "webrtc/voice_engine/shared_data.h" | 
| 19 | 19 | 
| 20 namespace webrtc { | 20 namespace webrtc { | 
| 21 | 21 | 
| 22 class ProcessThread; | 22 class ProcessThread; | 
| 23 | 23 | 
| 24 class VoEBaseImpl : public VoEBase, | 24 class VoEBaseImpl : public VoEBase, | 
| 25                     public AudioTransport, | 25                     public AudioTransport, | 
| 26                     public AudioDeviceObserver { | 26                     public AudioDeviceObserver { | 
| 27  public: | 27  public: | 
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 128   // resolved. | 128   // resolved. | 
| 129   rtc::scoped_refptr<AudioProcessing> audio_processing_; | 129   rtc::scoped_refptr<AudioProcessing> audio_processing_; | 
| 130 | 130 | 
| 131   AudioFrame audioFrame_; | 131   AudioFrame audioFrame_; | 
| 132   voe::SharedData* shared_; | 132   voe::SharedData* shared_; | 
| 133 }; | 133 }; | 
| 134 | 134 | 
| 135 }  // namespace webrtc | 135 }  // namespace webrtc | 
| 136 | 136 | 
| 137 #endif  // WEBRTC_VOICE_ENGINE_VOE_BASE_IMPL_H | 137 #endif  // WEBRTC_VOICE_ENGINE_VOE_BASE_IMPL_H | 
| OLD | NEW | 
|---|