Changeset 247525 in webkit

Timestamp:

Jul 17, 2019 11:32:23 AM (5 years ago)

Author:

youenn@apple.com

Message:

Hop to the main thread when doing logging in RealtimeIncomingVideoSourceCocoa
​https://bugs.webkit.org/show_bug.cgi?id=199865

Reviewed by Darin Adler.

LoggerHelper routines allow logging messages in system console and inspector console.
These routines iterate through a Vector of log observers which is not thread safe.
Document, the main log observer, also expects to be called on the main thread.
Manually tested (writing a layout test for this would require more than 2 seconds).

• platform/mediastream/mac/RealtimeIncomingVideoSourceCocoa.mm:

(WebCore::RealtimeIncomingVideoSourceCocoa::OnFrame):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mediastream/mac/RealtimeIncomingVideoSourceCocoa.mm (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-07-17  Youenn Fablet  <youenn@apple.com>
+
+        Hop to the main thread when doing logging in RealtimeIncomingVideoSourceCocoa
+        https://bugs.webkit.org/show_bug.cgi?id=199865
+
+        Reviewed by Darin Adler.
+
+        LoggerHelper routines allow logging messages in system console and inspector console.
+        These routines iterate through a Vector of log observers which is not thread safe.
+        Document, the main log observer, also expects to be called on the main thread.
+        Manually tested (writing a layout test for this would require more than 2 seconds).
+
+        * platform/mediastream/mac/RealtimeIncomingVideoSourceCocoa.mm:
+        (WebCore::RealtimeIncomingVideoSourceCocoa::OnFrame):
+
 2019-07-17  Commit Queue  <commit-queue@webkit.org>
 

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

@@ -159 +159 @@
 
 #if !RELEASE_LOG_DISABLED
-    if (!(++m_numberOfFrames % 60))
-        ALWAYS_LOG_IF(loggerPtr(), LOGIDENTIFIER, "frame ", m_numberOfFrames);
+    if (!(++m_numberOfFrames % 60)) {
+        callOnMainThread([this, protectedThis = makeRef(*this), numberOfFrames = m_numberOfFrames] {
+            ALWAYS_LOG_IF(loggerPtr(), LOGIDENTIFIER, "frame ", numberOfFrames);
+        });
+    }
 #endif
 
     auto pixelBuffer = pixelBufferFromVideoFrame(frame);
     if (!pixelBuffer) {
-        ERROR_LOG_IF(loggerPtr(), LOGIDENTIFIER, "Failed to get a pixel buffer from a frame");
+        callOnMainThread([this, protectedThis = makeRef(*this)] {
+            ERROR_LOG_IF(loggerPtr(), LOGIDENTIFIER, "Failed to get a pixel buffer from a frame");
+        });
         return;
     }
@@ -179 +184 @@
     OSStatus ostatus = CMVideoFormatDescriptionCreateForImageBuffer(kCFAllocatorDefault, (CVImageBufferRef)pixelBuffer, &formatDescription);
     if (ostatus != noErr) {
-        ERROR_LOG_IF(loggerPtr(), LOGIDENTIFIER, "Failed to initialize CMVideoFormatDescription with error ", static_cast<int>(ostatus));
+        callOnMainThread([this, protectedThis = makeRef(*this), ostatus] {
+            ERROR_LOG_IF(loggerPtr(), LOGIDENTIFIER, "Failed to initialize CMVideoFormatDescription with error ", static_cast<int>(ostatus));
+        });
         return;
     }
@@ -187 +194 @@
     CFRelease(formatDescription);
     if (ostatus != noErr) {
-        ERROR_LOG_IF(loggerPtr(), LOGIDENTIFIER, "Failed to create the sample buffer with error ", static_cast<int>(ostatus));
+        callOnMainThread([this, protectedThis = makeRef(*this), ostatus] {
+            ERROR_LOG_IF(loggerPtr(), LOGIDENTIFIER, "Failed to create the sample buffer with error ", static_cast<int>(ostatus));
+        });
         return;
     }