Disable verification timer in case of capture suspension

youennf · youennf · commit b1f82bae092e · 2021-01-22T18:11:02.000Z
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): Canonical link: https://commits.webkit.org/233256@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@271749 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+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>
 
         [css-grid] Relayout grid items when definiteness changes.
diff --git a/Source/WebCore/platform/mediastream/RealtimeMediaSource.h b/Source/WebCore/platform/mediastream/RealtimeMediaSource.h
@@ -131,7 +131,7 @@ class WEBCORE_EXPORT RealtimeMediaSource
 
     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; }
     void setName(String&& name) { m_name = WTFMove(name); }
@@ -298,7 +298,6 @@ class WEBCORE_EXPORT RealtimeMediaSource
     bool m_pendingSettingsDidChangeNotification { false };
     bool m_echoCancellation { false };
     bool m_isProducingData { false };
-    bool m_interrupted { false };
     bool m_captureDidFailed { false };
     bool m_isEnded { false };
     bool m_hasStartedProducingData { false };
diff --git a/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm b/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm
@@ -164,7 +164,7 @@ static dispatch_queue_t globaVideoCaptureSerialQueue()
 
 void AVVideoCaptureSource::updateVerifyCapturingTimer()
 {
-    if (!m_isRunning) {
+    if (!m_isRunning || m_interrupted) {
         m_verifyCapturingTimer.stop();
         return;
     }
@@ -570,13 +570,14 @@ static inline int sensorOrientationFromVideoOutput(AVCaptureVideoDataOutput* vid
 void AVVideoCaptureSource::captureDeviceSuspendedDidChange()
 {
 #if !PLATFORM(IOS_FAMILY)
-    scheduleDeferredTask([this] {
-        auto isSuspended = [m_device isSuspended];
-        ALWAYS_LOG_IF(loggerPtr(), LOGIDENTIFIER, !!isSuspended);
-        if (isSuspended == muted())
-            return;
+    scheduleDeferredTask([this, logIdentifier = LOGIDENTIFIER] {
+        m_interrupted = [m_device isSuspended];
+        ALWAYS_LOG_IF(loggerPtr(), logIdentifier, !!m_interrupted);
+
+        updateVerifyCapturingTimer();
 
-        notifyMutedChange(isSuspended);
+        if (m_interrupted != muted())
+            notifyMutedChange(m_interrupted);
     });
 #endif
 }
