author | Karl Tomlinson <karlt+@karlt.net> |
Wed, 02 Jul 2014 14:21:34 +1200 | |
changeset 196728 | 98d22b0455f6cb8ef51d0d3288dd5c03f128da74 |
parent 196727 | d50d7e88f35eecb6c657467a179f64a47cd0c3c6 |
child 196729 | bbd6da0400ff9b674d438f82e71fc9385007b8b1 |
push id | 46956 |
push user | ktomlinson@mozilla.com |
push date | Wed, 30 Jul 2014 07:22:46 +0000 |
treeherder | mozilla-inbound@4ce8894b2876 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | khuey |
bugs | 1033122 |
milestone | 34.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
|
--- a/config/system-headers +++ b/config/system-headers @@ -1258,17 +1258,16 @@ X11/Xfuncproto.h X11/X.h X11/XKBlib.h X11/Xlib.h X11/Xlibint.h 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 #endif #if MOZ_NATIVE_ZLIB==1 zlib.h #endif #ifdef MOZ_ENABLE_STARTUP_NOTIFICATION @@ -1320,16 +1319,17 @@ vpx/vpx_codec.h vpx/vpx_decoder.h vpx/vpx_encoder.h vpx/vp8cx.h vpx/vp8dx.h 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 cubeb/cubeb.h #endif gst/gst.h gst/app/gstappsink.h gst/app/gstappsrc.h
--- a/content/media/AudioNodeExternalInputStream.cpp +++ b/content/media/AudioNodeExternalInputStream.cpp @@ -1,17 +1,16 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-*/ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "AudioNodeEngine.h" #include "AudioNodeExternalInputStream.h" #include "AudioChannelFormat.h" -#include "speex/speex_resampler.h" #include "mozilla/dom/MediaStreamAudioSourceNode.h" using namespace mozilla::dom; namespace mozilla { AudioNodeExternalInputStream::AudioNodeExternalInputStream(AudioNodeEngine* aEngine, TrackRate aSampleRate) : AudioNodeStream(aEngine, MediaStreamGraph::INTERNAL_STREAM, aSampleRate)
--- a/content/media/AudioSegment.cpp +++ b/content/media/AudioSegment.cpp @@ -4,17 +4,17 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "AudioSegment.h" #include "AudioStream.h" #include "AudioMixer.h" #include "AudioChannelFormat.h" #include "Latency.h" -#include "speex/speex_resampler.h" +#include <speex/speex_resampler.h> namespace mozilla { template <class SrcT, class DestT> static void InterleaveAndConvertBuffer(const SrcT** aSourceChannels, int32_t aLength, float aVolume, int32_t aChannels,
--- a/content/media/MediaStreamGraph.cpp +++ b/content/media/MediaStreamGraph.cpp @@ -23,17 +23,16 @@ #include "AudioChannelService.h" #include "AudioNodeEngine.h" #include "AudioNodeStream.h" #include "AudioNodeExternalInputStream.h" #include <algorithm> #include "DOMMediaStream.h" #include "GeckoProfiler.h" #include "mozilla/unused.h" -#include "speex/speex_resampler.h" #ifdef MOZ_WEBRTC #include "AudioOutputObserver.h" #endif using namespace mozilla::layers; using namespace mozilla::dom; using namespace mozilla::gfx;
--- a/content/media/MediaStreamGraph.h +++ b/content/media/MediaStreamGraph.h @@ -12,17 +12,17 @@ #include "nsTArray.h" #include "nsIRunnable.h" #include "StreamBuffer.h" #include "TimeVarying.h" #include "VideoFrameContainer.h" #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" class nsIRunnable; template <> class nsAutoRefTraits<SpeexResamplerState> : public nsPointerRefTraits<SpeexResamplerState> {
--- a/content/media/webaudio/AudioBufferSourceNode.cpp +++ b/content/media/webaudio/AudioBufferSourceNode.cpp @@ -7,17 +7,16 @@ #include "AudioBufferSourceNode.h" #include "mozilla/dom/AudioBufferSourceNodeBinding.h" #include "mozilla/dom/AudioParam.h" #include "nsMathUtils.h" #include "AudioNodeEngine.h" #include "AudioNodeStream.h" #include "AudioDestinationNode.h" #include "AudioParamTimeline.h" -#include "speex/speex_resampler.h" #include <limits> namespace mozilla { namespace dom { NS_IMPL_CYCLE_COLLECTION_CLASS(AudioBufferSourceNode) NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(AudioBufferSourceNode)
--- a/content/media/webaudio/WaveShaperNode.cpp +++ b/content/media/webaudio/WaveShaperNode.cpp @@ -5,17 +5,16 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "WaveShaperNode.h" #include "mozilla/dom/WaveShaperNodeBinding.h" #include "AudioNode.h" #include "AudioNodeEngine.h" #include "AudioNodeStream.h" #include "mozilla/PodOperations.h" -#include "speex/speex_resampler.h" namespace mozilla { namespace dom { NS_IMPL_CYCLE_COLLECTION_CLASS(WaveShaperNode) NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(WaveShaperNode, AudioNode) NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER
--- a/content/media/webaudio/WebAudioUtils.cpp +++ b/content/media/webaudio/WebAudioUtils.cpp @@ -3,17 +3,16 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "WebAudioUtils.h" #include "AudioNodeStream.h" #include "AudioParamTimeline.h" #include "blink/HRTFDatabaseLoader.h" -#include "speex/speex_resampler.h" namespace mozilla { namespace dom { struct ConvertTimeToTickHelper { AudioNodeStream* mSourceStream;
--- a/content/media/webaudio/blink/HRTFElevation.cpp +++ b/content/media/webaudio/blink/HRTFElevation.cpp @@ -23,17 +23,17 @@ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "HRTFElevation.h" -#include "speex/speex_resampler.h" +#include <speex/speex_resampler.h> #include "mozilla/PodOperations.h" #include "AudioSampleFormat.h" #include "IRC_Composite_C_R0195-incl.cpp" using namespace std; using namespace mozilla;
--- a/media/libspeex_resampler/src/moz.build +++ b/media/libspeex_resampler/src/moz.build @@ -19,18 +19,22 @@ SOURCES += [ ] MSVC_ENABLE_PGO = True 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 else: DEFINES['FLOATING_POINT'] = True # Only use SSE code when using floating point samples, and on x86 if CONFIG['INTEL_ARCHITECTURE'] and CONFIG['OS_TARGET'] != 'Android':
--- a/media/webrtc/trunk/webrtc/common_audio/resampler/include/resampler.h +++ b/media/webrtc/trunk/webrtc/common_audio/resampler/include/resampler.h @@ -12,17 +12,17 @@ /* * A wrapper for resampling a numerous amount of sampling combinations. */ #ifndef WEBRTC_RESAMPLER_RESAMPLER_H_ #define WEBRTC_RESAMPLER_RESAMPLER_H_ #include "webrtc/typedefs.h" -#include "speex/speex_resampler.h" +#include <speex/speex_resampler.h> namespace webrtc { #define FIXED_RATE_RESAMPLER 0x10 enum ResamplerType { kResamplerSynchronous = 0x00,