Title: [280891] releases/WebKitGTK/webkit-2.32/Source/WebCore
- Revision
- 280891
- Author
- [email protected]
- Date
- 2021-08-11 03:12:40 -0700 (Wed, 11 Aug 2021)
Log Message
Merge r274361 - Use refptr to PeerConnectionFactoryInterface
https://bugs.webkit.org/show_bug.cgi?id=222725
Patch by Rob Buis <[email protected]> on 2021-03-12
Reviewed by Youenn Fablet.
Use refptr instead of reference to PeerConnectionFactoryInterface.
* Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp:
(WebCore::LibWebRTCMediaEndpoint::LibWebRTCMediaEndpoint):
(WebCore::LibWebRTCMediaEndpoint::addTrack):
(WebCore::LibWebRTCMediaEndpoint::createSourceAndRTCTrack):
* Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.h:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog (280890 => 280891)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog 2021-08-11 09:47:27 UTC (rev 280890)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog 2021-08-11 10:12:40 UTC (rev 280891)
@@ -1,3 +1,18 @@
+2021-03-12 Rob Buis <[email protected]>
+
+ Use refptr to PeerConnectionFactoryInterface
+ https://bugs.webkit.org/show_bug.cgi?id=222725
+
+ Reviewed by Youenn Fablet.
+
+ Use refptr instead of reference to PeerConnectionFactoryInterface.
+
+ * Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp:
+ (WebCore::LibWebRTCMediaEndpoint::LibWebRTCMediaEndpoint):
+ (WebCore::LibWebRTCMediaEndpoint::addTrack):
+ (WebCore::LibWebRTCMediaEndpoint::createSourceAndRTCTrack):
+ * Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.h:
+
2021-03-09 Carlos Garcia Campos <[email protected]>
Suspend widget hierarchy updates while executing node insertion
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp (280890 => 280891)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp 2021-08-11 09:47:27 UTC (rev 280890)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp 2021-08-11 10:12:40 UTC (rev 280891)
@@ -64,7 +64,7 @@
LibWebRTCMediaEndpoint::LibWebRTCMediaEndpoint(LibWebRTCPeerConnectionBackend& peerConnection, LibWebRTCProvider& client)
: m_peerConnectionBackend(peerConnection)
- , m_peerConnectionFactory(*client.factory())
+ , m_peerConnectionFactory(client.factory())
, m_createSessionDescriptionObserver(*this)
, m_setLocalSessionDescriptionObserver(*this)
, m_setRemoteSessionDescriptionObserver(*this)
@@ -236,13 +236,13 @@
switch (track.privateTrack().type()) {
case RealtimeMediaSource::Type::Audio: {
auto audioSource = RealtimeOutgoingAudioSource::create(track.privateTrack());
- rtcTrack = m_peerConnectionFactory.CreateAudioTrack(track.id().utf8().data(), audioSource.ptr());
+ rtcTrack = m_peerConnectionFactory->CreateAudioTrack(track.id().utf8().data(), audioSource.ptr());
source = WTFMove(audioSource);
break;
}
case RealtimeMediaSource::Type::Video: {
auto videoSource = RealtimeOutgoingVideoSource::create(track.privateTrack());
- rtcTrack = m_peerConnectionFactory.CreateVideoTrack(track.id().utf8().data(), videoSource.ptr());
+ rtcTrack = m_peerConnectionFactory->CreateVideoTrack(track.id().utf8().data(), videoSource.ptr());
source = WTFMove(videoSource);
break;
}
@@ -456,13 +456,13 @@
break;
case RealtimeMediaSource::Type::Audio: {
auto audioSource = RealtimeOutgoingAudioSource::create(track.privateTrack());
- rtcTrack = m_peerConnectionFactory.CreateAudioTrack(track.id().utf8().data(), audioSource.ptr());
+ rtcTrack = m_peerConnectionFactory->CreateAudioTrack(track.id().utf8().data(), audioSource.ptr());
source = WTFMove(audioSource);
break;
}
case RealtimeMediaSource::Type::Video: {
auto videoSource = RealtimeOutgoingVideoSource::create(track.privateTrack());
- rtcTrack = m_peerConnectionFactory.CreateVideoTrack(track.id().utf8().data(), videoSource.ptr());
+ rtcTrack = m_peerConnectionFactory->CreateVideoTrack(track.id().utf8().data(), videoSource.ptr());
source = WTFMove(videoSource);
break;
}
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.h (280890 => 280891)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.h 2021-08-11 09:47:27 UTC (rev 280890)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.h 2021-08-11 10:12:40 UTC (rev 280891)
@@ -180,7 +180,7 @@
#endif
LibWebRTCPeerConnectionBackend& m_peerConnectionBackend;
- webrtc::PeerConnectionFactoryInterface& m_peerConnectionFactory;
+ rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface> m_peerConnectionFactory;
rtc::scoped_refptr<webrtc::PeerConnectionInterface> m_backend;
friend CreateSessionDescriptionObserver<LibWebRTCMediaEndpoint>;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
