Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(505)

Unified Diff: third_party/WebKit/Source/modules/peerconnection/RTCPeerConnection.cpp

Issue 2759953003: Interface RTCRtpReceiver and RTCPeerConnection.getReceivers() added. (Closed)
Patch Set: DISALLOW_COPY_AND_ASSIGN Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/modules/peerconnection/RTCPeerConnection.cpp
diff --git a/third_party/WebKit/Source/modules/peerconnection/RTCPeerConnection.cpp b/third_party/WebKit/Source/modules/peerconnection/RTCPeerConnection.cpp
index e579e4ea5b8dbddaefefdc66952172ef8493a971..ff9640ce2538cfa468565fe6aa2b62c36ca63e78 100644
--- a/third_party/WebKit/Source/modules/peerconnection/RTCPeerConnection.cpp
+++ b/third_party/WebKit/Source/modules/peerconnection/RTCPeerConnection.cpp
@@ -32,6 +32,7 @@
#include <algorithm>
#include <memory>
+#include <set>
#include "bindings/core/v8/ExceptionMessages.h"
#include "bindings/core/v8/ExceptionState.h"
#include "bindings/core/v8/Microtask.h"
@@ -67,6 +68,7 @@
#include "modules/peerconnection/RTCOfferOptions.h"
#include "modules/peerconnection/RTCPeerConnectionErrorCallback.h"
#include "modules/peerconnection/RTCPeerConnectionIceEvent.h"
+#include "modules/peerconnection/RTCRtpReceiver.h"
#include "modules/peerconnection/RTCSessionDescription.h"
#include "modules/peerconnection/RTCSessionDescriptionCallback.h"
#include "modules/peerconnection/RTCSessionDescriptionInit.h"
@@ -1179,6 +1181,30 @@ ScriptPromise RTCPeerConnection::getStats(ScriptState* scriptState) {
return promise;
}
+HeapVector<Member<RTCRtpReceiver>> RTCPeerConnection::getReceivers() {
+ WebVector<std::unique_ptr<WebRTCRtpReceiver>> webRtpReceivers =
+ m_peerHandler->getReceivers();
+ HeapVector<Member<RTCRtpReceiver>> rtpReceivers(webRtpReceivers.size());
+ for (size_t i = 0; i < webRtpReceivers.size(); ++i) {
+ uintptr_t id = webRtpReceivers[i]->id();
+ const auto it = m_rtpReceivers.find(id);
+ if (it != m_rtpReceivers.end()) {
+ rtpReceivers[i] = it->value;
+ } else {
+ // There does not exist a |RTCRtpReceiver| for this |WebRTCRtpReceiver|
+ // yet, create it.
+ MediaStreamTrack* track =
+ getRemoteTrackById(webRtpReceivers[i]->track().id());
+ DCHECK(track);
+ RTCRtpReceiver* rtpReceiver =
+ new RTCRtpReceiver(std::move(webRtpReceivers[i]), track);
+ m_rtpReceivers.insert(id, rtpReceiver);
+ rtpReceivers[i] = rtpReceiver;
+ }
+ }
+ return rtpReceivers;
+}
+
RTCDataChannel* RTCPeerConnection::createDataChannel(
ScriptState* scriptState,
String label,
@@ -1234,6 +1260,29 @@ bool RTCPeerConnection::hasLocalStreamWithTrackId(const String& trackId) {
return false;
}
+MediaStreamTrack* RTCPeerConnection::getRemoteTrackById(
+ const String& trackId) const {
+ for (const auto& remoteStream : m_remoteStreams) {
+ MediaStreamTrack* track = remoteStream->getTrackById(trackId);
+ if (track)
+ return track;
+ }
+ return nullptr;
+}
+
+void RTCPeerConnection::removeInactiveReceivers() {
+ std::set<uintptr_t> inactiveReceiverIds;
+ for (uintptr_t id : m_rtpReceivers.keys()) {
+ inactiveReceiverIds.insert(id);
+ }
+ for (const auto& webRtpReceiver : m_peerHandler->getReceivers()) {
+ inactiveReceiverIds.erase(webRtpReceiver->id());
+ }
+ for (uintptr_t id : inactiveReceiverIds) {
+ m_rtpReceivers.erase(id);
+ }
+}
+
RTCDTMFSender* RTCPeerConnection::createDTMFSender(
MediaStreamTrack* track,
ExceptionState& exceptionState) {
@@ -1333,6 +1382,9 @@ void RTCPeerConnection::didRemoveRemoteStream(
DCHECK(pos != kNotFound);
m_remoteStreams.erase(pos);
+ // The receivers of removed tracks will have become inactive.
+ removeInactiveReceivers();
+
scheduleDispatchEvent(
MediaStreamEvent::create(EventTypeNames::removestream, stream));
}
@@ -1505,6 +1557,7 @@ void RTCPeerConnection::recordRapporMetrics() {
DEFINE_TRACE(RTCPeerConnection) {
visitor->trace(m_localStreams);
visitor->trace(m_remoteStreams);
+ visitor->trace(m_rtpReceivers);
visitor->trace(m_dispatchScheduledEventRunner);
visitor->trace(m_scheduledEvents);
EventTargetWithInlineData::trace(visitor);

Powered by Google App Engine
This is Rietveld 408576698