b=1033122 be consistent about speex_resampler symbol visibility r=khuey

When "speex/speex_resampler.h" was included, another exported header (in
dist/include) would find the speex/speex_resampler.h in dist/include before
dist/system_wrappers.  Visibility of undefined symbols depended on the order
of includes.

This patch changes includes to <speex/speex_resampler.h> so that
WRAP_SYSTEM_INCLUDES works as expected but removes the wrapper when not using
GKMEDIAS_SHARED_LIBRARY.

--HG--
extra : rebase_source : 93ca1dbdd6b489647624326e78539f44c60d0b34

config/system-headers

@@ -1263,7 +1263,6 @@ X11/Xlocale.h
 X11/Xos.h
 X11/Xutil.h
 zmouse.h
-speex/speex_resampler.h
 soundtouch/SoundTouch.h
 #if MOZ_NATIVE_PNG==1
 png.h
@@ -1325,6 +1324,7 @@ vpx_mem/vpx_mem.h
 vorbis/codec.h
 theora/theoradec.h
 tremor/ivorbiscodec.h
+speex/speex_resampler.h
 ogg/ogg.h
 ogg/os_types.h
 nestegg/nestegg.h

content/media/AudioNodeExternalInputStream.cpp

@@ -6,7 +6,6 @@
 #include "AudioNodeEngine.h"
 #include "AudioNodeExternalInputStream.h"
 #include "AudioChannelFormat.h"
-#include "speex/speex_resampler.h"
 #include "mozilla/dom/MediaStreamAudioSourceNode.h"
 
 using namespace mozilla::dom;

content/media/AudioSegment.cpp

@@ -9,7 +9,7 @@
 #include "AudioMixer.h"
 #include "AudioChannelFormat.h"
 #include "Latency.h"
-#include "speex/speex_resampler.h"
+#include <speex/speex_resampler.h>
 
 namespace mozilla {
 

content/media/MediaStreamGraph.cpp

@@ -28,7 +28,6 @@
 #include "DOMMediaStream.h"
 #include "GeckoProfiler.h"
 #include "mozilla/unused.h"
-#include "speex/speex_resampler.h"
 #ifdef MOZ_WEBRTC
 #include "AudioOutputObserver.h"
 #endif

content/media/MediaStreamGraph.h

@@ -17,7 +17,7 @@
 #include "VideoSegment.h"
 #include "MainThreadUtils.h"
 #include "nsAutoRef.h"
-#include "speex/speex_resampler.h"
+#include <speex/speex_resampler.h>
 #include "AudioMixer.h"
 #include "mozilla/dom/AudioChannelBinding.h"
 

content/media/webaudio/AudioBufferSourceNode.cpp

@@ -12,7 +12,6 @@
 #include "AudioNodeStream.h"
 #include "AudioDestinationNode.h"
 #include "AudioParamTimeline.h"
-#include "speex/speex_resampler.h"
 #include <limits>
 
 namespace mozilla {

content/media/webaudio/WaveShaperNode.cpp

@@ -10,7 +10,6 @@
 #include "AudioNodeEngine.h"
 #include "AudioNodeStream.h"
 #include "mozilla/PodOperations.h"
-#include "speex/speex_resampler.h"
 
 namespace mozilla {
 namespace dom {

content/media/webaudio/WebAudioUtils.cpp

@@ -8,7 +8,6 @@
 #include "AudioNodeStream.h"
 #include "AudioParamTimeline.h"
 #include "blink/HRTFDatabaseLoader.h"
-#include "speex/speex_resampler.h"
 
 namespace mozilla {
 

content/media/webaudio/blink/HRTFElevation.cpp

@@ -28,7 +28,7 @@
 
 #include "HRTFElevation.h"
 
-#include "speex/speex_resampler.h"
+#include <speex/speex_resampler.h>
 #include "mozilla/PodOperations.h"
 #include "AudioSampleFormat.h"
 

media/libspeex_resampler/src/moz.build

@@ -24,8 +24,12 @@ FINAL_LIBRARY = 'gkmedias'
 
 # We don't compile the full speex codec, only the resampler.
 DEFINES['OUTSIDE_SPEEX'] = True
-# We don't use -fvisibility=hidden
+
+# Visibility is handled through VISIBILITY_FLAGS and
+# layout/media/symbols.def.in.
 DEFINES['EXPORT'] = ''
+if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
+    NO_VISIBILITY_FLAGS = True
 
 if CONFIG['OS_TARGET'] == 'Android':
     DEFINES['FIXED_POINT'] = True

media/webrtc/trunk/webrtc/common_audio/resampler/include/resampler.h

@@ -17,7 +17,7 @@
 #define WEBRTC_RESAMPLER_RESAMPLER_H_
 
 #include "webrtc/typedefs.h"
-#include "speex/speex_resampler.h"
+#include <speex/speex_resampler.h>
 
 namespace webrtc
 {