wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-30 02:57:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

Remove remaining MOZ_GONK_MEDIACODEC code

Browse source
This commit is contained in:
trav90 2018-11-21 08:44:16 -06:00 • committed by Roy Tam
commit e99eefeb84
5 changed files with 0 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

3
dom/media/MediaPrefs.h
View file

@ -105,9 +105,6 @@ private:
DECL_MEDIA_PREF("media.eme.enabled", EMEEnabled, bool, false); DECL_MEDIA_PREF("media.eme.enabled", EMEEnabled, bool, false);
DECL_MEDIA_PREF("media.use-blank-decoder", PDMUseBlankDecoder, bool, false); DECL_MEDIA_PREF("media.use-blank-decoder", PDMUseBlankDecoder, bool, false);
DECL_MEDIA_PREF("media.gpu-process-decoder", PDMUseGPUDecoder, bool, false); DECL_MEDIA_PREF("media.gpu-process-decoder", PDMUseGPUDecoder, bool, false);
#ifdef MOZ_GONK_MEDIACODEC
DECL_MEDIA_PREF("media.gonk.enabled", PDMGonkDecoderEnabled, bool, true);
#endif
#ifdef MOZ_WIDGET_ANDROID #ifdef MOZ_WIDGET_ANDROID
DECL_MEDIA_PREF("media.android-media-codec.enabled", PDMAndroidMediaCodecEnabled, bool, false); DECL_MEDIA_PREF("media.android-media-codec.enabled", PDMAndroidMediaCodecEnabled, bool, false);
DECL_MEDIA_PREF("media.android-media-codec.preferred", PDMAndroidMediaCodecPreferred, bool, false); DECL_MEDIA_PREF("media.android-media-codec.preferred", PDMAndroidMediaCodecPreferred, bool, false);

4
dom/media/fmp4/MP4Decoder.cpp
View file

@ -91,10 +91,6 @@ MP4Decoder::CanHandleMediaType(const MediaContentType& aType,
const bool isMP4Audio = aType.GetMIMEType().EqualsASCII("audio/mp4") || const bool isMP4Audio = aType.GetMIMEType().EqualsASCII("audio/mp4") ||
aType.GetMIMEType().EqualsASCII("audio/x-m4a"); aType.GetMIMEType().EqualsASCII("audio/x-m4a");
const bool isMP4Video = const bool isMP4Video =
// On B2G, treat 3GPP as MP4 when Gonk PDM is available.
#ifdef MOZ_GONK_MEDIACODEC
aType.GetMIMEType().EqualsASCII(VIDEO_3GPP) ||
#endif
aType.GetMIMEType().EqualsASCII("video/mp4") || aType.GetMIMEType().EqualsASCII("video/mp4") ||
aType.GetMIMEType().EqualsASCII("video/quicktime") || aType.GetMIMEType().EqualsASCII("video/quicktime") ||
aType.GetMIMEType().EqualsASCII("video/x-m4v"); aType.GetMIMEType().EqualsASCII("video/x-m4v");

3
dom/media/fmp4/moz.build
View file

@ -20,6 +20,3 @@ SOURCES += [
] ]
FINAL_LIBRARY = 'xul' FINAL_LIBRARY = 'xul'
if CONFIG['MOZ_GONK_MEDIACODEC']:
DEFINES['MOZ_GONK_MEDIACODEC'] = True

3
dom/media/mediasource/moz.build
View file

@ -38,9 +38,6 @@ TEST_DIRS += [
'gtest', 'gtest',
] ]
if CONFIG['MOZ_GONK_MEDIACODEC']:
DEFINES['MOZ_GONK_MEDIACODEC'] = True
include('/ipc/chromium/chromium-config.mozbuild') include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'xul' FINAL_LIBRARY = 'xul'

9
dom/media/platforms/PDMFactory.cpp
View file

@ -19,9 +19,6 @@
#ifdef MOZ_APPLEMEDIA #ifdef MOZ_APPLEMEDIA
#include "AppleDecoderModule.h" #include "AppleDecoderModule.h"
#endif #endif
#ifdef MOZ_GONK_MEDIACODEC
#include "GonkDecoderModule.h"
#endif
#ifdef MOZ_WIDGET_ANDROID #ifdef MOZ_WIDGET_ANDROID
#include "AndroidDecoderModule.h" #include "AndroidDecoderModule.h"
#endif #endif
@ -403,12 +400,6 @@ PDMFactory::CreatePDMs()
m = new AppleDecoderModule(); m = new AppleDecoderModule();
StartupPDM(m); StartupPDM(m);
#endif #endif
#ifdef MOZ_GONK_MEDIACODEC
if (MediaPrefs::PDMGonkDecoderEnabled()) {
m = new GonkDecoderModule();
StartupPDM(m);
}
#endif
#ifdef MOZ_WIDGET_ANDROID #ifdef MOZ_WIDGET_ANDROID
if(MediaPrefs::PDMAndroidMediaCodecEnabled()){ if(MediaPrefs::PDMAndroidMediaCodecEnabled()){
m = new AndroidDecoderModule(); m = new AndroidDecoderModule();