Make MediaSourceDecoder inherit from GeckoMediaDecoder

servo · Dec 18, 2017 · dab0f5c · dab0f5c
1 parent a0fdf67
commit dab0f5c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/gecko-media/data/header_files.json b/gecko-media/data/header_files.json
@@ -85,7 +85,6 @@
   "MediaResult.h": "dom/media/MediaResult.h",
   "MediaSegment.h": "dom/media/MediaSegment.h",
   "MediaShutdownManager.h": "dom/media/MediaShutdownManager.h",
-  "MediaSourceDecoder.h": "dom/media/mediasource/MediaSourceDecoder.h",
   "MediaSourceDemuxer.h": "dom/media/mediasource/MediaSourceDemuxer.h",
   "MediaSourceUtils.h": "dom/media/mediasource/MediaSourceUtils.h",
   "MediaStatistics.h": "dom/media/MediaStatistics.h",

diff --git a/gecko-media/gecko/glue/MediaSourceDecoder.cpp b/gecko-media/gecko/glue/MediaSourceDecoder.cpp
@@ -27,7 +27,7 @@ using namespace mozilla::media;
 namespace mozilla {
 
 MediaSourceDecoder::MediaSourceDecoder(MediaDecoderInit& aInit)
-  : MediaDecoder(aInit)
+  : GeckoMediaDecoder(aInit)
   , mMediaSource(nullptr)
   , mEnded(false)
 {
@@ -177,7 +177,7 @@ MediaSourceDecoder::Shutdown()
   }
   mDemuxer = nullptr;
 
-  MediaDecoder::Shutdown();
+  GeckoMediaDecoder::Shutdown();
 }
 
 void

diff --git a/...-media/gecko/include/MediaSourceDecoder.h → ...a/gecko/glue/include/MediaSourceDecoder.h b/...-media/gecko/include/MediaSourceDecoder.h → ...a/gecko/glue/include/MediaSourceDecoder.h
@@ -7,7 +7,7 @@
 #ifndef MOZILLA_MEDIASOURCEDECODER_H_
 #define MOZILLA_MEDIASOURCEDECODER_H_
 
-#include "MediaDecoder.h"
+#include "GeckoMediaDecoder.h"
 #include "mozilla/RefPtr.h"
 
 namespace mozilla {
@@ -21,7 +21,7 @@ class MediaSource;
 
 } // namespace dom
 
-class MediaSourceDecoder : public MediaDecoder
+class MediaSourceDecoder : public GeckoMediaDecoder
 {
 public:
   explicit MediaSourceDecoder(MediaDecoderInit& aInit);
@@ -75,7 +75,6 @@ class MediaSourceDecoder : public MediaDecoder
   void DoSetMediaSourceDuration(double aDuration);
   media::TimeInterval ClampIntervalToEnd(const media::TimeInterval& aInterval);
   bool CanPlayThroughImpl() override;
-  bool IsLiveStream() override final { return !mEnded; }
 
   RefPtr<nsIPrincipal> mPrincipal;