diff options
| author | Moonchild <mcwerewolf@wolfbeast.com> | 2018-11-24 15:24:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-24 15:24:12 +0100 |
| commit | 083c6b7b99107f5f107b3c86487d13d04184afac (patch) | |
| tree | 76c3de38a9e8889be44d3cf3a9fa337b3bcc75ef /dom/media/platforms | |
| parent | b37e8f87c45a9926e1336ad02a86e36b1a875109 (diff) | |
| parent | 4c8c14a712515bc867d6fbfdb9366b976c5904f5 (diff) | |
| download | UXP-083c6b7b99107f5f107b3c86487d13d04184afac.tar UXP-083c6b7b99107f5f107b3c86487d13d04184afac.tar.gz UXP-083c6b7b99107f5f107b3c86487d13d04184afac.tar.lz UXP-083c6b7b99107f5f107b3c86487d13d04184afac.tar.xz UXP-083c6b7b99107f5f107b3c86487d13d04184afac.zip | |
Merge pull request #879 from trav90/code-cleanup
Remove leftover gonk bits in /dom/media
Diffstat (limited to 'dom/media/platforms')
| -rw-r--r-- | dom/media/platforms/PDMFactory.cpp | 9 | ||||
| -rw-r--r-- | dom/media/platforms/omx/OmxPlatformLayer.cpp | 23 |
2 files changed, 1 insertions, 31 deletions
diff --git a/dom/media/platforms/PDMFactory.cpp b/dom/media/platforms/PDMFactory.cpp index c1e58fdc2..5bfdcffb7 100644 --- a/dom/media/platforms/PDMFactory.cpp +++ b/dom/media/platforms/PDMFactory.cpp @@ -19,9 +19,6 @@ #ifdef MOZ_APPLEMEDIA #include "AppleDecoderModule.h" #endif -#ifdef MOZ_GONK_MEDIACODEC -#include "GonkDecoderModule.h" -#endif #ifdef MOZ_WIDGET_ANDROID #include "AndroidDecoderModule.h" #endif @@ -390,12 +387,6 @@ PDMFactory::CreatePDMs() m = new AppleDecoderModule(); StartupPDM(m); #endif -#ifdef MOZ_GONK_MEDIACODEC - if (MediaPrefs::PDMGonkDecoderEnabled()) { - m = new GonkDecoderModule(); - StartupPDM(m); - } -#endif #ifdef MOZ_WIDGET_ANDROID if(MediaPrefs::PDMAndroidMediaCodecEnabled()){ m = new AndroidDecoderModule(); diff --git a/dom/media/platforms/omx/OmxPlatformLayer.cpp b/dom/media/platforms/omx/OmxPlatformLayer.cpp index 039b4a22f..15b3062a4 100644 --- a/dom/media/platforms/omx/OmxPlatformLayer.cpp +++ b/dom/media/platforms/omx/OmxPlatformLayer.cpp @@ -282,26 +282,7 @@ OmxPlatformLayer::CompressionFormat() } } -// Implementations for different platforms will be defined in their own files. -#ifdef OMX_PLATFORM_GONK - -bool -OmxPlatformLayer::SupportsMimeType(const nsACString& aMimeType) -{ - return GonkOmxPlatformLayer::FindComponents(aMimeType); -} - -OmxPlatformLayer* -OmxPlatformLayer::Create(OmxDataDecoder* aDataDecoder, - OmxPromiseLayer* aPromiseLayer, - TaskQueue* aTaskQueue, - layers::ImageContainer* aImageContainer) -{ - return new GonkOmxPlatformLayer(aDataDecoder, aPromiseLayer, aTaskQueue, aImageContainer); -} - -#else // For platforms without OMX IL support. - +// For platforms without OMX IL support. bool OmxPlatformLayer::SupportsMimeType(const nsACString& aMimeType) { @@ -317,6 +298,4 @@ OmxPlatformLayer::Create(OmxDataDecoder* aDataDecoder, return nullptr; } -#endif - } |