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/MediaDecoder.h | |
| 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/MediaDecoder.h')
| -rw-r--r-- | dom/media/MediaDecoder.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/dom/media/MediaDecoder.h b/dom/media/MediaDecoder.h index 05e88db8b..298552433 100644 --- a/dom/media/MediaDecoder.h +++ b/dom/media/MediaDecoder.h @@ -8,7 +8,11 @@ #define MediaDecoder_h_ #include "mozilla/Atomics.h" + +#ifdef MOZ_EME #include "mozilla/CDMProxy.h" +#endif + #include "mozilla/MozPromise.h" #include "mozilla/ReentrantMonitor.h" #include "mozilla/StateMirroring.h" @@ -432,6 +436,7 @@ private: MediaDecoderOwner* GetOwner() const override; +#ifdef MOZ_EME typedef MozPromise<RefPtr<CDMProxy>, bool /* aIgnored */, /* IsExclusive = */ true> CDMProxyPromise; // Resolved when a CDMProxy is available and the capabilities are known or @@ -439,6 +444,7 @@ private: RefPtr<CDMProxyPromise> RequestCDMProxy() const; void SetCDMProxy(CDMProxy* aProxy); +#endif static bool IsOggEnabled(); static bool IsOpusEnabled(); @@ -589,8 +595,10 @@ private: RefPtr<ResourceCallback> mResourceCallback; +#ifdef MOZ_EME MozPromiseHolder<CDMProxyPromise> mCDMProxyPromiseHolder; RefPtr<CDMProxyPromise> mCDMProxyPromise; +#endif protected: // The promise resolving/rejection is queued as a "micro-task" which will be |