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/MediaDecoderStateMachine.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/MediaDecoderStateMachine.h')
-rw-r--r-- | dom/media/MediaDecoderStateMachine.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/dom/media/MediaDecoderStateMachine.h b/dom/media/MediaDecoderStateMachine.h index ff3258ff1..f04f34983 100644 --- a/dom/media/MediaDecoderStateMachine.h +++ b/dom/media/MediaDecoderStateMachine.h @@ -768,10 +768,12 @@ private: // Playback will not start when audio is offloading. bool mAudioOffloading; +#ifdef MOZ_EME void OnCDMProxyReady(RefPtr<CDMProxy> aProxy); void OnCDMProxyNotReady(); RefPtr<CDMProxy> mCDMProxy; MozPromiseRequestHolder<MediaDecoder::CDMProxyPromise> mCDMProxyPromise; +#endif private: // The buffered range. Mirrored from the decoder thread. |