Bug 895531 - Add support for webrtc pulseaudio backend on gonk, r=rjesup
authorMichael Wu <mwu@mozilla.com>
Wed, 28 Aug 2013 15:43:47 -0400
changeset 157672 e3f5c8983672d6262e9eb9d150898d26714d9546
parent 157671 540c53908079b8c9484ff09b20c0b6082fd8329f
child 157673 3cd8ef8e0ec3c505472ee30af0b24fb60d87de0f
push id2961
push userlsblakk@mozilla.com
push dateMon, 28 Oct 2013 21:59:28 +0000
treeherdermozilla-beta@73ef4f13486f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrjesup
bugs895531
milestone26.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 895531 - Add support for webrtc pulseaudio backend on gonk, r=rjesup
media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc
media/webrtc/trunk/webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.cc
--- a/media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc
+++ b/media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc
@@ -37,26 +37,26 @@
     #include <stdlib.h>
     #include "audio_device_utility_android.h"
     #include "audio_device_jni_android.h"
 #elif defined(WEBRTC_LINUX)
     #include "audio_device_utility_linux.h"
  #if defined(LINUX_ALSA)
     #include "audio_device_alsa_linux.h"
  #endif
- #if defined(LINUX_PULSE)
-    #include "audio_device_pulse_linux.h"
- #endif
 #elif defined(WEBRTC_IOS)
     #include "audio_device_utility_ios.h"
     #include "audio_device_ios.h"
 #elif defined(WEBRTC_MAC)
     #include "audio_device_utility_mac.h"
     #include "audio_device_mac.h"
 #endif
+#if defined(LINUX_PULSE)
+    #include "audio_device_pulse_linux.h"
+#endif
 #include "audio_device_dummy.h"
 #include "audio_device_utility_dummy.h"
 #include "critical_section_wrapper.h"
 #include "trace.h"
 
 #define CHECK_INITIALIZED()         \
 {                                   \
     if (!_initialized) {            \
--- a/media/webrtc/trunk/webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.cc
+++ b/media/webrtc/trunk/webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.cc
@@ -24,17 +24,17 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "pulseaudiosymboltable_linux.h"
 
 namespace webrtc_adm_linux_pulse {
 
-#ifdef __OpenBSD__
+#if defined(__OpenBSD__) || defined(WEBRTC_GONK)
 LATE_BINDING_SYMBOL_TABLE_DEFINE_BEGIN(PulseAudioSymbolTable, "libpulse.so")
 #else
 LATE_BINDING_SYMBOL_TABLE_DEFINE_BEGIN(PulseAudioSymbolTable, "libpulse.so.0")
 #endif
 #define X(sym) \
     LATE_BINDING_SYMBOL_TABLE_DEFINE_ENTRY(PulseAudioSymbolTable, sym)
 PULSE_AUDIO_SYMBOLS_LIST
 #undef X