generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Include files from webrtc/.. paths in audio_device/.

Browse Source 
BUG=1662
R=xians@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/1785005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4330 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org 2013-07-11 13:24:38 +00:00
parent db6e3f8bc5
commit 811269df40
60 changed files with 204 additions and 213 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
webrtc/modules/audio_device/android/audio_device_jni_android.cc
View File

@ -18,13 +18,13 @@
#include <android/log.h>
#include <stdlib.h>
#include "audio_device_utility.h"
#include "audio_device_jni_android.h"
#include "audio_device_config.h"
#include "webrtc/modules/audio_device/android/audio_device_jni_android.h"
#include "webrtc/modules/audio_device/audio_device_config.h"
#include "webrtc/modules/audio_device/audio_device_utility.h"
#include "trace.h"
#include "thread_wrapper.h"
#include "event_wrapper.h"
#include "webrtc/system_wrappers/interface/event_wrapper.h"
#include "webrtc/system_wrappers/interface/thread_wrapper.h"
#include "webrtc/system_wrappers/interface/trace.h"
namespace webrtc
{

4
webrtc/modules/audio_device/android/audio_device_jni_android.h
View File

@ -15,8 +15,8 @@
#ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_JNI_ANDROID_H
#define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_JNI_ANDROID_H
#include "audio_device_generic.h"
#include "critical_section_wrapper.h"
#include "webrtc/modules/audio_device/audio_device_generic.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include <jni.h> // For accessing AudioDeviceAndroid java class

10
webrtc/modules/audio_device/android/audio_device_opensles_android.cc
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "modules/audio_device/android/audio_device_opensles_android.h"
#include "webrtc/modules/audio_device/android/audio_device_opensles_android.h"
#ifdef WEBRTC_ANDROID_DEBUG
#include <android/log.h>
@ -18,10 +18,10 @@
#include <sys/time.h>
#include <time.h>
#include "modules/audio_device/audio_device_utility.h"
#include "system_wrappers/interface/event_wrapper.h"
#include "system_wrappers/interface/thread_wrapper.h"
#include "system_wrappers/interface/trace.h"
#include "webrtc/modules/audio_device/audio_device_utility.h"
#include "webrtc/system_wrappers/interface/event_wrapper.h"
#include "webrtc/system_wrappers/interface/thread_wrapper.h"
#include "webrtc/system_wrappers/interface/trace.h"
#ifdef WEBRTC_ANDROID_DEBUG
#define WEBRTC_OPENSL_TRACE(a, b, c, ...) \

4
webrtc/modules/audio_device/android/audio_device_opensles_android.h
View File

@ -21,8 +21,8 @@
#include <queue>
#include "modules/audio_device/audio_device_generic.h"
#include "system_wrappers/interface/critical_section_wrapper.h"
#include "webrtc/modules/audio_device/audio_device_generic.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
namespace webrtc {

6
webrtc/modules/audio_device/android/audio_device_utility_android.cc
View File

@ -12,10 +12,10 @@
* Android audio device utility implementation
*/
#include "audio_device_utility_android.h"
#include "webrtc/modules/audio_device/android/audio_device_utility_android.h"
#include "critical_section_wrapper.h"
#include "trace.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "webrtc/system_wrappers/interface/trace.h"
namespace webrtc
{

4
webrtc/modules/audio_device/android/audio_device_utility_android.h
View File

@ -15,8 +15,8 @@
#ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_ANDROID_H
#define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_ANDROID_H
#include "audio_device_utility.h"
#include "audio_device.h"
#include "webrtc/modules/audio_device/audio_device_utility.h"
#include "webrtc/modules/audio_device/include/audio_device.h"
namespace webrtc
{

14
webrtc/modules/audio_device/audio_device_buffer.cc
View File

@ -8,17 +8,17 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "trace.h"
#include "critical_section_wrapper.h"
#include "audio_device_buffer.h"
#include "audio_device_utility.h"
#include "audio_device_config.h"
#include "webrtc/modules/audio_device/audio_device_buffer.h"
#include "webrtc/modules/audio_device/audio_device_config.h"
#include "webrtc/modules/audio_device/audio_device_utility.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "webrtc/system_wrappers/interface/trace.h"
#include <cassert>
#include <stdlib.h>
#include <string.h>
#include <cassert>
#include "signal_processing_library.h"
#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
namespace webrtc {

10
webrtc/modules/audio_device/audio_device_buffer.h
View File

@ -11,11 +11,11 @@
#ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_BUFFER_H
#define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_BUFFER_H
#include "typedefs.h"
#include "common_audio/resampler/include/resampler.h"
#include "file_wrapper.h"
#include "audio_device.h"
#include "list_wrapper.h"
#include "webrtc/common_audio/resampler/include/resampler.h"
#include "webrtc/modules/audio_device/include/audio_device.h"
#include "webrtc/system_wrappers/interface/file_wrapper.h"
#include "webrtc/system_wrappers/interface/list_wrapper.h"
#include "webrtc/typedefs.h"
namespace webrtc {
class CriticalSectionWrapper;

5
webrtc/modules/audio_device/audio_device_generic.cc
View File

@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "audio_device_generic.h"
#include "trace.h"
#include "webrtc/modules/audio_device/audio_device_generic.h"
#include "webrtc/system_wrappers/interface/trace.h"
namespace webrtc {
@ -73,4 +73,3 @@ bool AudioDeviceGeneric::BuiltInAECIsEnabled() const
}
} // namespace webrtc

5
webrtc/modules/audio_device/audio_device_generic.h
View File

@ -11,8 +11,8 @@
#ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_GENERIC_H
#define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_GENERIC_H
#include "audio_device.h"
#include "audio_device_buffer.h"
#include "webrtc/modules/audio_device/audio_device_buffer.h"
#include "webrtc/modules/audio_device/include/audio_device.h"
namespace webrtc {
@ -180,4 +180,3 @@ public:
} // namespace webrtc
#endif // WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_GENERIC_H

16
webrtc/modules/audio_device/audio_device_impl.cc
View File

@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "audio_device_impl.h"
#include "audio_device_config.h"
#include "common_audio/signal_processing/include/signal_processing_library.h"
#include "system_wrappers/interface/ref_count.h"
#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
#include "webrtc/modules/audio_device/audio_device_config.h"
#include "webrtc/modules/audio_device/audio_device_impl.h"
#include "webrtc/system_wrappers/interface/ref_count.h"
#include <assert.h>
#include <string.h>
@ -45,10 +45,10 @@
#include "audio_device_utility_mac.h"
#include "audio_device_mac.h"
#endif
#include "audio_device_dummy.h"
#include "audio_device_utility_dummy.h"
#include "critical_section_wrapper.h"
#include "trace.h"
#include "webrtc/modules/audio_device/dummy/audio_device_dummy.h"
#include "webrtc/modules/audio_device/dummy/audio_device_utility_dummy.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "webrtc/system_wrappers/interface/trace.h"
#define CHECK_INITIALIZED() \
{ \

4
webrtc/modules/audio_device/audio_device_impl.h
View File

@ -11,8 +11,8 @@
#ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_IMPL_H
#define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_IMPL_H
#include "audio_device.h"
#include "audio_device_buffer.h"
#include "webrtc/modules/audio_device/audio_device_buffer.h"
#include "webrtc/modules/audio_device/include/audio_device.h"
namespace webrtc
{

10
webrtc/modules/audio_device/audio_device_utility.cc
View File

@ -10,7 +10,7 @@
#include <cassert>
#include "audio_device_utility.h"
#include "webrtc/modules/audio_device/audio_device_utility.h"
#if defined(_WIN32)
@ -52,11 +52,11 @@ bool AudioDeviceUtility::StringCompare(
// Linux & Mac
// ============================================================================
#include <sys/time.h> // gettimeofday
#include <time.h> // gettimeofday
#include <string.h> // strncasecmp
#include <stdio.h> // getchar
#include <string.h> // strncasecmp
#include <sys/time.h> // gettimeofday
#include <termios.h> // tcgetattr
#include <time.h> // gettimeofday
#include <unistd.h>
@ -110,5 +110,3 @@ bool AudioDeviceUtility::StringCompare(
} // namespace webrtc
#endif // defined(WEBRTC_LINUX) || defined(WEBRTC_MAC)

3
webrtc/modules/audio_device/audio_device_utility.h
View File

@ -11,7 +11,7 @@
#ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_H
#define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_H
#include "typedefs.h"
#include "webrtc/typedefs.h"
namespace webrtc
{
@ -32,4 +32,3 @@ public:
} // namespace webrtc
#endif // WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_H

2
webrtc/modules/audio_device/dummy/audio_device_dummy.h
View File

@ -13,7 +13,7 @@
#include <stdio.h>
#include "audio_device_generic.h"
#include "webrtc/modules/audio_device/audio_device_generic.h"
namespace webrtc {

4
webrtc/modules/audio_device/dummy/audio_device_utility_dummy.h
View File

@ -11,8 +11,8 @@
#ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_DUMMY_H
#define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_DUMMY_H
#include "audio_device_utility.h"
#include "audio_device.h"
#include "webrtc/modules/audio_device/audio_device_utility.h"
#include "webrtc/modules/audio_device/include/audio_device.h"
namespace webrtc
{

4
webrtc/modules/audio_device/include/audio_device.h
View File

@ -11,8 +11,8 @@
#ifndef MODULES_AUDIO_DEVICE_INCLUDE_AUDIO_DEVICE_H_
#define MODULES_AUDIO_DEVICE_INCLUDE_AUDIO_DEVICE_H_
#include "modules/audio_device/include/audio_device_defines.h"
#include "modules/interface/module.h"
#include "webrtc/modules/audio_device/include/audio_device_defines.h"
#include "webrtc/modules/interface/module.h"
namespace webrtc {

2
webrtc/modules/audio_device/include/audio_device_defines.h
View File

@ -11,7 +11,7 @@
#ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_DEFINES_H
#define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_DEFINES_H
#include "typedefs.h"
#include "webrtc/typedefs.h"
namespace webrtc {

7
webrtc/modules/audio_device/ios/audio_device_ios.cc
View File

@ -10,10 +10,10 @@
#include <AudioToolbox/AudioServices.h> // AudioSession
#include "audio_device_ios.h"
#include "webrtc/modules/audio_device/ios/audio_device_ios.h"
#include "trace.h"
#include "thread_wrapper.h"
#include "webrtc/system_wrappers/interface/thread_wrapper.h"
#include "webrtc/system_wrappers/interface/trace.h"
namespace webrtc {
AudioDeviceIPhone::AudioDeviceIPhone(const int32_t id)
@ -1895,4 +1895,3 @@ bool AudioDeviceIPhone::CaptureWorkerThread() {
}
} // namespace webrtc

4
webrtc/modules/audio_device/ios/audio_device_ios.h
View File

@ -13,8 +13,8 @@
#include <AudioUnit/AudioUnit.h>
#include "audio_device_generic.h"
#include "critical_section_wrapper.h"
#include "webrtc/modules/audio_device/audio_device_generic.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
namespace webrtc {
class ThreadWrapper;

8
webrtc/modules/audio_device/ios/audio_device_utility_ios.cc
View File

@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "audio_device_utility_ios.h"
#include "audio_device_config.h"
#include "webrtc/modules/audio_device/audio_device_config.h"
#include "webrtc/modules/audio_device/ios/audio_device_utility_ios.h"
#include "critical_section_wrapper.h"
#include "trace.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "webrtc/system_wrappers/interface/trace.h"
namespace webrtc {
AudioDeviceUtilityIPhone::AudioDeviceUtilityIPhone(const int32_t id)

4
webrtc/modules/audio_device/ios/audio_device_utility_ios.h
View File

@ -11,8 +11,8 @@
#ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_IPHONE_H
#define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_IPHONE_H
#include "audio_device_utility.h"
#include "audio_device.h"
#include "webrtc/modules/audio_device/audio_device_utility.h"
#include "webrtc/modules/audio_device/include/audio_device.h"
namespace webrtc {
class CriticalSectionWrapper;

2
webrtc/modules/audio_device/linux/alsasymboltable_linux.cc
View File

@ -25,7 +25,7 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "alsasymboltable_linux.h"
#include "webrtc/modules/audio_device/linux/alsasymboltable_linux.h"
namespace webrtc_adm_linux_alsa {

2
webrtc/modules/audio_device/linux/alsasymboltable_linux.h
View File

@ -28,7 +28,7 @@
#ifndef WEBRTC_AUDIO_DEVICE_ALSASYMBOLTABLE_LINUX_H
#define WEBRTC_AUDIO_DEVICE_ALSASYMBOLTABLE_LINUX_H
#include "latebindingsymboltable_linux.h"
#include "webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h"
namespace webrtc_adm_linux_alsa {

14
webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc
View File

@ -10,14 +10,14 @@
#include <cassert>
#include "audio_device_utility.h"
#include "audio_device_alsa_linux.h"
#include "audio_device_config.h"
#include "webrtc/modules/audio_device/audio_device_config.h"
#include "webrtc/modules/audio_device/audio_device_utility.h"
#include "webrtc/modules/audio_device/linux/audio_device_alsa_linux.h"
#include "event_wrapper.h"
#include "system_wrappers/interface/sleep.h"
#include "trace.h"
#include "thread_wrapper.h"
#include "webrtc/system_wrappers/interface/event_wrapper.h"
#include "webrtc/system_wrappers/interface/sleep.h"
#include "webrtc/system_wrappers/interface/thread_wrapper.h"
#include "webrtc/system_wrappers/interface/trace.h"
webrtc_adm_linux_alsa::AlsaSymbolTable AlsaSymbolTable;

12
webrtc/modules/audio_device/linux/audio_device_alsa_linux.h
View File

@ -11,15 +11,15 @@
#ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_ALSA_LINUX_H
#define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_ALSA_LINUX_H
#include "audio_device_generic.h"
#include "audio_mixer_manager_alsa_linux.h"
#include "critical_section_wrapper.h"
#include "webrtc/modules/audio_device/audio_device_generic.h"
#include "webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include <alsa/asoundlib.h>
#include <sys/soundcard.h>
#include <sys/ioctl.h>
#include <X11/Xlib.h>
#include <alsa/asoundlib.h>
#include <sys/ioctl.h>
#include <sys/soundcard.h>
namespace webrtc

12
webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc
View File

@ -10,13 +10,13 @@
#include <cassert>
#include "audio_device_utility.h"
#include "audio_device_pulse_linux.h"
#include "audio_device_config.h"
#include "webrtc/modules/audio_device/audio_device_config.h"
#include "webrtc/modules/audio_device/audio_device_utility.h"
#include "webrtc/modules/audio_device/linux/audio_device_pulse_linux.h"
#include "event_wrapper.h"
#include "trace.h"
#include "thread_wrapper.h"
#include "webrtc/system_wrappers/interface/event_wrapper.h"
#include "webrtc/system_wrappers/interface/thread_wrapper.h"
#include "webrtc/system_wrappers/interface/trace.h"
webrtc_adm_linux_pulse::PulseAudioSymbolTable PaSymbolTable;

8
webrtc/modules/audio_device/linux/audio_device_pulse_linux.h
View File

@ -11,12 +11,12 @@
#ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_PULSE_LINUX_H
#define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_PULSE_LINUX_H
#include "audio_device_generic.h"
#include "audio_mixer_manager_pulse_linux.h"
#include "critical_section_wrapper.h"
#include "webrtc/modules/audio_device/audio_device_generic.h"
#include "webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include <pulse/pulseaudio.h>
#include <X11/Xlib.h>
#include <pulse/pulseaudio.h>
// We define this flag if it's missing from our headers, because we want to be
// able to compile against old headers but still use PA_STREAM_ADJUST_LATENCY

8
webrtc/modules/audio_device/linux/audio_device_utility_linux.cc
View File

@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "audio_device_utility_linux.h"
#include "audio_device_config.h" // DEBUG_PRINT()
#include "critical_section_wrapper.h"
#include "trace.h"
#include "webrtc/modules/audio_device/audio_device_config.h" // DEBUG_PRINT()
#include "webrtc/modules/audio_device/linux/audio_device_utility_linux.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "webrtc/system_wrappers/interface/trace.h"
namespace webrtc
{

4
webrtc/modules/audio_device/linux/audio_device_utility_linux.h
View File

@ -11,8 +11,8 @@
#ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_LINUX_H
#define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_LINUX_H
#include "audio_device_utility.h"
#include "audio_device.h"
#include "webrtc/modules/audio_device/audio_device_utility.h"
#include "webrtc/modules/audio_device/include/audio_device.h"
namespace webrtc
{

4
webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc
View File

@ -10,8 +10,8 @@
#include <cassert>
#include "audio_mixer_manager_alsa_linux.h"
#include "trace.h"
#include "webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h"
#include "webrtc/system_wrappers/interface/trace.h"
extern webrtc_adm_linux_alsa::AlsaSymbolTable AlsaSymbolTable;

8
webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h
View File

@ -11,10 +11,10 @@
#ifndef WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_ALSA_LINUX_H
#define WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_ALSA_LINUX_H
#include "typedefs.h"
#include "audio_device.h"
#include "critical_section_wrapper.h"
#include "alsasymboltable_linux.h"
#include "webrtc/modules/audio_device/include/audio_device.h"
#include "webrtc/modules/audio_device/linux/alsasymboltable_linux.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "webrtc/typedefs.h"
#include <alsa/asoundlib.h>

5
webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc
View File

@ -10,8 +10,8 @@
#include <cassert>
#include "audio_mixer_manager_pulse_linux.h"
#include "trace.h"
#include "webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h"
#include "webrtc/system_wrappers/interface/trace.h"
extern webrtc_adm_linux_pulse::PulseAudioSymbolTable PaSymbolTable;
@ -1265,4 +1265,3 @@ bool AudioMixerManagerLinuxPulse::GetSourceInfoByIndex(
}
}

10
webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h
View File

@ -11,13 +11,13 @@
#ifndef WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_PULSE_LINUX_H
#define WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_PULSE_LINUX_H
#include "typedefs.h"
#include "audio_device.h"
#include "critical_section_wrapper.h"
#include "pulseaudiosymboltable_linux.h"
#include "webrtc/modules/audio_device/include/audio_device.h"
#include "webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "webrtc/typedefs.h"
#include <stdint.h>
#include <pulse/pulseaudio.h>
#include <stdint.h>
#ifndef UINT32_MAX
#define UINT32_MAX ((uint32_t)-1)

2
webrtc/modules/audio_device/linux/latebindingsymboltable_linux.cc
View File

@ -25,7 +25,7 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "latebindingsymboltable_linux.h"
#include "webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h"
#ifdef WEBRTC_LINUX
#include <dlfcn.h>

4
webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h
View File

@ -32,8 +32,8 @@
#include <stddef.h> // for NULL
#include <string.h>
#include "constructor_magic.h"
#include "trace.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/system_wrappers/interface/trace.h"
// This file provides macros for creating "symbol table" classes to simplify the
// dynamic loading of symbols from DLLs. Currently the implementation only

2
webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.cc
View File

@ -25,7 +25,7 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "pulseaudiosymboltable_linux.h"
#include "webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.h"
namespace webrtc_adm_linux_pulse {

2
webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.h
View File

@ -28,7 +28,7 @@
#ifndef WEBRTC_AUDIO_DEVICE_PULSEAUDIOSYMBOLTABLE_LINUX_H
#define WEBRTC_AUDIO_DEVICE_PULSEAUDIOSYMBOLTABLE_LINUX_H
#include "latebindingsymboltable_linux.h"
#include "webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h"
namespace webrtc_adm_linux_pulse {

14
webrtc/modules/audio_device/mac/audio_device_mac.cc
View File

@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "audio_device_utility.h"
#include "audio_device_mac.h"
#include "audio_device_config.h"
#include "webrtc/modules/audio_device/audio_device_config.h"
#include "webrtc/modules/audio_device/audio_device_utility.h"
#include "webrtc/modules/audio_device/mac/audio_device_mac.h"
#include "event_wrapper.h"
#include "portaudio/pa_ringbuffer.h"
#include "trace.h"
#include "thread_wrapper.h"
#include "webrtc/modules/audio_device/mac/portaudio/pa_ringbuffer.h"
#include "webrtc/system_wrappers/interface/event_wrapper.h"
#include "webrtc/system_wrappers/interface/thread_wrapper.h"
#include "webrtc/system_wrappers/interface/trace.h"
#include <ApplicationServices/ApplicationServices.h>
#include <cassert>

8
webrtc/modules/audio_device/mac/audio_device_mac.h
View File

@ -11,12 +11,12 @@
#ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_MAC_H
#define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_MAC_H
#include "audio_device_generic.h"
#include "critical_section_wrapper.h"
#include "audio_mixer_manager_mac.h"
#include "webrtc/modules/audio_device/audio_device_generic.h"
#include "webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include <CoreAudio/CoreAudio.h>
#include <AudioToolbox/AudioConverter.h>
#include <CoreAudio/CoreAudio.h>
#include <mach/semaphore.h>
struct PaUtilRingBuffer;

8
webrtc/modules/audio_device/mac/audio_device_utility_mac.cc
View File

@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "audio_device_utility_mac.h"
#include "audio_device_config.h" // DEBUG_PRINT()
#include "critical_section_wrapper.h"
#include "trace.h"
#include "webrtc/modules/audio_device/audio_device_config.h" // DEBUG_PRINT()
#include "webrtc/modules/audio_device/mac/audio_device_utility_mac.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "webrtc/system_wrappers/interface/trace.h"
namespace webrtc
{

4
webrtc/modules/audio_device/mac/audio_device_utility_mac.h
View File

@ -11,8 +11,8 @@
#ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_MAC_H
#define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_MAC_H
#include "audio_device_utility.h"
#include "audio_device.h"
#include "webrtc/modules/audio_device/audio_device_utility.h"
#include "webrtc/modules/audio_device/include/audio_device.h"
namespace webrtc
{

4
webrtc/modules/audio_device/mac/audio_mixer_manager_mac.cc
View File

@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "audio_mixer_manager_mac.h"
#include "trace.h"
#include "webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h"
#include "webrtc/system_wrappers/interface/trace.h"
#include <unistd.h> // getpid()

6
webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h
View File

@ -11,9 +11,9 @@
#ifndef WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_MAC_H
#define WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_MAC_H
#include "typedefs.h"
#include "audio_device.h"
#include "critical_section_wrapper.h"
#include "webrtc/modules/audio_device/include/audio_device.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "webrtc/typedefs.h"
#include <CoreAudio/CoreAudio.h>

6
webrtc/modules/audio_device/mac/portaudio/pa_ringbuffer.c
View File

@ -52,12 +52,12 @@
@ingroup common_src
*/
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
#include "pa_ringbuffer.h"
#include <string.h>
#include "pa_memorybarrier.h"
#include "webrtc/modules/audio_device/mac/portaudio/pa_memorybarrier.h"
#include "webrtc/modules/audio_device/mac/portaudio/pa_ringbuffer.h"
/***************************************************************************
* Initialize FIFO.

2
webrtc/modules/audio_device/main/interface/audio_device.h
View File

@ -11,6 +11,6 @@
#ifndef MODULES_AUDIO_DEVICE_MAIN_INTERFACE_AUDIO_DEVICE_H_
#define MODULES_AUDIO_DEVICE_MAIN_INTERFACE_AUDIO_DEVICE_H_
#include "../../include/audio_device.h"
#include "webrtc/modules/audio_device/include/audio_device.h"
#endif // MODULES_AUDIO_DEVICE_MAIN_INTERFACE_AUDIO_DEVICE_H_

6
webrtc/modules/audio_device/test/android/audio_device_android_test/jni/audio_device_android_test.cc
View File

@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include <string.h> // memset
#include <android/log.h>
#include <string.h> // memset
#include "org_webrtc_voiceengine_test_AudioDeviceAndroidTest.h"
#include "webrtc/modules/audio_device/test/android/audio_device_android_test/jni/org_webrtc_voiceengine_test_AudioDeviceAndroidTest.h"
#include "../../../../interface/audio_device.h"
#include "webrtc/modules/audio_device/main/interface/audio_device.h"
#define LOG_TAG "WebRTC ADM Native"

14
webrtc/modules/audio_device/test/audio_device_test_api.cc
View File

@ -12,15 +12,15 @@
#include <stdio.h>
#include <string.h>
#include "audio_device_test_defines.h"
#include "webrtc/modules/audio_device/test/audio_device_test_defines.h"
#include "gtest/gtest.h"
#include "testsupport/fileutils.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
#include "modules/audio_device/audio_device_config.h"
#include "modules/audio_device/audio_device_impl.h"
#include "modules/audio_device/audio_device_utility.h"
#include "system_wrappers/interface/sleep.h"
#include "webrtc/modules/audio_device/audio_device_config.h"
#include "webrtc/modules/audio_device/audio_device_impl.h"
#include "webrtc/modules/audio_device/audio_device_utility.h"
#include "webrtc/system_wrappers/interface/sleep.h"
// Helper functions
#if defined(ANDROID)

9
webrtc/modules/audio_device/test/audio_device_test_defines.h
View File

@ -11,10 +11,10 @@
#ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_TEST_DEFINES_H
#define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_TEST_DEFINES_H
#include "audio_device.h"
#include "common_types.h"
#include "process_thread.h"
#include "trace.h"
#include "webrtc/common_types.h"
#include "webrtc/modules/audio_device/include/audio_device.h"
#include "webrtc/modules/utility/interface/process_thread.h"
#include "webrtc/system_wrappers/interface/trace.h"
#ifdef _WIN32
#define MACRO_DEFAULT_DEVICE AudioDeviceModule::kDefaultDevice
@ -74,4 +74,3 @@ const char* GetFilename(const char* filename);
const char* GetResource(const char* resource);
#endif // WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_TEST_DEFINES_H

4
webrtc/modules/audio_device/test/audio_device_test_func.cc
View File

@ -9,8 +9,8 @@
*/
#include <stdio.h>
#include "audio_device_test_defines.h"
#include "func_test_manager.h"
#include "webrtc/modules/audio_device/test/audio_device_test_defines.h"
#include "webrtc/modules/audio_device/test/func_test_manager.h"
#ifndef __GNUC__
// Disable warning message 4996 ('scanf': This function or variable may be unsafe)

16
webrtc/modules/audio_device/test/func_test_manager.cc
View File

@ -8,18 +8,18 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include <stdio.h>
#include <ctype.h>
#include <cassert>
#include <ctype.h>
#include <stdio.h>
#include <string.h>
#include "func_test_manager.h"
#include "gtest/gtest.h"
#include "system_wrappers/interface/sleep.h"
#include "testsupport/fileutils.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/modules/audio_device/test/func_test_manager.h"
#include "webrtc/system_wrappers/interface/sleep.h"
#include "webrtc/test/testsupport/fileutils.h"
#include "modules/audio_device/audio_device_config.h"
#include "modules/audio_device/audio_device_impl.h"
#include "webrtc/modules/audio_device/audio_device_config.h"
#include "webrtc/modules/audio_device/audio_device_impl.h"
#ifndef __GNUC__
// Disable warning message ('sprintf': name was marked as #pragma deprecated)

14
webrtc/modules/audio_device/test/func_test_manager.h
View File

@ -11,16 +11,16 @@
#ifndef WEBRTC_AUDIO_DEVICE_FUNC_TEST_MANAGER_H
#define WEBRTC_AUDIO_DEVICE_FUNC_TEST_MANAGER_H
#include "modules/audio_device/audio_device_utility.h"
#include "webrtc/modules/audio_device/audio_device_utility.h"
#include <string>
#include "typedefs.h"
#include "audio_device.h"
#include "audio_device_test_defines.h"
#include "file_wrapper.h"
#include "list_wrapper.h"
#include "resampler.h"
#include "webrtc/common_audio/resampler/include/resampler.h"
#include "webrtc/modules/audio_device/include/audio_device.h"
#include "webrtc/modules/audio_device/test/audio_device_test_defines.h"
#include "webrtc/system_wrappers/interface/file_wrapper.h"
#include "webrtc/system_wrappers/interface/list_wrapper.h"
#include "webrtc/typedefs.h"
#if defined(WEBRTC_IOS) || defined(ANDROID)
#define USE_SLEEP_AS_PAUSE

12
webrtc/modules/audio_device/win/audio_device_core_win.cc
View File

@ -18,7 +18,7 @@
#pragma message(">> INFO: Windows Core Audio is not supported in VS 2003")
#endif
#include "audio_device_config.h"
#include "webrtc/modules/audio_device/audio_device_config.h"
#if defined(WEBRTC_WINDOWS_CORE_AUDIO_BUILD)
#pragma message(">> INFO: WEBRTC_WINDOWS_CORE_AUDIO_BUILD is defined")
@ -28,7 +28,7 @@
#ifdef WEBRTC_WINDOWS_CORE_AUDIO_BUILD
#include "audio_device_core_win.h"
#include "webrtc/modules/audio_device/win/audio_device_core_win.h"
#include <assert.h>
#include <string.h>
@ -36,14 +36,14 @@
#include <windows.h>
#include <comdef.h>
#include <dmo.h>
#include "Functiondiscoverykeys_devpkey.h"
#include <Functiondiscoverykeys_devpkey.h>
#include <mmsystem.h>
#include <strsafe.h>
#include <uuids.h>
#include "audio_device_utility.h"
#include "system_wrappers/interface/sleep.h"
#include "trace.h"
#include "webrtc/modules/audio_device/audio_device_utility.h"
#include "webrtc/system_wrappers/interface/sleep.h"
#include "webrtc/system_wrappers/interface/trace.h"
// Macro that calls a COM method returning HRESULT value.
#define EXIT_ON_ERROR(hres) do { if (FAILED(hres)) goto Exit; } while(0)

8
webrtc/modules/audio_device/win/audio_device_core_win.h
View File

@ -13,19 +13,19 @@
#if (_MSC_VER >= 1400) // only include for VS 2005 and higher
#include "audio_device_generic.h"
#include "webrtc/modules/audio_device/audio_device_generic.h"
#include <wmcodecdsp.h> // CLSID_CWMAudioAEC
// (must be before audioclient.h)
#include <Audioclient.h> // WASAPI
#include <Audiopolicy.h>
#include <Mmdeviceapi.h> // MMDevice
#include <avrt.h> // Avrt
#include <endpointvolume.h>
#include <mediaobj.h> // IMediaObject
#include <Mmdeviceapi.h> // MMDevice
#include "critical_section_wrapper.h"
#include "scoped_refptr.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "webrtc/system_wrappers/interface/scoped_refptr.h"
// Use Multimedia Class Scheduler Service (MMCSS) to boost the thread priority
#pragma comment( lib, "avrt.lib" )

8
webrtc/modules/audio_device/win/audio_device_utility_win.cc
View File

@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "audio_device_utility_win.h"
#include "audio_device_config.h"
#include "webrtc/modules/audio_device/audio_device_config.h"
#include "webrtc/modules/audio_device/win/audio_device_utility_win.h"
#include "critical_section_wrapper.h"
#include "trace.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "webrtc/system_wrappers/interface/trace.h"
#include <windows.h>
#include <tchar.h>

4
webrtc/modules/audio_device/win/audio_device_utility_win.h
View File

@ -11,8 +11,8 @@
#ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_WIN_H
#define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_WIN_H
#include "audio_device_utility.h"
#include "audio_device.h"
#include "webrtc/modules/audio_device/audio_device_utility.h"
#include "webrtc/modules/audio_device/include/audio_device.h"
#include <windows.h>
namespace webrtc

13
webrtc/modules/audio_device/win/audio_device_wave_win.cc
View File

@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "audio_device_utility.h"
#include "audio_device_wave_win.h"
#include "audio_device_config.h"
#include "webrtc/modules/audio_device/audio_device_config.h"
#include "webrtc/modules/audio_device/audio_device_utility.h"
#include "webrtc/modules/audio_device/win/audio_device_wave_win.h"
#include "trace.h"
#include "thread_wrapper.h"
#include "event_wrapper.h"
#include "webrtc/system_wrappers/interface/event_wrapper.h"
#include "webrtc/system_wrappers/interface/thread_wrapper.h"
#include "webrtc/system_wrappers/interface/trace.h"
#include <windows.h>
#include <objbase.h> // CoTaskMemAlloc, CoTaskMemFree
@ -3833,4 +3833,3 @@ bool AudioDeviceWindowsWave::KeyPressed() const{
return (key_down > 0);
}
} // namespace webrtc

4
webrtc/modules/audio_device/win/audio_device_wave_win.h
View File

@ -11,8 +11,8 @@
#ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_WAVE_WIN_H
#define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_WAVE_WIN_H
#include "audio_device_generic.h"
#include "audio_mixer_manager_win.h"
#include "webrtc/modules/audio_device/audio_device_generic.h"
#include "webrtc/modules/audio_device/win/audio_mixer_manager_win.h"
#pragma comment( lib, "winmm.lib" )

6
webrtc/modules/audio_device/win/audio_mixer_manager_win.cc
View File

@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "audio_mixer_manager_win.h"
#include "trace.h"
#include "webrtc/modules/audio_device/win/audio_mixer_manager_win.h"
#include "webrtc/system_wrappers/interface/trace.h"
#include <strsafe.h> // StringCchCopy(), StringCchCat(), StringCchPrintf()
#include <cassert> // assert()
#include <strsafe.h> // StringCchCopy(), StringCchCat(), StringCchPrintf()
#ifdef _WIN32
// removes warning: "reinterpret_cast: conversion from 'UINT' to 'HMIXEROBJ'

6
webrtc/modules/audio_device/win/audio_mixer_manager_win.h
View File

@ -11,9 +11,9 @@
#ifndef WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_WIN_H
#define WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_WIN_H
#include "typedefs.h"
#include "audio_device.h"
#include "critical_section_wrapper.h"
#include "webrtc/typedefs.h"
#include "webrtc/modules/audio_device/include/audio_device.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include <Windows.h>
#include <mmsystem.h>