Bug 1509548 - Clean up what appears to be wip-leftover gunk in DecodedStream. r=jya
authorAndreas Pehrson <apehrson@mozilla.com>
Thu, 29 Nov 2018 17:37:21 +0000
changeset 505194 dfde7b2c53a63c1fbeb90f984f912c8fd73da623
parent 505193 8a064f0dbb2f09c589514f71b06e37ed36362cd1
child 505195 311cee86bc66141b8f59be67cd203018f5799cae
push id10290
push userffxbld-merge
push dateMon, 03 Dec 2018 16:23:23 +0000
treeherdermozilla-beta@700bed2445e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjya
bugs1509548
milestone65.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1509548 - Clean up what appears to be wip-leftover gunk in DecodedStream. r=jya Differential Revision: https://phabricator.services.mozilla.com/D12926
dom/media/mediasink/DecodedStream.cpp
dom/media/mediasink/DecodedStream.h
--- a/dom/media/mediasink/DecodedStream.cpp
+++ b/dom/media/mediasink/DecodedStream.cpp
@@ -90,18 +90,17 @@ class DecodedStreamGraphListener {
 
   void NotifyOutput(const RefPtr<SourceMediaStream>& aStream, TrackID aTrackID,
                     StreamTime aCurrentTrackTime) {
     if (aTrackID != mAudioTrackID && mAudioTrackID != TRACK_NONE) {
       // Only audio playout drives the clock forward, if present.
       return;
     }
     if (aStream) {
-      int64_t t = aStream->StreamTimeToMicroseconds(aCurrentTrackTime);
-      mOnOutput.Notify(t);
+      mOnOutput.Notify(aStream->StreamTimeToMicroseconds(aCurrentTrackTime));
     }
   }
 
   TrackID AudioTrackID() const { return mAudioTrackID; }
 
   TrackID VideoTrackID() const { return mVideoTrackID; }
 
   void DoNotifyTrackEnded(TrackID aTrackID) {
@@ -227,19 +226,18 @@ DecodedStreamData::DecodedStreamData(
     AbstractThread* aMainThread)
     : mAudioFramesWritten(0),
       mStreamVideoWritten(0),
       mStreamAudioWritten(0),
       mNextVideoTime(aInit.mStartTime),
       mNextAudioTime(aInit.mStartTime),
       mHaveSentFinishAudio(false),
       mHaveSentFinishVideo(false),
-      mStream(aOutputStreamManager->mSourceStream)
+      mStream(aOutputStreamManager->mSourceStream),
       // DecodedStreamGraphListener will resolve these promises.
-      ,
       mListener(MakeRefPtr<DecodedStreamGraphListener>(
           mStream, aInit.mAudioTrackID, std::move(aAudioPromise),
           aInit.mVideoTrackID, std::move(aVideoPromise), aMainThread)),
       mEOSVideoCompensation(false),
       mOutputStreamManager(aOutputStreamManager),
       mAbstractMainThread(aMainThread) {
   MOZ_ASSERT(NS_IsMainThread());
   // Initialize tracks on main thread and in the MediaStreamGraph.
--- a/dom/media/mediasink/DecodedStream.h
+++ b/dom/media/mediasink/DecodedStream.h
@@ -78,17 +78,16 @@ class DecodedStream : public media::Medi
   }
   void DestroyData(UniquePtr<DecodedStreamData> aData);
   void SendAudio(double aVolume, bool aIsSameOrigin,
                  const PrincipalHandle& aPrincipalHandle);
   void SendVideo(bool aIsSameOrigin, const PrincipalHandle& aPrincipalHandle);
   StreamTime SentDuration();
   void SendData();
   void NotifyOutput(int64_t aTime);
-  void NotifyTrackEnd(StreamTime aEndTime);
 
   void AssertOwnerThread() const {
     MOZ_ASSERT(mOwnerThread->IsCurrentThreadIn());
   }
 
   void PlayingChanged();
 
   void ConnectListener();