From 7ae60742ffbddeaef31674ab4e7f0593ce4e0c65 Mon Sep 17 00:00:00 2001 From: trav90 Date: Fri, 10 Feb 2017 10:32:18 -0600 Subject: [PATCH] Nuke remaining GStreamer code --- dom/media/DecoderTraits.cpp | 44 ------------------- dom/media/MediaDecoder.cpp | 8 ---- dom/media/MediaDecoder.h | 4 -- dom/media/MediaDecoderReader.cpp | 6 +-- layout/build/nsLayoutStatics.cpp | 8 ---- modules/libpref/init/all.js | 4 -- .../exthandler/nsExternalHelperAppService.cpp | 2 +- 7 files changed, 3 insertions(+), 73 deletions(-) diff --git a/dom/media/DecoderTraits.cpp b/dom/media/DecoderTraits.cpp index e511fc2cc3..a645c250d1 100644 --- a/dom/media/DecoderTraits.cpp +++ b/dom/media/DecoderTraits.cpp @@ -28,10 +28,6 @@ #include "RawDecoder.h" #include "RawReader.h" #endif -#ifdef MOZ_GSTREAMER -#include "GStreamerDecoder.h" -#include "GStreamerReader.h" -#endif #ifdef MOZ_ANDROID_OMX #include "AndroidMediaPluginHost.h" #include "AndroidMediaDecoder.h" @@ -202,24 +198,6 @@ IsWebMType(const nsACString& aType) } #endif -#ifdef MOZ_GSTREAMER -static bool -IsGStreamerSupportedType(const nsACString& aMimeType) -{ - if (!MediaDecoder::IsGStreamerEnabled()) - return false; - -#ifdef MOZ_WEBM - if (IsWebMType(aMimeType) && !Preferences::GetBool("media.prefer-gstreamer", false)) - return false; -#endif - if (IsOggType(aMimeType) && !Preferences::GetBool("media.prefer-gstreamer", false)) - return false; - - return GStreamerDecoder::CanHandleMediaType(aMimeType, nullptr); -} -#endif - #ifdef MOZ_OMX_DECODER static const char* const gOmxTypes[] = { "audio/mpeg", @@ -460,14 +438,6 @@ if (IsMP3SupportedType(nsDependentCString(aMIMEType), aRequestedCodecs)) { return aHaveRequestedCodecs ? CANPLAY_YES : CANPLAY_MAYBE; } -#ifdef MOZ_GSTREAMER - if (GStreamerDecoder::CanHandleMediaType(nsDependentCString(aMIMEType), - aHaveRequestedCodecs ? &aRequestedCodecs : nullptr)) { - if (aHaveRequestedCodecs) - return CANPLAY_YES; - return CANPLAY_MAYBE; - } -#endif #ifdef MOZ_OMX_DECODER if (IsOmxSupportedType(nsDependentCString(aMIMEType))) { result = CANPLAY_MAYBE; @@ -556,12 +526,6 @@ if (IsMP3SupportedType(aType)) { decoder = new MP3Decoder(); return decoder.forget(); } -#ifdef MOZ_GSTREAMER - if (IsGStreamerSupportedType(aType)) { - decoder = new GStreamerDecoder(); - return decoder.forget(); - } -#endif #ifdef MOZ_RAW if (IsRawType(aType)) { decoder = new RawDecoder(); @@ -685,11 +649,6 @@ MediaDecoderReader* DecoderTraits::CreateReader(const nsACString& aType, Abstrac if (IsMP3SupportedType(aType)) { decoderReader = new MediaFormatReader(aDecoder, new mp3::MP3Demuxer(aDecoder->GetResource())); } else -#ifdef MOZ_GSTREAMER - if (IsGStreamerSupportedType(aType)) { - decoderReader = new GStreamerReader(aDecoder); - } else -#endif #ifdef MOZ_RAW if (IsRawType(aType)) { decoderReader = new RawReader(aDecoder); @@ -770,9 +729,6 @@ bool DecoderTraits::IsSupportedInVideoDocument(const nsACString& aType) #ifdef MOZ_WEBM IsWebMType(aType) || #endif -#ifdef MOZ_GSTREAMER - IsGStreamerSupportedType(aType) || -#endif #ifdef MOZ_ANDROID_OMX (MediaDecoder::IsAndroidMediaEnabled() && IsAndroidMediaType(aType)) || #endif diff --git a/dom/media/MediaDecoder.cpp b/dom/media/MediaDecoder.cpp index f7428664e8..d4c4b5db67 100644 --- a/dom/media/MediaDecoder.cpp +++ b/dom/media/MediaDecoder.cpp @@ -1786,14 +1786,6 @@ MediaDecoder::IsRtspEnabled() } #endif -#ifdef MOZ_GSTREAMER -bool -MediaDecoder::IsGStreamerEnabled() -{ - return Preferences::GetBool("media.gstreamer.enabled"); -} -#endif - #ifdef MOZ_OMX_DECODER bool MediaDecoder::IsOmxEnabled() diff --git a/dom/media/MediaDecoder.h b/dom/media/MediaDecoder.h index 72b5d54b0e..6cca582dce 100644 --- a/dom/media/MediaDecoder.h +++ b/dom/media/MediaDecoder.h @@ -861,10 +861,6 @@ public: static bool IsRtspEnabled(); #endif -#ifdef MOZ_GSTREAMER - static bool IsGStreamerEnabled(); -#endif - #ifdef MOZ_OMX_DECODER static bool IsOmxEnabled(); static bool IsOmxAsyncEnabled(); diff --git a/dom/media/MediaDecoderReader.cpp b/dom/media/MediaDecoderReader.cpp index 9a63e0d01e..0f9096f170 100644 --- a/dom/media/MediaDecoderReader.cpp +++ b/dom/media/MediaDecoderReader.cpp @@ -321,10 +321,8 @@ MediaDecoderReader::RequestAudioData() AudioQueue().Finish(); break; } - // AudioQueue size is still zero, post a task to try again. Don't spin - // waiting in this while loop since it somehow prevents audio EOS from - // coming in gstreamer 1.x when there is still video buffer waiting to be - // consumed. (|mVideoSinkBufferCount| > 0) + // AudioQueue size is still zero, post a task to try again. + // (|mVideoSinkBufferCount| > 0) if (AudioQueue().GetSize() == 0 && mTaskQueue) { RefPtr task(new ReRequestAudioTask(this)); mTaskQueue->Dispatch(task); diff --git a/layout/build/nsLayoutStatics.cpp b/layout/build/nsLayoutStatics.cpp index eb39461441..a7e65d38dc 100644 --- a/layout/build/nsLayoutStatics.cpp +++ b/layout/build/nsLayoutStatics.cpp @@ -95,10 +95,6 @@ #include "WMFDecoder.h" #endif -#ifdef MOZ_GSTREAMER -#include "GStreamerFormatHelper.h" -#endif - #ifdef MOZ_FFMPEG #include "FFmpegRuntimeLinker.h" #endif @@ -373,10 +369,6 @@ nsLayoutStatics::Shutdown() AndroidMediaPluginHost::Shutdown(); #endif -#ifdef MOZ_GSTREAMER - GStreamerFormatHelper::Shutdown(); -#endif - #ifdef MOZ_FFMPEG FFmpegRuntimeLinker::Unlink(); #endif diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index fc26fa1492..30f599a224 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -336,10 +336,6 @@ pref("media.webm.enabled", true); pref("media.webm.intel_decoder.enabled", false); #endif #endif -#ifdef MOZ_GSTREAMER -pref("media.gstreamer.enabled", false); -pref("media.gstreamer.enable-blacklist", true); -#endif #ifdef MOZ_APPLEMEDIA pref("media.apple.mp3.enabled", true); pref("media.apple.mp4.enabled", true); diff --git a/uriloader/exthandler/nsExternalHelperAppService.cpp b/uriloader/exthandler/nsExternalHelperAppService.cpp index 02bd7df53f..fa5de88473 100644 --- a/uriloader/exthandler/nsExternalHelperAppService.cpp +++ b/uriloader/exthandler/nsExternalHelperAppService.cpp @@ -459,7 +459,7 @@ static nsDefaultMimeTypeEntry defaultMimeEntries [] = { VIDEO_WEBM, "webm" }, { AUDIO_WEBM, "webm" }, #endif -#if defined(MOZ_GSTREAMER) || defined(MOZ_WMF) +#if defined(MOZ_WMF) { VIDEO_MP4, "mp4" }, { AUDIO_MP4, "m4a" }, { AUDIO_MP3, "mp3" },