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/gtest | |
| parent | a595451104a9ea155703899ab8fbc9f37547bcd9 (diff) | |
| download | UXP-99118e38e1a9f2ba3b48ed61ab7cc85610c9712f.tar UXP-99118e38e1a9f2ba3b48ed61ab7cc85610c9712f.tar.gz UXP-99118e38e1a9f2ba3b48ed61ab7cc85610c9712f.tar.lz UXP-99118e38e1a9f2ba3b48ed61ab7cc85610c9712f.tar.xz UXP-99118e38e1a9f2ba3b48ed61ab7cc85610c9712f.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/gtest')
| -rw-r--r-- | dom/media/gtest/MockMediaDecoderOwner.h | 2 | ||||
| -rw-r--r-- | dom/media/gtest/moz.build | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/dom/media/gtest/MockMediaDecoderOwner.h b/dom/media/gtest/MockMediaDecoderOwner.h index 324f18141..1009ca30a 100644 --- a/dom/media/gtest/MockMediaDecoderOwner.h +++ b/dom/media/gtest/MockMediaDecoderOwner.h @@ -34,8 +34,10 @@ public: void DownloadProgressed() override {} void UpdateReadyState() override {} void FirstFrameLoaded() override {} +#ifdef MOZ_EME void DispatchEncrypted(const nsTArray<uint8_t>& aInitData, const nsAString& aInitDataType) override {} +#endif bool IsActive() const override { return true; } bool IsHidden() const override { return false; } void DownloadSuspended() override {} diff --git a/dom/media/gtest/moz.build b/dom/media/gtest/moz.build index a7ea73807..ae059962c 100644 --- a/dom/media/gtest/moz.build +++ b/dom/media/gtest/moz.build @@ -28,6 +28,11 @@ UNIFIED_SOURCES += [ 'TestWebMBuffered.cpp', ] +if CONFIG['MOZ_EME']: + UNIFIED_SOURCES += [ + 'TestEME.cpp', + ] + if CONFIG['MOZ_WEBM_ENCODER']: UNIFIED_SOURCES += [ 'TestVideoTrackEncoder.cpp', |