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 | f7e60f1603d4e8bc34e2483d8cb3c61661e3b1e1 (patch) | |
| tree | 6b7ef33a5b1546a82689437e33ff95e9cf8ff79f /dom/media/MediaFormatReader.cpp | |
| parent | c841f15671e2b9f8fffee287f66e25e0c4b7fe3b (diff) | |
| download | aura-central-f7e60f1603d4e8bc34e2483d8cb3c61661e3b1e1.tar.gz | |
Issue mcp-graveyard/UXP%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.cpp')
| -rw-r--r-- | dom/media/MediaFormatReader.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/dom/media/MediaFormatReader.cpp b/dom/media/MediaFormatReader.cpp index 773434710..396f31e37 100644 --- a/dom/media/MediaFormatReader.cpp +++ b/dom/media/MediaFormatReader.cpp @@ -4,7 +4,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#ifdef MOZ_EME #include "mozilla/CDMProxy.h" +#endif + #include "mozilla/ClearOnShutdown.h" #include "mozilla/dom/HTMLMediaElement.h" #include "mozilla/Preferences.h" @@ -611,7 +614,6 @@ private: nsTArray<uint8_t> mInitData; nsString mInitDataType; }; -#endif void MediaFormatReader::SetCDMProxy(CDMProxy* aProxy) @@ -624,6 +626,7 @@ MediaFormatReader::SetCDMProxy(CDMProxy* aProxy) }); OwnerThread()->Dispatch(r.forget()); } +#endif // MOZ_EME bool MediaFormatReader::IsWaitingOnCDMResource() { |