Changeset 243404 in webkit

Timestamp:

Mar 22, 2019, 3:54:50 PM (7 years ago)

Author:

eric.carlson@apple.com

Message:

Flaky AVEncoderBitRateKey symbol not found crash on imported/w3c/web-platform-tests/mediacapture-record/MediaRecorder-constructor.html
​https://bugs.webkit.org/show_bug.cgi?id=193724
<rdar://problem/47483831>

Reviewed by Jer Noble.

The soft link macros occasionally fail to load constants from AVFoundation.framework
which are actually in one of its sub-frameworks. While we investigate the cause
cause of the failure, ise the SOFT_LINK_CONSTANT_MAY_FAIL so we can detect the failure
and return a local copy of the string instead of crashing.

No new tests, this should prevent existing tests from crashing.

• platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.mm:

(WebCore::myAVFormatIDKey):
(WebCore::myAVNumberOfChannelsKey):
(WebCore::myAVSampleRateKey):
(WebCore::myAVEncoderBitRateKey):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.mm (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-03-22  Eric Carlson  <eric.carlson@apple.com>
+
+        Flaky AVEncoderBitRateKey symbol not found crash on imported/w3c/web-platform-tests/mediacapture-record/MediaRecorder-constructor.html
+        https://bugs.webkit.org/show_bug.cgi?id=193724
+        <rdar://problem/47483831>
+
+        Reviewed by Jer Noble.
+
+        The soft link macros occasionally fail to load constants from AVFoundation.framework
+        which are actually in one of its sub-frameworks. While we investigate the cause
+        cause of the failure, ise the SOFT_LINK_CONSTANT_MAY_FAIL so we can detect the failure
+        and return a local copy of the string instead of crashing.
+        
+        No new tests, this should prevent existing tests from crashing.
+
+        * platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.mm:
+        (WebCore::myAVFormatIDKey):
+        (WebCore::myAVNumberOfChannelsKey):
+        (WebCore::myAVSampleRateKey):
+        (WebCore::myAVEncoderBitRateKey):
+
 2019-03-22  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.mm

@@ -53 +53 @@
 SOFT_LINK_CONSTANT(AVFoundation, AVMediaTypeVideo, NSString *)
 SOFT_LINK_CONSTANT(AVFoundation, AVMediaTypeAudio, NSString *)
-SOFT_LINK_CONSTANT(AVFoundation, AVEncoderBitRateKey, NSString *)
-SOFT_LINK_CONSTANT(AVFoundation, AVFormatIDKey, NSString *)
-SOFT_LINK_CONSTANT(AVFoundation, AVNumberOfChannelsKey, NSString *)
-SOFT_LINK_CONSTANT(AVFoundation, AVSampleRateKey, NSString *)
 
 SOFT_LINK_CONSTANT(AVFoundation, AVVideoExpectedSourceFrameRateKey, NSString *)
@@ -72 +68 @@
 #define AVVideoWidthKey getAVVideoWidthKey()
 #define AVVideoHeightKey getAVVideoHeightKey()
-#define AVEncoderBitRateKey getAVEncoderBitRateKey()
-#define AVFormatIDKey getAVFormatIDKey()
-#define AVNumberOfChannelsKey getAVNumberOfChannelsKey()
-#define AVSampleRateKey getAVSampleRateKey()
 
 #define AVVideoExpectedSourceFrameRateKey getAVVideoExpectedSourceFrameRateKey()
@@ -84 +76 @@
 #define AVVideoCompressionPropertiesKey getAVVideoCompressionPropertiesKey()
 
+SOFT_LINK_CONSTANT_MAY_FAIL(AVFoundation, AVEncoderBitRateKey, NSString *)
+SOFT_LINK_CONSTANT_MAY_FAIL(AVFoundation, AVFormatIDKey, NSString *)
+SOFT_LINK_CONSTANT_MAY_FAIL(AVFoundation, AVNumberOfChannelsKey, NSString *)
+SOFT_LINK_CONSTANT_MAY_FAIL(AVFoundation, AVSampleRateKey, NSString *)
+
+#define AVEncoderBitRateKey getAVEncoderBitRateKeyWithFallback()
+#define AVFormatIDKey getAVFormatIDKeyWithFallback()
+#define AVNumberOfChannelsKey getAVNumberOfChannelsKeyWithFallback()
+#define AVSampleRateKey getAVSampleRateKeyWithFallback()
+
 namespace WebCore {
 
 using namespace PAL;
+
+static NSString *getAVFormatIDKeyWithFallback()
+{
+    if (canLoadAVFormatIDKey())
+        return getAVFormatIDKey();
+
+    RELEASE_LOG_ERROR(Media, "Failed to load AVFormatIDKey");
+    return @"AVFormatIDKey";
+}
+
+static NSString *getAVNumberOfChannelsKeyWithFallback()
+{
+    if (canLoadAVNumberOfChannelsKey())
+        return getAVNumberOfChannelsKey();
+
+    RELEASE_LOG_ERROR(Media, "Failed to load AVNumberOfChannelsKey");
+    return @"AVNumberOfChannelsKey";
+}
+
+static NSString *getAVSampleRateKeyWithFallback()
+{
+    if (canLoadAVSampleRateKey())
+        return getAVSampleRateKey();
+
+    RELEASE_LOG_ERROR(Media, "Failed to load AVSampleRateKey");
+    return @"AVSampleRateKey";
+}
+
+static NSString *getAVEncoderBitRateKeyWithFallback()
+{
+    if (canLoadAVEncoderBitRateKey())
+        return getAVEncoderBitRateKey();
+
+    RELEASE_LOG_ERROR(Media, "Failed to load AVEncoderBitRateKey");
+    return @"AVEncoderBitRateKey";
+}
 
 RefPtr<MediaRecorderPrivateWriter> MediaRecorderPrivateWriter::create(const MediaStreamTrackPrivate* audioTrack, const MediaStreamTrackPrivate* videoTrack)