Fix tests

servo · Dec 19, 2017 · b23977f · b23977f
1 parent 27a1019
commit b23977f
Show file tree

Hide file tree

Showing 6 changed files with 312 additions and 129 deletions.
diff --git a/gecko-media/gecko/glue/GeckoMediaDecoder.cpp b/gecko-media/gecko/glue/GeckoMediaDecoder.cpp
@@ -37,7 +37,6 @@ GeckoMediaDecoder::GeckoMediaDecoder(MediaDecoderInit& aInit)
   : MediaDecoder(aInit)
   , mGeckoWatchManager(this, aInit.mOwner->AbstractMainThread())
 {
-  mExplicitDuration.emplace(UnspecifiedNaN<double>());
   mGeckoWatchManager.Watch(mBuffered, &GeckoMediaDecoder::NotifyBuffered);
 }
 

diff --git a/gecko-media/gecko/glue/MediaSource.cpp b/gecko-media/gecko/glue/MediaSource.cpp
@@ -85,7 +85,7 @@ MediaSource::SourceBuffers()
   MOZ_ASSERT(NS_IsMainThread());
 
   CALLBACK_GUARD(GetSourceBuffers, nullptr);
-  size_t* id = (*mImpl.mGetSourceBuffers)(mImpl.mContext);
+  size_t* id = CALLBACK_CALL(GetSourceBuffers);
   if (NS_WARN_IF(!id)) {
     return nullptr;
   }

diff --git a/gecko-media/gecko/glue/SourceBuffer.cpp b/gecko-media/gecko/glue/SourceBuffer.cpp
@@ -35,12 +35,16 @@ SourceBuffer::SourceBuffer(GeckoMediaSourceBufferImpl aImpl,
   mMediaSource = GetMediaSource(aParentId);
   MOZ_ASSERT(mMediaSource);
 
-  mTrackBuffersManager =
-    new TrackBuffersManager(mMediaSource->GetDecoder(), mime.value());
+  RefPtr<MediaSourceDecoder> decoder = mMediaSource->GetDecoder();
+  if (NS_WARN_IF(!decoder)) {
+    return;
+  }
+
+  mTrackBuffersManager = new TrackBuffersManager(decoder, mime.value());
 
   MSE_DEBUG("Create mTrackBuffersManager=%p", mTrackBuffersManager.get());
 
-  mMediaSource->GetDecoder()->GetDemuxer()->AttachSourceBuffer(mTrackBuffersManager);
+  decoder->GetDemuxer()->AttachSourceBuffer(mTrackBuffersManager);
 }
 
 media::TimeIntervals

diff --git a/gecko-media/gecko/glue/include/MediaSource.h b/gecko-media/gecko/glue/include/MediaSource.h
@@ -33,7 +33,6 @@ class MediaSource final
   MediaSourceReadyState ReadyState();
 
   // Attach this MediaSource to Decoder aDecoder.  Returns false if already attached.
-  // FIXME This will likely get a GeckoMediaSourceDecoder at some point.
   bool Attach(MediaSourceDecoder* aDecoder);
   void Detach();