Skip to content

Commit

Permalink
Bug 815748 - Build system changes for Windows Media Foundation HTML5 …
Browse files Browse the repository at this point in the history
…media backend. r=khuey
  • Loading branch information
Chris Pearce committed Dec 18, 2012
1 parent 06605bd commit 3c31f6e
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 0 deletions.
25 changes: 25 additions & 0 deletions configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -4244,6 +4244,7 @@ MOZ_MEDIA=
MOZ_OPUS=1
MOZ_WEBM=1
MOZ_DASH=1
MOZ_WMF=
MOZ_WEBRTC=1
MOZ_PEERCONNECTION=
MOZ_SRTP=
Expand Down Expand Up @@ -5419,6 +5420,29 @@ if test -n "$MOZ_DASH"; then
fi
fi;


dnl ========================================================
dnl = Windows Media Foundation support
dnl ========================================================
if test "$OS_ARCH" = "WINNT"; then
dnl Enable Windows Media Foundation support by default.
dnl Note our minimum SDK version is Windows 7 SDK, so we are (currently)
dnl guaranteed to have a recent-enough SDK to build WMF.
MOZ_WMF=1
fi

MOZ_ARG_DISABLE_BOOL(wmf,
[ --disable-wmf Disable support for Windows Media Foundation],
MOZ_WMF=,
MOZ_WMF=1)

if test -n "$MOZ_WMF"; then
AC_DEFINE(MOZ_WMF)
MOZ_SYDNEYAUDIO=1
MOZ_CUBEB=1
MOZ_MEDIA=1
fi;

dnl ========================================================
dnl = Enable media plugin support
dnl ========================================================
Expand Down Expand Up @@ -8831,6 +8855,7 @@ AC_SUBST(MOZ_TREMOR)
AC_SUBST(MOZ_OPUS)
AC_SUBST(MOZ_WEBM)
AC_SUBST(MOZ_DASH)
AC_SUBST(MOZ_WMF)
AC_SUBST(MOZ_MEDIA_PLUGINS)
AC_SUBST(MOZ_OMX_PLUGIN)
AC_SUBST(MOZ_VP8_ERROR_CONCEALMENT)
Expand Down
3 changes: 3 additions & 0 deletions modules/libpref/src/init/all.js
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,9 @@ pref("media.cache_size", 512000);
// Master HTML5 media volume scale.
pref("media.volume_scale", "1.0");

#ifdef MOZ_WMF
pref("media.windows-media-foundation.enabled", false);
#endif
#ifdef MOZ_RAW
pref("media.raw.enabled", true);
#endif
Expand Down

0 comments on commit 3c31f6e

Please sign in to comment.