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 1055378 - getStats w/non-null track arg now returns stats for the right track. r=jesup

Browse Source
This commit is contained in:
Jan-Ivar Bruaroey 2014-08-21 23:51:44 -04:00
parent 7d1b84ad7e
commit 31e8af7e2e
2 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1308,19 +1308,6 @@ public:
mTimestamp.Construct(now);
}
};
// Specialized helper - push map[key] if specified or all map values onto array
static void
PushBackSelect(nsTArray<RefPtr<MediaPipeline>>& aDst,
const std::map<TrackID, RefPtr<mozilla::MediaPipeline>> & aSrc,
TrackID aKey = 0) {
auto begin = aKey ? aSrc.find(aKey) : aSrc.begin(), it = begin;
for (auto end = (aKey && begin != aSrc.end())? ++begin : aSrc.end();
it != end; ++it) {
aDst.AppendElement(it->second);
}
}
#endif
NS_IMETHODIMP
@ -2277,18 +2264,40 @@ PeerConnectionImpl::BuildStatsQuery_m(
}
// Gather up pipelines from mMedia so they may be inspected on STS
TrackID trackId = aSelector ? aSelector->GetTrackID() : 0;
for (int i = 0, len = mMedia->LocalStreamsLength(); i < len; i++) {
PushBackSelect(query->pipelines,
mMedia->GetLocalStream(i)->GetPipelines(),
trackId);
auto& pipelines = mMedia->GetLocalStream(i)->GetPipelines();
if (aSelector) {
if (mMedia->GetLocalStream(i)->GetMediaStream()->HasTrack(*aSelector)) {
// XXX use type instead of TrackID - bug 1056650
for (auto it = pipelines.begin(); it != pipelines.end(); ++it) {
if (it->second->IsVideo() == !!aSelector->AsVideoStreamTrack()) {
query->pipelines.AppendElement(it->second);
}
}
}
} else {
for (auto it = pipelines.begin(); it != pipelines.end(); ++it) {
query->pipelines.AppendElement(it->second);
}
}
}
for (int i = 0, len = mMedia->RemoteStreamsLength(); i < len; i++) {
PushBackSelect(query->pipelines,
mMedia->GetRemoteStream(i)->GetPipelines(),
trackId);
auto& pipelines = mMedia->GetRemoteStream(i)->GetPipelines();
if (aSelector) {
if (mMedia->GetRemoteStream(i)->GetMediaStream()->HasTrack(*aSelector)) {
for (auto it = pipelines.begin(); it != pipelines.end(); ++it) {
if (it->second->trackid() == aSelector->GetTrackID()) {
query->pipelines.AppendElement(it->second);
}
}
}
} else {
for (auto it = pipelines.begin(); it != pipelines.end(); ++it) {
query->pipelines.AppendElement(it->second);
}
}
}
query->iceCtx = mMedia->ice_ctx();
@ -2296,7 +2305,7 @@ PeerConnectionImpl::BuildStatsQuery_m(
// From the list of MediaPipelines, determine the set of NrIceMediaStreams
// we are interested in.
std::set<size_t> levelsToGrab;
if (trackId) {
if (aSelector) {
for (size_t p = 0; p < query->pipelines.Length(); ++p) {
size_t level = query->pipelines[p]->level();
MOZ_ASSERT(level);

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

@ -189,6 +189,10 @@ public:
MOZ_ASSERT(mMediaStream);
}
DOMMediaStream* GetMediaStream() const {
return mMediaStream;
}
// This method exists for stats and the unittests.
// It allows visibility into the pipelines and flows.
const std::map<mozilla::TrackID, mozilla::RefPtr<mozilla::MediaPipeline>>&
@ -214,9 +218,6 @@ public:
PeerConnectionMedia *aParent)
: SourceStreamInfo(aMediaStream, aParent) {}
DOMMediaStream* GetMediaStream() {
return mMediaStream;
}
// Returns the mPipelines index for the track or -1.
#if 0
int HasTrack(DOMMediaStream* aStream, mozilla::TrackID aTrack);
@ -262,9 +263,6 @@ class RemoteSourceStreamInfo : public SourceStreamInfo {
: SourceStreamInfo(aMediaStream, aParent),
mTrackTypeHints(0) {}
DOMMediaStream* GetMediaStream() {
return mMediaStream;
}
void StorePipeline(int aTrack, bool aIsVideo,
mozilla::RefPtr<mozilla::MediaPipelineReceive> aPipeline);