summaryrefslogtreecommitdiff
path: root/dom/media/MediaFormatReader.h
diff options
context:
space:
mode:
Diffstat (limited to 'dom/media/MediaFormatReader.h')
-rw-r--r--dom/media/MediaFormatReader.h18
1 files changed, 0 insertions, 18 deletions
diff --git a/dom/media/MediaFormatReader.h b/dom/media/MediaFormatReader.h
index ccd43f0e6a..60ee022264 100644
--- a/dom/media/MediaFormatReader.h
+++ b/dom/media/MediaFormatReader.h
@@ -19,10 +19,6 @@
namespace mozilla {
-#ifdef MOZ_EME
-class CDMProxy;
-#endif
-
class MediaFormatReader final : public MediaDecoderReader
{
typedef TrackInfo::TrackType TrackType;
@@ -92,10 +88,6 @@ public:
return mTrackDemuxersMayBlock;
}
-#ifdef MOZ_EME
- void SetCDMProxy(CDMProxy* aProxy) override;
-#endif
-
// Returns a string describing the state of the decoder data.
// Used for debugging purposes.
void GetMozDebugReaderData(nsAString& aString);
@@ -108,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
@@ -587,14 +577,6 @@ private:
RefPtr<VideoFrameContainer> mVideoFrameContainer;
layers::ImageContainer* GetImageContainer();
-#ifdef MOZ_EME
- RefPtr<CDMProxy> mCDMProxy;
-#endif
-
-#ifdef MOZ_GMP
- RefPtr<GMPCrashHelper> mCrashHelper;
-#endif
-
void SetBlankDecode(TrackType aTrack, bool aIsBlankDecode);
class DecoderFactory;