wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 993141 - Fix bug where we were assuming DataChannel::mStream corresponded to the level. r=jib

Browse Source
This commit is contained in:
Byron Campen [:bwc] 2014-04-07 15:21:06 -07:00
parent f8ce2f4279
commit b4264cd392
2 changed files with 22 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
View File

@ -1993,57 +1993,32 @@ PeerConnectionImpl::BuildStatsQuery_m(
// From the list of MediaPipelines, determine the set of NrIceMediaStreams
// we are interested in.
std::set<size_t> streamsGrabbed;
for (size_t p = 0; p < query->pipelines.Length(); ++p) {
size_t level = query->pipelines[p]->level();
MOZ_ASSERT(level);
// Don't grab the same stream twice, since that causes duplication
// of the ICE stats.
if (streamsGrabbed.count(level)) {
continue;
std::set<size_t> levelsToGrab;
if (trackId) {
for (size_t p = 0; p < query->pipelines.Length(); ++p) {
size_t level = query->pipelines[p]->level();
MOZ_ASSERT(level);
levelsToGrab.insert(level);
}
} else {
// We want to grab all streams, so ignore the pipelines (this also ends up
// grabbing DataChannel streams, which is what we want)
for (size_t s = 0; s < mMedia->num_ice_media_streams(); ++s) {
levelsToGrab.insert(s + 1); // mIceStreams is 0-indexed
}
}
streamsGrabbed.insert(level);
for (auto s = levelsToGrab.begin(); s != levelsToGrab.end(); ++s) {
// TODO(bcampen@mozilla.com): I may need to revisit this for bundle.
// (Bug 786234)
RefPtr<NrIceMediaStream> temp(mMedia->ice_media_stream(level - 1));
if (temp) {
RefPtr<NrIceMediaStream> temp(mMedia->ice_media_stream(*s - 1));
RefPtr<TransportFlow> flow(mMedia->GetTransportFlow(*s, false));
// flow can be null for unused levels, such as unused DataChannels
if (temp && flow) {
query->streams.AppendElement(temp);
} else {
CSFLogError(logTag, "Failed to get NrIceMediaStream for level %zu "
"in %s: %s",
static_cast<size_t>(level),
__FUNCTION__,
mHandle.c_str());
MOZ_CRASH();
}
}
// If the selector is null, we want to get ICE stats for the DataChannel
if (!aSelector && mDataConnection) {
std::vector<uint16_t> streamIds;
mDataConnection->GetStreamIds(&streamIds);
for (auto s = streamIds.begin(); s!= streamIds.end(); ++s) {
MOZ_ASSERT(*s);
if (streamsGrabbed.count(*s) || *s == INVALID_STREAM) {
continue;
}
streamsGrabbed.insert(*s);
RefPtr<NrIceMediaStream> temp(mMedia->ice_media_stream(*s - 1));
// This will be null if DataChannel is not in use
RefPtr<TransportFlow> flow(mMedia->GetTransportFlow(*s, false));
if (temp && flow) {
query->streams.AppendElement(temp);
}
}
}
return rv;
}

4
media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.h
View File

@ -279,6 +279,10 @@ class PeerConnectionMedia : public sigslot::has_slots<> {
return mIceStreams[i];
}
size_t num_ice_media_streams() const {
return mIceStreams.size();
}
// Add a stream
nsresult AddStream(nsIDOMMediaStream* aMediaStream, uint32_t *stream_id);