diff options
| author | Moonchild <moonchild@palemoon.org> | 2023-10-18 10:59:39 +0200 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2023-10-18 10:59:39 +0200 |
| commit | f2ec6ef34d9f38faed6b0b2f556390976353fef7 (patch) | |
| tree | 1047eaccd9049626b7cb8095b268d962e3215e4e | |
| parent | 42c8b9470c3c012763677ce0e93ad80bbe0610c9 (diff) | |
| download | uxp-f2ec6ef34d9f38faed6b0b2f556390976353fef7.tar.gz | |
Issue #2346 - Remove IsWaitingOnCDMResource stub
| -rw-r--r-- | dom/media/MediaFormatReader.cpp | 11 | ||||
| -rw-r--r-- | dom/media/MediaFormatReader.h | 2 |
2 files changed, 1 insertions, 12 deletions
diff --git a/dom/media/MediaFormatReader.cpp b/dom/media/MediaFormatReader.cpp index 2bdd2621ac..17fa29c080 100644 --- a/dom/media/MediaFormatReader.cpp +++ b/dom/media/MediaFormatReader.cpp @@ -583,13 +583,6 @@ MediaFormatReader::InitInternal() return NS_OK; } -bool -MediaFormatReader::IsWaitingOnCDMResource() { - MOZ_ASSERT(OnTaskQueue()); - /* EME stub */ - return false; -} - RefPtr<MediaDecoderReader::MetadataPromise> MediaFormatReader::AsyncReadMetadata() { @@ -625,9 +618,7 @@ MediaFormatReader::OnDemuxerInitDone(nsresult) UniquePtr<MetadataTags> tags(MakeUnique<MetadataTags>()); RefPtr<PDMFactory> platform; - if (!IsWaitingOnCDMResource()) { - platform = new PDMFactory(); - } + platform = new PDMFactory(); // To decode, we need valid video and a place to put it. bool videoActive = !!mDemuxer->GetNumberTracks(TrackInfo::kVideoTrack) && diff --git a/dom/media/MediaFormatReader.h b/dom/media/MediaFormatReader.h index 4e084f4158..60ee022264 100644 --- a/dom/media/MediaFormatReader.h +++ b/dom/media/MediaFormatReader.h @@ -100,8 +100,6 @@ private: bool HasVideo() const { return mVideo.mTrackDemuxer; } bool HasAudio() const { return mAudio.mTrackDemuxer; } - bool IsWaitingOnCDMResource(); - bool InitDemuxer(); // Notify the demuxer that new data has been received. // The next queued task calling GetBuffered() is guaranteed to have up to date |