Bug 811544 - Build fixed-point opus on arm. r=ted
authorRalph Giles <giles@mozilla.com>
Tue, 13 Nov 2012 17:32:28 -0800
changeset 113455 ab4286df7900eaa6d0d7437479b7ecb38dcc8697
parent 113454 e57ef5cb5b18ac476af4fd3198dc797fa27649e3
child 113456 3b316bd0d32e39d75899060e51c041a762d5fc09
push id23872
push useremorley@mozilla.com
push dateFri, 16 Nov 2012 17:06:27 +0000
treeherdermozilla-central@a7ed19f7d21a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs811544
milestone19.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 811544 - Build fixed-point opus on arm. r=ted Enable MOZ_OPUS_FIXED inside the opus makefile if MOZ_SAMPLE_TYPE_FLOAT32 is not defined. This is the general proxy for floating point audio support in other areas of the code. We could have defined MOZ_OPUS_FIXED directly in the configure script (and still could) but I liked this better.
media/libopus/Makefile.in
--- a/media/libopus/Makefile.in
+++ b/media/libopus/Makefile.in
@@ -63,16 +63,20 @@ include $(srcdir)/silk_sources.mk
 include $(srcdir)/opus_sources.mk
 
 CSRCS = \
   $(notdir $(CELT_SOURCES)) \
   $(notdir $(SILK_SOURCES)) \
   $(notdir $(OPUS_SOURCES)) \
   $(NULL)
 
+ifndef MOZ_SAMPLE_TYPE_FLOAT32
+  MOZ_OPUS_FIXED = 1
+endif
+
 ifdef MOZ_OPUS_FIXED
 DEFINES += -DFIXED_POINT=1 -DDISABLE_FLOAT_API
 LOCAL_INCLUDES += -I$(srcdir)/silk/fixed
 VPATH += $(srcdir)/silk/fixed
 CSRCS += $(notdir $(SILK_SOURCES_FIXED))
 else
 LOCAL_INCLUDES += -I$(srcdir)/silk/float
 VPATH += $(srcdir)/silk/float