Bug 1201363 - Do not copy video segment to StreamTracks in TrackUnionStream. r?jesup
Now everything is ready. We can make NotifyQueuedTrackChanges only triggered by TRACK_EVENT_CREATED and TRACK_EVENT_ENDED without breaking anything. Also we make TrackUnionStream no longer copying data in video case.
MozReview-Commit-ID: IgLx1mpBWB3
--- a/dom/media/MediaStreamGraph.cpp
+++ b/dom/media/MediaStreamGraph.cpp
@@ -236,26 +236,16 @@ MediaStreamGraphImpl::ExtractPendingInpu
// Video case.
if (data->mData->GetType() == MediaSegment::VIDEO) {
if (data->mCommands) {
MOZ_ASSERT(!(data->mCommands & SourceMediaStream::TRACK_UNUSED));
for (MediaStreamListener* l : aStream->mListeners) {
l->NotifyQueuedTrackChanges(this, data->mID,
offset, static_cast<TrackEventCommand>(data->mCommands), *data->mData);
}
- } else {
- // Fixme: This part will be removed in the bug 1201363. It will be
- // removed in changeset "Do not copy video segment to StreamTracks in
- // TrackUnionStream."
-
- // Dealing with video and not TRACK_CREATE and TRACK_END case.
- for (MediaStreamListener* l : aStream->mListeners) {
- l->NotifyQueuedTrackChanges(this, data->mID,
- offset, static_cast<TrackEventCommand>(data->mCommands), *data->mData);
- }
}
}
for (TrackBound<MediaStreamTrackListener>& b : aStream->mTrackListeners) {
if (b.mTrackID != data->mID) {
continue;
}
b.mListener->NotifyQueuedChanges(this, offset, *data->mData);
--- a/dom/media/TrackUnionStream.cpp
+++ b/dom/media/TrackUnionStream.cpp
@@ -327,22 +327,16 @@ TrackUnionStream::TrackUnionStream() :
MediaStreamListener* l = mListeners[j];
// Separate Audio and Video.
if (segment->GetType() == MediaSegment::AUDIO) {
l->NotifyQueuedAudioData(Graph(), outputTrack->GetID(),
outputStart,
*static_cast<AudioSegment*>(segment),
map->mInputPort->GetSource(),
map->mInputTrackID);
- } else {
- // This part will be removed in bug 1201363.
- l->NotifyQueuedTrackChanges(Graph(), outputTrack->GetID(),
- outputStart, TrackEventCommand::TRACK_EVENT_NONE, *segment,
- map->mInputPort->GetSource(),
- map->mInputTrackID);
}
}
for (TrackBound<MediaStreamTrackListener>& b : mTrackListeners) {
if (b.mTrackID != outputTrack->GetID()) {
continue;
}
b.mListener->NotifyQueuedChanges(Graph(), outputStart, *segment);
}