mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 19:35:51 +00:00
Bug 694814: Patch 2: modifications to webrtc.org single_rw_fifo r=glandium,ted
This commit is contained in:
parent
5ee0739764
commit
052b1495d0
@ -14,8 +14,11 @@ webrtc_non_unified_sources = [
|
||||
'trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter.c', # Because of name clash in the kDampFilter variable
|
||||
'trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter_c.c', # Because of name clash in the kDampFilter variable
|
||||
'trunk/webrtc/modules/audio_coding/neteq4/audio_vector.cc', # Because of explicit template specializations
|
||||
'trunk/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc', # Because of LATE()
|
||||
'trunk/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc',# Because of LATE()
|
||||
'trunk/webrtc/modules/audio_device/opensl/opensles_input.cc', # Because of name clash in the kOption variable
|
||||
'trunk/webrtc/modules/audio_device/opensl/opensles_output.cc', # Because of name clash in the kOption variable
|
||||
'trunk/webrtc/modules/audio_device/opensl/single_rw_fifo.cc', # Because of name clash with #define FF
|
||||
'trunk/webrtc/modules/audio_device/win/audio_device_core_win.cc', # Because of ordering assumptions in strsafe.h
|
||||
'trunk/webrtc/modules/audio_processing/aec/aec_core.c', # Because of name clash in the ComfortNoise function
|
||||
'trunk/webrtc/modules/audio_processing/aecm/aecm_core.c', # Because of name clash in the ComfortNoise function
|
||||
|
@ -9,6 +9,9 @@
|
||||
*/
|
||||
|
||||
#include "webrtc/modules/audio_device/android/single_rw_fifo.h"
|
||||
#if defined(_MSC_VER)
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
static int UpdatePos(int pos, int capacity) {
|
||||
return (pos + 1) % capacity;
|
||||
@ -19,7 +22,11 @@ namespace webrtc {
|
||||
namespace subtle {
|
||||
|
||||
inline void MemoryBarrier() {
|
||||
#if defined(_MSC_VER)
|
||||
::MemoryBarrier();
|
||||
#else
|
||||
__sync_synchronize();
|
||||
#endif
|
||||
}
|
||||
|
||||
} // namespace subtle
|
||||
|
@ -123,16 +123,19 @@
|
||||
'win/audio_device_utility_win.h',
|
||||
'win/audio_mixer_manager_win.cc',
|
||||
'win/audio_mixer_manager_win.h',
|
||||
# used externally for getUserMedia
|
||||
'opensl/single_rw_fifo.cc',
|
||||
'opensl/single_rw_fifo.h',
|
||||
],
|
||||
'conditions': [
|
||||
['OS=="android"', {
|
||||
'sources': [
|
||||
'sources': [
|
||||
'opensl/audio_manager_jni.cc',
|
||||
'opensl/audio_manager_jni.h',
|
||||
'android/audio_device_jni_android.cc',
|
||||
'android/audio_device_jni_android.h',
|
||||
'android/audio_device_jni_android.cc',
|
||||
'android/audio_device_jni_android.h',
|
||||
],
|
||||
}],
|
||||
}],
|
||||
['OS=="android" or moz_widget_toolkit_gonk==1', {
|
||||
'link_settings': {
|
||||
'libraries': [
|
||||
@ -154,17 +157,15 @@
|
||||
'opensl/opensles_input.cc',
|
||||
'opensl/opensles_input.h',
|
||||
'opensl/opensles_output.h',
|
||||
'opensl/single_rw_fifo.cc',
|
||||
'opensl/single_rw_fifo.h',
|
||||
'shared/audio_device_utility_shared.cc',
|
||||
'shared/audio_device_utility_shared.h',
|
||||
'shared/audio_device_utility_shared.cc',
|
||||
'shared/audio_device_utility_shared.h',
|
||||
],
|
||||
}, {
|
||||
'sources': [
|
||||
'shared/audio_device_utility_shared.cc',
|
||||
'shared/audio_device_utility_shared.h',
|
||||
'android/audio_device_jni_android.cc',
|
||||
'android/audio_device_jni_android.h',
|
||||
'shared/audio_device_utility_shared.cc',
|
||||
'shared/audio_device_utility_shared.h',
|
||||
'android/audio_device_jni_android.cc',
|
||||
'android/audio_device_jni_android.h',
|
||||
],
|
||||
}],
|
||||
['enable_android_opensl_output==1', {
|
||||
|
Loading…
Reference in New Issue
Block a user