Changeset 271749 in webkit

Timestamp:

Jan 22, 2021 10:11:02 AM (18 months ago)

Author:

youenn@apple.com

Message:

Disable verification timer in case of capture suspension
​https://bugs.webkit.org/show_bug.cgi?id=220859

Reviewed by Eric Carlson.

In case of suspension/unsuspension, make it as if the capture was interrupted.
Update updateVerifyCapturingTimer to stop timer it capture is interrupted.

Remove RealtimeMediaSource::m_interrupted which is unused and potentially confusing.
Manually tested.

• platform/mediastream/RealtimeMediaSource.h:
• platform/mediastream/mac/AVVideoCaptureSource.mm:

(WebCore::AVVideoCaptureSource::updateVerifyCapturingTimer):
(WebCore::AVVideoCaptureSource::captureDeviceSuspendedDidChange):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-01-22  Youenn Fablet  <youenn@apple.com>
+
+        Disable verification timer in case of capture suspension
+        https://bugs.webkit.org/show_bug.cgi?id=220859
+
+        Reviewed by Eric Carlson.
+
+        In case of suspension/unsuspension, make it as if the capture was interrupted.
+        Update updateVerifyCapturingTimer to stop timer it capture is interrupted.
+
+        Remove RealtimeMediaSource::m_interrupted which is unused and potentially confusing.
+        Manually tested.
+
+        * platform/mediastream/RealtimeMediaSource.h:
+        * platform/mediastream/mac/AVVideoCaptureSource.mm:
+        (WebCore::AVVideoCaptureSource::updateVerifyCapturingTimer):
+        (WebCore::AVVideoCaptureSource::captureDeviceSuspendedDidChange):
+
 2021-01-22  Ziran Sun  <zsun@igalia.com>
 

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

@@ -132 +132 @@
     bool captureDidFail() const { return m_captureDidFailed; }
 
-    virtual bool interrupted() const { return m_interrupted; }
+    virtual bool interrupted() const { return false; }
 
     const String& name() const { return m_name; }
@@ -299 +299 @@
     bool m_echoCancellation { false };
     bool m_isProducingData { false };
-    bool m_interrupted { false };
     bool m_captureDidFailed { false };
     bool m_isEnded { false };

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

@@ -165 +165 @@
 void AVVideoCaptureSource::updateVerifyCapturingTimer()
 {
-    if (!m_isRunning) {
+    if (!m_isRunning || m_interrupted) {
         m_verifyCapturingTimer.stop();
         return;
@@ -571 +571 @@
 {
 #if !PLATFORM(IOS_FAMILY)
-    scheduleDeferredTask([this] {
-        auto isSuspended = [m_device isSuspended];
-        ALWAYS_LOG_IF(loggerPtr(), LOGIDENTIFIER, !!isSuspended);
-        if (isSuspended == muted())
-            return;
-
-        notifyMutedChange(isSuspended);
+    scheduleDeferredTask([this, logIdentifier = LOGIDENTIFIER] {
+        m_interrupted = [m_device isSuspended];
+        ALWAYS_LOG_IF(loggerPtr(), logIdentifier, !!m_interrupted);
+
+        updateVerifyCapturingTimer();
+
+        if (m_interrupted != muted())
+            notifyMutedChange(m_interrupted);
     });
 #endif