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/MediaDecoderReader.h | |
parent | a595451104a9ea155703899ab8fbc9f37547bcd9 (diff) | |
download | uxp-99118e38e1a9f2ba3b48ed61ab7cc85610c9712f.tar.gz |
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/MediaDecoderReader.h')
-rw-r--r-- | dom/media/MediaDecoderReader.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/dom/media/MediaDecoderReader.h b/dom/media/MediaDecoderReader.h index 8a69978264..f53c74689f 100644 --- a/dom/media/MediaDecoderReader.h +++ b/dom/media/MediaDecoderReader.h @@ -24,7 +24,9 @@ namespace mozilla { +#ifdef MOZ_EME class CDMProxy; +#endif class MediaDecoderReader; struct WaitForDataRejectValue @@ -186,7 +188,9 @@ public: // when to call SetIdle(). virtual void SetIdle() {} +#ifdef MOZ_EME virtual void SetCDMProxy(CDMProxy* aProxy) {} +#endif // Tell the reader that the data decoded are not for direct playback, so it // can accept more files, in particular those which have more channels than |