Diff
Modified: trunk/LayoutTests/ChangeLog (262904 => 262905)
--- trunk/LayoutTests/ChangeLog 2020-06-11 16:28:32 UTC (rev 262904)
+++ trunk/LayoutTests/ChangeLog 2020-06-11 17:14:07 UTC (rev 262905)
@@ -1,3 +1,13 @@
+2020-06-11 Youenn Fablet <[email protected]>
+
+ End a remote MediaStreamTrack if its source is ended
+ https://bugs.webkit.org/show_bug.cgi?id=213074
+
+ Reviewed by Eric Carlson.
+
+ * webrtc/receiver-track-should-stay-live-even-if-receiver-is-inactive-expected.txt: Added.
+ * webrtc/receiver-track-should-stay-live-even-if-receiver-is-inactive.html: Added.
+
2020-06-11 Oriol Brufau <[email protected]>
[css-grid] Reimport WPT tests removed in r262809
Added: trunk/LayoutTests/webrtc/receiver-track-should-stay-live-even-if-receiver-is-inactive-expected.txt (0 => 262905)
--- trunk/LayoutTests/webrtc/receiver-track-should-stay-live-even-if-receiver-is-inactive-expected.txt (rev 0)
+++ trunk/LayoutTests/webrtc/receiver-track-should-stay-live-even-if-receiver-is-inactive-expected.txt 2020-06-11 17:14:07 UTC (rev 262905)
@@ -0,0 +1,6 @@
+
+
+PASS Setup audio call
+PASS Inactivate the audio transceiver
+PASS Reactivate the audio transceiver
+
Added: trunk/LayoutTests/webrtc/receiver-track-should-stay-live-even-if-receiver-is-inactive.html (0 => 262905)
--- trunk/LayoutTests/webrtc/receiver-track-should-stay-live-even-if-receiver-is-inactive.html (rev 0)
+++ trunk/LayoutTests/webrtc/receiver-track-should-stay-live-even-if-receiver-is-inactive.html 2020-06-11 17:14:07 UTC (rev 262905)
@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8">
+ <title>Inactive/reactivate audio transceiver</title>
+ <script src=""
+ <script src=""
+</head>
+<body>
+ <video id="video" controls autoplay playsinline></video>
+ <script src =""
+ <script>
+ var pc1, pc2;
+ var remoteStream, remoteTrack;
+ promise_test(async (test) => {
+ const localStream = await navigator.mediaDevices.getUserMedia({audio: true });
+
+ await new Promise(resolve => {
+ createConnections((firstConnection) => {
+ pc1 = firstConnection;
+ firstConnection.addTrack(localStream.getAudioTracks()[0], localStream);
+ }, (secondConnection) => {
+ pc2 = secondConnection;
+ secondConnection._ontrack_ = (trackEvent) => {
+ remoteTrack = trackEvent.track;
+ remoteStream = trackEvent.streams[0];
+ resolve();
+ };
+ });
+ });
+ video.srcObject = remoteStream;
+ await video.play();
+ }, "Setup audio call");
+
+ promise_test(async (test) => {
+ pc1.getTransceivers()[0].direction = "inactive";
+ let offer = await pc1.createOffer();
+ await pc1.setLocalDescription(offer);
+
+ // Let's remove ssrc lines
+ let sdpLines = offer.sdp.split("\r\n");
+ offer.sdp = sdpLines.filter(line => line && line.length && !line.startsWith("a=ssrc")).join("\r\n") + "\r\n";
+
+ await pc2.setRemoteDescription(offer);
+ let answer = await pc2.createAnswer();
+ await pc2.setLocalDescription(answer);
+ await pc1.setRemoteDescription(answer);
+
+ // FIXME: The track should be live but is ended due to a bug in our backend.
+ assert_equals(remoteTrack.readyState, "ended");
+ }, "Inactivate the audio transceiver");
+
+ promise_test(async (test) => {
+ pc1.getTransceivers()[0].direction = "sendonly";
+ let offer = await pc1.createOffer();
+ await pc1.setLocalDescription(offer);
+ await pc2.setRemoteDescription(offer);
+ let answer = await pc2.createAnswer();
+ await pc2.setLocalDescription(answer);
+ await pc1.setRemoteDescription(answer);
+
+ // FIXME: The track should be live but is ended due to a bug in our backend.
+ assert_equals(remoteTrack.readyState, "ended");
+ }, "Reactivate the audio transceiver");
+ </script>
+</body>
+</html>
Modified: trunk/Source/WebCore/ChangeLog (262904 => 262905)
--- trunk/Source/WebCore/ChangeLog 2020-06-11 16:28:32 UTC (rev 262904)
+++ trunk/Source/WebCore/ChangeLog 2020-06-11 17:14:07 UTC (rev 262905)
@@ -1,3 +1,35 @@
+2020-06-11 Youenn Fablet <[email protected]>
+
+ End a remote MediaStreamTrack if its source is ended
+ https://bugs.webkit.org/show_bug.cgi?id=213074
+
+ Reviewed by Eric Carlson.
+
+ Make remote audio/video source observers of their webrtc source.
+ In case the webrtc source ends, end the source, thus its related tracks as well.
+ This is covered by the above test.
+
+ Test: webrtc/receiver-track-should-stay-live-even-if-receiver-is-inactive.html
+
+ * platform/mediastream/RealtimeIncomingAudioSource.cpp:
+ (WebCore::RealtimeIncomingAudioSource::RealtimeIncomingAudioSource):
+ (WebCore::RealtimeIncomingAudioSource::~RealtimeIncomingAudioSource):
+ (WebCore::RealtimeIncomingAudioSource::startProducingData):
+ (WebCore::RealtimeIncomingAudioSource::stopProducingData):
+ (WebCore::RealtimeIncomingAudioSource::OnChanged):
+ * platform/mediastream/RealtimeIncomingAudioSource.h:
+ * platform/mediastream/RealtimeIncomingVideoSource.cpp:
+ (WebCore::RealtimeIncomingVideoSource::RealtimeIncomingVideoSource):
+ (WebCore::RealtimeIncomingVideoSource::~RealtimeIncomingVideoSource):
+ (WebCore::RealtimeIncomingVideoSource::startProducingData):
+ (WebCore::RealtimeIncomingVideoSource::stopProducingData):
+ (WebCore::RealtimeIncomingVideoSource::OnChanged):
+ * platform/mediastream/RealtimeIncomingVideoSource.h:
+ * platform/mediastream/RealtimeMediaSource.cpp:
+ (WebCore::RealtimeMediaSource::requestToEnd):
+ (WebCore::RealtimeMediaSource::end):
+ * platform/mediastream/RealtimeMediaSource.h:
+
2020-06-11 Rob Buis <[email protected]>
Improve url-setters.html WPT test
Modified: trunk/Source/WebCore/platform/mediastream/RealtimeIncomingAudioSource.cpp (262904 => 262905)
--- trunk/Source/WebCore/platform/mediastream/RealtimeIncomingAudioSource.cpp 2020-06-11 16:28:32 UTC (rev 262904)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeIncomingAudioSource.cpp 2020-06-11 17:14:07 UTC (rev 262905)
@@ -43,25 +43,36 @@
, m_audioTrack(WTFMove(audioTrack))
{
ASSERT(m_audioTrack);
+ m_audioTrack->RegisterObserver(this);
}
RealtimeIncomingAudioSource::~RealtimeIncomingAudioSource()
{
stop();
+ m_audioTrack->UnregisterObserver(this);
}
void RealtimeIncomingAudioSource::startProducingData()
{
- if (m_audioTrack)
- m_audioTrack->AddSink(this);
+ m_audioTrack->AddSink(this);
}
void RealtimeIncomingAudioSource::stopProducingData()
{
- if (m_audioTrack)
- m_audioTrack->RemoveSink(this);
+ m_audioTrack->RemoveSink(this);
}
+void RealtimeIncomingAudioSource::OnChanged()
+{
+ callOnMainThread([this, weakThis = makeWeakPtr(this)] {
+ if (!weakThis)
+ return;
+
+ if (m_audioTrack->state() == webrtc::MediaStreamTrackInterface::kEnded)
+ end();
+ });
+}
+
const RealtimeMediaSourceCapabilities& RealtimeIncomingAudioSource::capabilities()
{
return RealtimeMediaSourceCapabilities::emptyCapabilities();
Modified: trunk/Source/WebCore/platform/mediastream/RealtimeIncomingAudioSource.h (262904 => 262905)
--- trunk/Source/WebCore/platform/mediastream/RealtimeIncomingAudioSource.h 2020-06-11 16:28:32 UTC (rev 262904)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeIncomingAudioSource.h 2020-06-11 17:14:07 UTC (rev 262905)
@@ -48,6 +48,7 @@
class RealtimeIncomingAudioSource
: public RealtimeMediaSource
, private webrtc::AudioTrackSinkInterface
+ , private webrtc::ObserverInterface
{
public:
static Ref<RealtimeIncomingAudioSource> create(rtc::scoped_refptr<webrtc::AudioTrackInterface>&&, String&&);
@@ -64,6 +65,9 @@
// webrtc::AudioTrackSinkInterface API
virtual void OnData(const void* /* audioData */, int /* bitsPerSample */, int /* sampleRate */, size_t /* numberOfChannels */, size_t /* numberOfFrames */) { };
+ // webrtc::ObserverInterface API
+ void OnChanged() final;
+
// RealtimeMediaSource API
void startProducingData() final;
void stopProducingData() final;
Modified: trunk/Source/WebCore/platform/mediastream/RealtimeIncomingVideoSource.cpp (262904 => 262905)
--- trunk/Source/WebCore/platform/mediastream/RealtimeIncomingVideoSource.cpp 2020-06-11 16:28:32 UTC (rev 262904)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeIncomingVideoSource.cpp 2020-06-11 17:14:07 UTC (rev 262905)
@@ -46,20 +46,37 @@
constraints.setSupportsHeight(true);
m_currentSettings = RealtimeMediaSourceSettings { };
m_currentSettings->setSupportedConstraints(WTFMove(constraints));
+
+ m_videoTrack->RegisterObserver(this);
}
+RealtimeIncomingVideoSource::~RealtimeIncomingVideoSource()
+{
+ stop();
+ m_videoTrack->UnregisterObserver(this);
+}
+
void RealtimeIncomingVideoSource::startProducingData()
{
- if (m_videoTrack)
- m_videoTrack->AddOrUpdateSink(this, rtc::VideoSinkWants());
+ m_videoTrack->AddOrUpdateSink(this, rtc::VideoSinkWants());
}
void RealtimeIncomingVideoSource::stopProducingData()
{
- if (m_videoTrack)
- m_videoTrack->RemoveSink(this);
+ m_videoTrack->RemoveSink(this);
}
+void RealtimeIncomingVideoSource::OnChanged()
+{
+ callOnMainThread([this, weakThis = makeWeakPtr(this)] {
+ if (!weakThis)
+ return;
+
+ if (m_videoTrack->state() == webrtc::MediaStreamTrackInterface::kEnded)
+ end();
+ });
+}
+
const RealtimeMediaSourceCapabilities& RealtimeIncomingVideoSource::capabilities()
{
return RealtimeMediaSourceCapabilities::emptyCapabilities();
Modified: trunk/Source/WebCore/platform/mediastream/RealtimeIncomingVideoSource.h (262904 => 262905)
--- trunk/Source/WebCore/platform/mediastream/RealtimeIncomingVideoSource.h 2020-06-11 16:28:32 UTC (rev 262904)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeIncomingVideoSource.h 2020-06-11 17:14:07 UTC (rev 262905)
@@ -50,13 +50,11 @@
class RealtimeIncomingVideoSource
: public RealtimeMediaSource
, private rtc::VideoSinkInterface<webrtc::VideoFrame>
+ , private webrtc::ObserverInterface
{
public:
static Ref<RealtimeIncomingVideoSource> create(rtc::scoped_refptr<webrtc::VideoTrackInterface>&&, String&&);
- ~RealtimeIncomingVideoSource()
- {
- stop();
- }
+ ~RealtimeIncomingVideoSource();
protected:
RealtimeIncomingVideoSource(rtc::scoped_refptr<webrtc::VideoTrackInterface>&&, String&&);
@@ -76,6 +74,9 @@
bool isIncomingVideoSource() const final { return true; }
+ // webrtc::ObserverInterface API
+ void OnChanged() final;
+
Optional<RealtimeMediaSourceSettings> m_currentSettings;
rtc::scoped_refptr<webrtc::VideoTrackInterface> m_videoTrack;
Modified: trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp (262904 => 262905)
--- trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp 2020-06-11 16:28:32 UTC (rev 262904)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp 2020-06-11 17:14:07 UTC (rev 262905)
@@ -256,6 +256,18 @@
if (hasObserverPreventingStopping)
return;
+ end(&callingObserver);
+}
+
+void RealtimeMediaSource::end(Observer* callingObserver)
+{
+ ALWAYS_LOG_IF(m_logger, LOGIDENTIFIER);
+
+ ASSERT(isMainThread());
+
+ if (m_isEnded)
+ return;
+
auto protectedThis = makeRef(*this);
stop();
@@ -263,7 +275,7 @@
hasEnded();
forEachObserver([&callingObserver](auto& observer) {
- if (&observer != &callingObserver)
+ if (&observer != callingObserver)
observer.sourceStopped();
});
}
Modified: trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h (262904 => 262905)
--- trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h 2020-06-11 16:28:32 UTC (rev 262904)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h 2020-06-11 17:14:07 UTC (rev 262905)
@@ -249,6 +249,8 @@
void forEachObserver(const Function<void(Observer&)>&);
+ void end(Observer* = nullptr);
+
private:
virtual void startProducingData() { }
virtual void stopProducingData() { }