diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-08-13 22:45:09 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 12:29:16 +0200 |
| commit | 37e3135bc5cf853f94e9d0d9ba706277a25db928 (patch) | |
| tree | 5b7154274de8ed438765a7ef44c4bc0eb2b8249f /dom/media/MediaFormatReader.h | |
| parent | 259bd2e9770625fb4054298874a0200ad17b4354 (diff) | |
| download | UXP-37e3135bc5cf853f94e9d0d9ba706277a25db928.tar UXP-37e3135bc5cf853f94e9d0d9ba706277a25db928.tar.gz UXP-37e3135bc5cf853f94e9d0d9ba706277a25db928.tar.lz UXP-37e3135bc5cf853f94e9d0d9ba706277a25db928.tar.xz UXP-37e3135bc5cf853f94e9d0d9ba706277a25db928.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/MediaFormatReader.h')
| -rw-r--r-- | dom/media/MediaFormatReader.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/dom/media/MediaFormatReader.h b/dom/media/MediaFormatReader.h index 4d05ca201..be0b7cd17 100644 --- a/dom/media/MediaFormatReader.h +++ b/dom/media/MediaFormatReader.h @@ -20,7 +20,9 @@ namespace mozilla { +#ifdef MOZ_EME class CDMProxy; +#endif class MediaFormatReader final : public MediaDecoderReader { @@ -91,7 +93,9 @@ public: return mTrackDemuxersMayBlock; } +#ifdef MOZ_EME void SetCDMProxy(CDMProxy* aProxy) override; +#endif // Returns a string describing the state of the decoder data. // Used for debugging purposes. @@ -584,7 +588,9 @@ private: RefPtr<VideoFrameContainer> mVideoFrameContainer; layers::ImageContainer* GetImageContainer(); +#ifdef MOZ_EME RefPtr<CDMProxy> mCDMProxy; +#endif RefPtr<GMPCrashHelper> mCrashHelper; |