| 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_AUDIO_DEVICE_FUNC_TEST_MANAGER_H |   11 #ifndef WEBRTC_AUDIO_DEVICE_FUNC_TEST_MANAGER_H | 
|   12 #define WEBRTC_AUDIO_DEVICE_FUNC_TEST_MANAGER_H |   12 #define WEBRTC_AUDIO_DEVICE_FUNC_TEST_MANAGER_H | 
|   13  |   13  | 
|   14 #include <list> |   14 #include <list> | 
 |   15 #include <memory> | 
|   15 #include <string> |   16 #include <string> | 
|   16  |   17  | 
|   17 #include "webrtc/common_audio/resampler/include/resampler.h" |   18 #include "webrtc/common_audio/resampler/include/resampler.h" | 
|   18 #include "webrtc/modules/audio_device/include/audio_device.h" |   19 #include "webrtc/modules/audio_device/include/audio_device.h" | 
|   19 #include "webrtc/modules/audio_device/test/audio_device_test_defines.h" |   20 #include "webrtc/modules/audio_device/test/audio_device_test_defines.h" | 
|   20 #include "webrtc/system_wrappers/include/file_wrapper.h" |   21 #include "webrtc/system_wrappers/include/file_wrapper.h" | 
|   21 #include "webrtc/typedefs.h" |   22 #include "webrtc/typedefs.h" | 
|   22  |   23  | 
|   23  |   24  | 
|   24 #define ADM_AUDIO_LAYER AudioDeviceModule::kPlatformDefaultAudio |   25 #define ADM_AUDIO_LAYER AudioDeviceModule::kPlatformDefaultAudio | 
| (...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  199     int32_t SelectPlayoutDevice(); |  200     int32_t SelectPlayoutDevice(); | 
|  200     int32_t SelectRecordingDevice(); |  201     int32_t SelectRecordingDevice(); | 
|  201     int32_t TestAdvancedMBAPI(); |  202     int32_t TestAdvancedMBAPI(); | 
|  202 private: |  203 private: | 
|  203     // Paths to where the resource files to be used for this test are located. |  204     // Paths to where the resource files to be used for this test are located. | 
|  204     std::string _playoutFile48; |  205     std::string _playoutFile48; | 
|  205     std::string _playoutFile44; |  206     std::string _playoutFile44; | 
|  206     std::string _playoutFile16; |  207     std::string _playoutFile16; | 
|  207     std::string _playoutFile8; |  208     std::string _playoutFile8; | 
|  208  |  209  | 
|  209     rtc::scoped_ptr<ProcessThread> _processThread; |  210     std::unique_ptr<ProcessThread> _processThread; | 
|  210     AudioDeviceModule* _audioDevice; |  211     AudioDeviceModule* _audioDevice; | 
|  211     AudioEventObserver* _audioEventObserver; |  212     AudioEventObserver* _audioEventObserver; | 
|  212     AudioTransportImpl* _audioTransport; |  213     AudioTransportImpl* _audioTransport; | 
|  213 }; |  214 }; | 
|  214  |  215  | 
|  215 }  // namespace webrtc |  216 }  // namespace webrtc | 
|  216  |  217  | 
|  217 #endif  // #ifndef WEBRTC_AUDIO_DEVICE_FUNC_TEST_MANAGER_H |  218 #endif  // #ifndef WEBRTC_AUDIO_DEVICE_FUNC_TEST_MANAGER_H | 
| OLD | NEW |