diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-08-13 22:45:09 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-02-03 23:42:52 +0100 |
| commit | 99118e38e1a9f2ba3b48ed61ab7cc85610c9712f (patch) | |
| tree | 6b7ef33a5b1546a82689437e33ff95e9cf8ff79f /dom/media/platforms/PDMFactory.cpp | |
| parent | a595451104a9ea155703899ab8fbc9f37547bcd9 (diff) | |
| download | UXP-99118e38e1a9f2ba3b48ed61ab7cc85610c9712f.tar UXP-99118e38e1a9f2ba3b48ed61ab7cc85610c9712f.tar.gz UXP-99118e38e1a9f2ba3b48ed61ab7cc85610c9712f.tar.lz UXP-99118e38e1a9f2ba3b48ed61ab7cc85610c9712f.tar.xz UXP-99118e38e1a9f2ba3b48ed61ab7cc85610c9712f.zip | |
Issue #26 Part 2a: make more EME code conditional.
- Exclude missed MediaKey functions and CDMProxy code.
- Exclude EME APIs frm being built (webidl change)
- Fix tests in --disable-eme state
Diffstat (limited to 'dom/media/platforms/PDMFactory.cpp')
| -rw-r--r-- | dom/media/platforms/PDMFactory.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/dom/media/platforms/PDMFactory.cpp b/dom/media/platforms/PDMFactory.cpp index 5bfdcffb7..6e7241c46 100644 --- a/dom/media/platforms/PDMFactory.cpp +++ b/dom/media/platforms/PDMFactory.cpp @@ -24,7 +24,6 @@ #endif #include "GMPDecoderModule.h" -#include "mozilla/CDMProxy.h" #include "mozilla/ClearOnShutdown.h" #include "mozilla/SharedThreadPool.h" #include "mozilla/StaticPtr.h" @@ -37,7 +36,11 @@ #include "H264Converter.h" #include "AgnosticDecoderModule.h" + +#ifdef MOZ_EME +#include "mozilla/CDMProxy.h" #include "EMEDecoderModule.h" +#endif #include "DecoderDoctorDiagnostics.h" @@ -450,11 +453,13 @@ PDMFactory::GetDecoder(const TrackInfo& aTrackInfo, return pdm.forget(); } +#ifdef MOZ_EME void PDMFactory::SetCDMProxy(CDMProxy* aProxy) { RefPtr<PDMFactory> m = new PDMFactory(); mEMEPDM = new EMEDecoderModule(aProxy, m); } +#endif } // namespace mozilla |