Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 20:35:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out 2 changesets (bug 794282) because of mochitest-1 timeouts on Linux

Browse Source 
Backed out changeset aad877111804 (bug 794282)
Backed out changeset a73bc11da471 (bug 794282)
This commit is contained in:
Ehsan Akhgari 2013-06-18 23:15:51 -04:00
parent f84e41801b
commit e6dc6b22a0
5 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.in
View File

@ -5755,10 +5755,6 @@ AC_SUBST(MOZ_PULSEAUDIO_LIBS)
dnl ========================================================
dnl = Enable GStreamer
dnl ========================================================
if test "$OS_TARGET" = "Linux"; then
MOZ_GSTREAMER=1
fi
MOZ_ARG_ENABLE_BOOL(gstreamer,
[ --enable-gstreamer Enable GStreamer support],
MOZ_GSTREAMER=1,

3
content/media/gstreamer/GStreamerDecoder.cpp
View File

@ -20,8 +20,7 @@ bool
GStreamerDecoder::CanHandleMediaType(const nsACString& aMIMEType,
const nsAString* aCodecs)
{
return MediaDecoder::IsGStreamerEnabled() &&
GStreamerFormatHelper::Instance()->CanHandleMediaType(aMIMEType, aCodecs);
return GStreamerFormatHelper::Instance()->CanHandleMediaType(aMIMEType, aCodecs);
}
} // namespace mozilla

2
content/media/gstreamer/GStreamerLoader.cpp
View File

@ -44,7 +44,7 @@ load_gstreamer()
return true;
}
void *gstreamerLib = NULL;
void *gstreamerLib = nullptr;
guint major = 0;
guint minor = 0;
guint micro, nano;

16
content/media/test/manifest.js
View File

@ -695,25 +695,19 @@ function mediaTestCleanup() {
var branch = prefService.getBranch("media.");
var oldDefault = 2;
var oldAuto = 3;
var oldGStreamer = undefined;
var oldOpus = undefined;
try { oldGStreamer = branch.getBoolPref("gstreamer.enabled"); } catch(ex) { }
try { oldDefault = branch.getIntPref("preload.default"); } catch(ex) { }
try { oldAuto = branch.getIntPref("preload.auto"); } catch(ex) { }
try { oldOpus = branch.getBoolPref("opus.enabled"); } catch(ex) { }
try {
oldDefault = branch.getIntPref("preload.default");
oldAuto = branch.getIntPref("preload.auto");
oldOpus = branch.getBoolPref("opus.enabled");
} catch(ex) { }
branch.setIntPref("preload.default", 2); // preload_metadata
branch.setIntPref("preload.auto", 3); // preload_enough
// test opus playback iff the pref exists
if (oldOpus !== undefined)
branch.setBoolPref("opus.enabled", true);
if (oldGStreamer !== undefined)
branch.setBoolPref("gstreamer.enabled", true);
window.addEventListener("unload", function() {
if (oldGStreamer !== undefined)
branch.setBoolPref("gstreamer.enabled", oldGStreamer);
branch.setIntPref("preload.default", oldDefault);
branch.setIntPref("preload.auto", oldAuto);
if (oldOpus !== undefined)

2
modules/libpref/src/init/all.js
View File

@ -178,7 +178,7 @@ pref("media.webm.enabled", true);
pref("media.dash.enabled", false);
#endif
#ifdef MOZ_GSTREAMER
pref("media.gstreamer.enabled", false);
pref("media.gstreamer.enabled", true);
#endif
#ifdef MOZ_WEBRTC
pref("media.navigator.enabled", true);