diff options
| author | win7-7 <win7-7@users.noreply.github.com> | 2020-02-06 17:17:28 +0200 |
|---|---|---|
| committer | win7-7 <win7-7@users.noreply.github.com> | 2020-02-06 17:17:28 +0200 |
| commit | 6376eceaebe8852b3b74bc77bd1cd6d06e5bb049 (patch) | |
| tree | 2ecda9bf32e7a41a324e3dbf5c3c7fbcc1890dd1 /dom/media/MediaDecoderStateMachine.h | |
| parent | 074f23467b57595007b1c5ff9906e3f30fdfdf9e (diff) | |
| parent | 04c770c8c84b9251b36d3c58c847b63e9b4fa08d (diff) | |
| download | uxp-6376eceaebe8852b3b74bc77bd1cd6d06e5bb049.tar.gz | |
Merge branch 'master' into optimization-3-pr
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 ff3258ff1f..f04f34983b 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. |