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

--HG--
extra : transplant_source : %9Fk%8F%20%FE%12%FC%DF%A0%C6%02%AC%D2%3C%EE%08%26%E3%9E%27
This commit is contained in:
ctai 2016-05-31 18:05:11 +08:00
Родитель 06b9cfbf60
Коммит facfd7e206
2 изменённых файлов: 0 добавлений и 16 удалений

Просмотреть файл

@ -241,16 +241,6 @@ MediaStreamGraphImpl::ExtractPendingInput(SourceMediaStream* aStream,
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);
}
}
}

Просмотреть файл

@ -332,12 +332,6 @@ TrackUnionStream::TrackUnionStream() :
*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) {