From dad87bc28199ef2f2dc7c6fa3ad81362cd33a60e Mon Sep 17 00:00:00 2001 From: Robert O'Callahan Date: Thu, 18 Sep 2014 17:13:16 +1200 Subject: [PATCH] Bug 1061046. Part 17: Remove some unused TrackRate parameters. r=karlt --- dom/media/MediaStreamGraph.cpp | 7 +++---- dom/media/MediaStreamGraph.h | 2 +- dom/media/StreamBuffer.h | 11 +++-------- dom/media/TrackUnionStream.cpp | 3 +-- dom/media/webaudio/AudioNodeStream.cpp | 8 ++++---- .../webaudio/MediaStreamAudioDestinationNode.cpp | 3 +-- 6 files changed, 13 insertions(+), 21 deletions(-) diff --git a/dom/media/MediaStreamGraph.cpp b/dom/media/MediaStreamGraph.cpp index 653f2f5b9ad4..9c291671f4a7 100644 --- a/dom/media/MediaStreamGraph.cpp +++ b/dom/media/MediaStreamGraph.cpp @@ -206,7 +206,7 @@ MediaStreamGraphImpl::ExtractPendingInput(SourceMediaStream* aStream, aStream, data->mID, int64_t(data->mStart), int64_t(segment->GetDuration()))); - aStream->mBuffer.AddTrack(data->mID, mSampleRate, data->mStart, segment); + aStream->mBuffer.AddTrack(data->mID, data->mStart, segment); // The track has taken ownership of data->mData, so let's replace // data->mData with an empty clone. data->mData = segment->CreateEmptyClone(); @@ -978,7 +978,6 @@ MediaStreamGraphImpl::PlayAudio(MediaStream* aStream, StreamBuffer::Track* track = aStream->mBuffer.FindTrack(audioOutput.mTrackID); AudioSegment* audio = track->Get(); AudioSegment output; - MOZ_ASSERT(track->GetRate() == mSampleRate); // offset and audioOutput.mLastTickWritten can differ by at most one sample, // because of the rounding issue. We track that to ensure we don't skip a @@ -1924,7 +1923,7 @@ MediaStream::GetProcessingGraphUpdateIndex() } StreamBuffer::Track* -MediaStream::EnsureTrack(TrackID aTrackId, TrackRate aSampleRate) +MediaStream::EnsureTrack(TrackID aTrackId) { StreamBuffer::Track* track = mBuffer.FindTrack(aTrackId); if (!track) { @@ -1935,7 +1934,7 @@ MediaStream::EnsureTrack(TrackID aTrackId, TrackRate aSampleRate) MediaStreamListener::TRACK_EVENT_CREATED, *segment); } - track = &mBuffer.AddTrack(aTrackId, aSampleRate, 0, segment.forget()); + track = &mBuffer.AddTrack(aTrackId, 0, segment.forget()); } return track; } diff --git a/dom/media/MediaStreamGraph.h b/dom/media/MediaStreamGraph.h index 92bb23711756..3121e156c5e8 100644 --- a/dom/media/MediaStreamGraph.h +++ b/dom/media/MediaStreamGraph.h @@ -532,7 +532,7 @@ public: bool HasCurrentData() { return mHasCurrentData; } - StreamBuffer::Track* EnsureTrack(TrackID aTrack, TrackRate aSampleRate); + StreamBuffer::Track* EnsureTrack(TrackID aTrack); void ApplyTrackDisabling(TrackID aTrackID, MediaSegment* aSegment, MediaSegment* aRawSegment = nullptr); diff --git a/dom/media/StreamBuffer.h b/dom/media/StreamBuffer.h index 0141e78982df..533e074fa150 100644 --- a/dom/media/StreamBuffer.h +++ b/dom/media/StreamBuffer.h @@ -85,10 +85,9 @@ public: * Takes ownership of aSegment. */ class Track { - Track(TrackID aID, TrackRate aRate, TrackTicks aStart, MediaSegment* aSegment, TrackRate aGraphRate) + Track(TrackID aID, TrackTicks aStart, MediaSegment* aSegment, TrackRate aGraphRate) : mStart(aStart), mSegment(aSegment), - mRate(aRate), mGraphRate(aGraphRate), mID(aID), mEnded(false) @@ -96,7 +95,6 @@ public: MOZ_COUNT_CTOR(Track); NS_ASSERTION(aID > TRACK_NONE, "Bad track ID"); - NS_ASSERTION(0 < aRate && aRate <= TRACK_RATE_MAX, "Invalid rate"); NS_ASSERTION(0 <= aStart && aStart <= aSegment->GetDuration(), "Bad start position"); } public: @@ -112,7 +110,6 @@ public: return nullptr; } MediaSegment* GetSegment() const { return mSegment; } - TrackRate GetRate() const { return mRate; } TrackID GetID() const { return mID; } bool IsEnded() const { return mEnded; } TrackTicks GetStart() const { return mStart; } @@ -126,7 +123,6 @@ public: NS_ASSERTION(aTrack->mID == mID, "IDs must match"); NS_ASSERTION(aTrack->mStart == 0, "Source track must start at zero"); NS_ASSERTION(aTrack->mSegment->GetType() == GetType(), "Track types must match"); - NS_ASSERTION(aTrack->mRate == mRate, "Track rates must match"); mSegment->AppendFrom(aTrack->mSegment); mEnded = aTrack->mEnded; @@ -163,7 +159,6 @@ public: // The segment data starts at the start of the owning StreamBuffer, i.e., // there's mStart silence/no video at the beginning. nsAutoPtr mSegment; - TrackRate mRate; // track rate in ticks per second TrackRate mGraphRate; // graph rate in StreamTime per second // Unique ID TrackID mID; @@ -228,11 +223,11 @@ public: * holding a Track reference. * aSegment must have aStart worth of null data. */ - Track& AddTrack(TrackID aID, TrackRate aRate, TrackTicks aStart, MediaSegment* aSegment) + Track& AddTrack(TrackID aID, TrackTicks aStart, MediaSegment* aSegment) { NS_ASSERTION(!FindTrack(aID), "Track with this ID already exists"); - Track* track = new Track(aID, aRate, aStart, aSegment, GraphRate()); + Track* track = new Track(aID, aStart, aSegment, GraphRate()); mTracks.InsertElementSorted(track, CompareTracksByID()); if (mTracksKnownTime == STREAM_TIME_MAX) { diff --git a/dom/media/TrackUnionStream.cpp b/dom/media/TrackUnionStream.cpp index 66b209e10f64..60ceba3b032f 100644 --- a/dom/media/TrackUnionStream.cpp +++ b/dom/media/TrackUnionStream.cpp @@ -188,7 +188,6 @@ TrackUnionStream::TrackUnionStream(DOMMediaStream* aWrapper) : id = ++maxTrackID; } - TrackRate rate = aTrack->GetRate(); // Round up the track start time so the track, if anything, starts a // little later than the true time. This means we'll have enough // samples in our input stream to go just beyond the destination time. @@ -204,7 +203,7 @@ TrackUnionStream::TrackUnionStream(DOMMediaStream* aWrapper) : } segment->AppendNullData(outputStart); StreamBuffer::Track* track = - &mBuffer.AddTrack(id, rate, outputStart, segment.forget()); + &mBuffer.AddTrack(id, outputStart, segment.forget()); STREAM_LOG(PR_LOG_DEBUG, ("TrackUnionStream %p adding track %d for input stream %p track %d, start ticks %lld", this, id, aPort->GetSource(), aTrack->GetID(), (long long)outputStart)); diff --git a/dom/media/webaudio/AudioNodeStream.cpp b/dom/media/webaudio/AudioNodeStream.cpp index 81715633e1e3..256d6f8167ce 100644 --- a/dom/media/webaudio/AudioNodeStream.cpp +++ b/dom/media/webaudio/AudioNodeStream.cpp @@ -445,7 +445,7 @@ void AudioNodeStream::ProcessInput(GraphTime aFrom, GraphTime aTo, uint32_t aFlags) { if (!mFinished) { - EnsureTrack(AUDIO_TRACK, mSampleRate); + EnsureTrack(AUDIO_TRACK); } // No more tracks will be coming mBuffer.AdvanceKnownTracksTime(STREAM_TIME_MAX); @@ -537,7 +537,7 @@ AudioNodeStream::ProduceOutputBeforeInput(GraphTime aFrom) void AudioNodeStream::AdvanceOutputSegment() { - StreamBuffer::Track* track = EnsureTrack(AUDIO_TRACK, mSampleRate); + StreamBuffer::Track* track = EnsureTrack(AUDIO_TRACK); AudioSegment* segment = track->Get(); if (mKind == MediaStreamGraph::EXTERNAL_STREAM) { @@ -560,7 +560,7 @@ TrackTicks AudioNodeStream::GetCurrentPosition() { NS_ASSERTION(!mFinished, "Don't create another track after finishing"); - return EnsureTrack(AUDIO_TRACK, mSampleRate)->Get()->GetDuration(); + return EnsureTrack(AUDIO_TRACK)->Get()->GetDuration(); } void @@ -570,7 +570,7 @@ AudioNodeStream::FinishOutput() return; } - StreamBuffer::Track* track = EnsureTrack(AUDIO_TRACK, mSampleRate); + StreamBuffer::Track* track = EnsureTrack(AUDIO_TRACK); track->SetEnded(); FinishOnGraphThread(); diff --git a/dom/media/webaudio/MediaStreamAudioDestinationNode.cpp b/dom/media/webaudio/MediaStreamAudioDestinationNode.cpp index 204a798ba14a..ba776d3e8a0b 100644 --- a/dom/media/webaudio/MediaStreamAudioDestinationNode.cpp +++ b/dom/media/webaudio/MediaStreamAudioDestinationNode.cpp @@ -42,8 +42,7 @@ public: bool* aFinished) MOZ_OVERRIDE { *aOutput = aInput; - StreamBuffer::Track* track = mOutputStream->EnsureTrack(MEDIA_STREAM_DEST_TRACK_ID, - aStream->SampleRate()); + StreamBuffer::Track* track = mOutputStream->EnsureTrack(MEDIA_STREAM_DEST_TRACK_ID); AudioSegment* segment = track->Get(); segment->AppendAndConsumeChunk(aOutput); }