Changeset 233425 in webkit

Timestamp:

Jul 2, 2018 10:29:03 AM (6 years ago)

Author:

youenn@apple.com

Message:

Reject getUserMedia promise if capture fails
​https://bugs.webkit.org/show_bug.cgi?id=187190

Reviewed by Eric Carlson.

In case PendingActivationMediaStream is notified of a change,
Check whether any track failed to capture.
If so, reject the promise.
Add more release logging in error case.

Covered by manual testing.

• Modules/mediastream/UserMediaRequest.cpp:

(WebCore::UserMediaRequest::PendingActivationMediaStream::~PendingActivationMediaStream):
(WebCore::UserMediaRequest::PendingActivationMediaStream::characteristicsChanged):
(WebCore::UserMediaRequest::mediaStreamIsReady):
(WebCore::UserMediaRequest::mediaStreamDidFail):

• Modules/mediastream/UserMediaRequest.h:
• platform/mediastream/MediaStreamPrivate.h:
• platform/mediastream/RealtimeMediaSource.cpp:

(WebCore::RealtimeMediaSource::captureFailed):

• platform/mediastream/mac/AVVideoCaptureSource.mm:

(WebCore::AVVideoCaptureSource::setupCaptureSession):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediastream/UserMediaRequest.cpp (modified) (2 diffs)
• Modules/mediastream/UserMediaRequest.h (modified) (1 diff)
• platform/mediastream/MediaStreamPrivate.h (modified) (1 diff)
• platform/mediastream/RealtimeMediaSource.cpp (modified) (2 diffs)
• platform/mediastream/mac/AVVideoCaptureSource.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-07-02  Youenn Fablet  <youenn@apple.com>
+
+        Reject getUserMedia promise if capture fails
+        https://bugs.webkit.org/show_bug.cgi?id=187190
+
+        Reviewed by Eric Carlson.
+
+        In case PendingActivationMediaStream is notified of a change,
+        Check whether any track failed to capture.
+        If so, reject the promise.
+        Add more release logging in error case.
+
+        Covered by manual testing.
+
+        * Modules/mediastream/UserMediaRequest.cpp:
+        (WebCore::UserMediaRequest::PendingActivationMediaStream::~PendingActivationMediaStream):
+        (WebCore::UserMediaRequest::PendingActivationMediaStream::characteristicsChanged):
+        (WebCore::UserMediaRequest::mediaStreamIsReady):
+        (WebCore::UserMediaRequest::mediaStreamDidFail):
+        * Modules/mediastream/UserMediaRequest.h:
+        * platform/mediastream/MediaStreamPrivate.h:
+        * platform/mediastream/RealtimeMediaSource.cpp:
+        (WebCore::RealtimeMediaSource::captureFailed):
+        * platform/mediastream/mac/AVVideoCaptureSource.mm:
+        (WebCore::AVVideoCaptureSource::setupCaptureSession):
+
 2018-07-01  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp

@@ -348 +348 @@
 void UserMediaRequest::PendingActivationMediaStream::characteristicsChanged()
 {
-    if (m_mediaStream->privateStream().hasVideo() || m_mediaStream->privateStream().hasAudio())
-        m_userMediaRequest.mediaStreamIsReady(m_mediaStream.copyRef());
+    if (!m_userMediaRequest.m_pendingActivationMediaStream)
+        return;
+
+    for (auto& track : m_mediaStream->privateStream().tracks()) {
+        if (track->source().captureDidFail()) {
+            m_userMediaRequest.mediaStreamDidFail(track->source().type());
+            return;
+        }
+    }
+
+    if (m_mediaStream->privateStream().hasVideo() || m_mediaStream->privateStream().hasAudio()) {
+        m_userMediaRequest.mediaStreamIsReady(WTFMove(m_mediaStream));
+        return;
+    }
 }
 
 void UserMediaRequest::mediaStreamIsReady(Ref<MediaStream>&& stream)
 {
+    RELEASE_LOG(MediaStream, "UserMediaRequest::mediaStreamIsReady");
     stream->document()->setHasCaptureMediaStreamTrack();
     m_promise.resolve(WTFMove(stream));
@@ -360 +373 @@
 }
 
+void UserMediaRequest::mediaStreamDidFail(RealtimeMediaSource::Type type)
+{
+    RELEASE_LOG(MediaStream, "UserMediaRequest::mediaStreamDidFail");
+    const char* typeDescription = "";
+    switch (type) {
+    case RealtimeMediaSource::Type::Audio:
+        typeDescription = "audio";
+        break;
+    case RealtimeMediaSource::Type::Video:
+        typeDescription = "video";
+        break;
+    case RealtimeMediaSource::Type::None:
+        typeDescription = "unknown";
+        break;
+    }
+    m_promise.reject(NotReadableError, makeString("Failed starting capture of a "_s, typeDescription, " track"_s));
+    // We are in an observer iterator loop, we do not want to change the observers within this loop.
+    callOnMainThread([stream = WTFMove(m_pendingActivationMediaStream)] { });
+}
+
 } // namespace WebCore
 

trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h

@@ -80 +80 @@
 
     void mediaStreamIsReady(Ref<MediaStream>&&);
+    void mediaStreamDidFail(RealtimeMediaSource::Type);
 
     class PendingActivationMediaStream : public RefCounted<PendingActivationMediaStream>, private MediaStreamPrivate::Observer {

trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h

@@ -91 +91 @@
     bool isProducingData() const;
 
-    void endStream();
-
     bool hasVideo() const;
     bool hasAudio() const;

trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp

@@ -37 +37 @@
 #include "RealtimeMediaSource.h"
 
+#include "Logging.h"
 #include "MediaConstraints.h"
 #include "NotImplemented.h"
@@ -188 +189 @@
 void RealtimeMediaSource::captureFailed()
 {
+    RELEASE_LOG_ERROR(MediaStream, "RealtimeMediaSource::captureFailed");
+
     m_isProducingData = false;
     m_captureDidFailed = true;

trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm

@@ -385 +385 @@
     RetainPtr<AVCaptureDeviceInputType> videoIn = adoptNS([allocAVCaptureDeviceInputInstance() initWithDevice:device() error:&error]);
     if (error) {
-        LOG(Media, "AVVideoCaptureSource::setupCaptureSession(%p), failed to allocate AVCaptureDeviceInput: %s", this, [[error localizedDescription] UTF8String]);
+        RELEASE_LOG(Media, "AVVideoCaptureSource::setupCaptureSession(%p), failed to allocate AVCaptureDeviceInput: %s", this, [[error localizedDescription] UTF8String]);
         return false;
     }
 
     if (![session() canAddInput:videoIn.get()]) {
-        LOG(Media, "AVVideoCaptureSource::setupCaptureSession(%p), unable to add video input device", this);
+        RELEASE_LOG(Media, "AVVideoCaptureSource::setupCaptureSession(%p), unable to add video input device", this);
         return false;
     }
@@ -410 +410 @@
 
     if (![session() canAddOutput:m_videoOutput.get()]) {
-        LOG(Media, "AVVideoCaptureSource::setupCaptureSession(%p), unable to add video sample buffer output delegate", this);
+        RELEASE_LOG(Media, "AVVideoCaptureSource::setupCaptureSession(%p), unable to add video sample buffer output delegate", this);
         return false;
     }