Title: [243850] trunk/Source
- Revision
- 243850
- Author
- [email protected]
- Date
- 2019-04-03 20:34:53 -0700 (Wed, 03 Apr 2019)
Log Message
Add logging and ASSERTs to investigate issue with VPModuleInitialize
https://bugs.webkit.org/show_bug.cgi?id=196573
Reviewed by Eric Carlson.
Source/ThirdParty/libwebrtc:
Expand macros directly to add some logging.
Removed the dispatch_once since VPModuleInitialize is already called in one.
* Source/webrtc/sdk/WebKit/VideoProcessingSoftLink.cpp:
(webrtc::initVideoProcessingVPModuleInitialize):
Source/WebCore:
Add some ASSERTs.
No change of behavior.
* platform/mediastream/libwebrtc/LibWebRTCProviderCocoa.cpp:
(WebCore::LibWebRTCProviderCocoa::createDecoderFactory):
(WebCore::LibWebRTCProviderCocoa::createEncoderFactory):
Modified Paths
Diff
Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (243849 => 243850)
--- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2019-04-04 03:23:11 UTC (rev 243849)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2019-04-04 03:34:53 UTC (rev 243850)
@@ -1,5 +1,18 @@
2019-04-03 Youenn Fablet <[email protected]>
+ Add logging and ASSERTs to investigate issue with VPModuleInitialize
+ https://bugs.webkit.org/show_bug.cgi?id=196573
+
+ Reviewed by Eric Carlson.
+
+ Expand macros directly to add some logging.
+ Removed the dispatch_once since VPModuleInitialize is already called in one.
+
+ * Source/webrtc/sdk/WebKit/VideoProcessingSoftLink.cpp:
+ (webrtc::initVideoProcessingVPModuleInitialize):
+
+2019-04-03 Youenn Fablet <[email protected]>
+
Remove unneeded libwebrtc files
https://bugs.webkit.org/show_bug.cgi?id=196553
Modified: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/VideoProcessingSoftLink.cpp (243849 => 243850)
--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/VideoProcessingSoftLink.cpp 2019-04-04 03:23:11 UTC (rev 243849)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/VideoProcessingSoftLink.cpp 2019-04-04 03:34:53 UTC (rev 243850)
@@ -67,8 +67,23 @@
}
SOFT_LINK_PRIVATE_FRAMEWORK_FOR_SOURCE(webrtc, VideoProcessing)
-SOFT_LINK_FUNCTION_FOR_SOURCE(webrtc, VideoProcessing, VPModuleInitialize, void, (), ())
+namespace webrtc {
+static void initVideoProcessingVPModuleInitialize();
+void (*softLinkVideoProcessingVPModuleInitialize) () = initVideoProcessingVPModuleInitialize;
+static void initVideoProcessingVPModuleInitialize()
+{
+ auto* library = VideoProcessingLibrary();
+ if (!library)
+ fprintf(stderr, "Cannot find VideoProcessingLibrary: %s\n", dlerror());
+ softLinkVideoProcessingVPModuleInitialize = (void (*)()) dlsym(library, "VPModuleInitialize");
+ if (!softLinkVideoProcessingVPModuleInitialize)
+ fprintf(stderr, "Cannot find function VPModuleInitialize: %s\n", dlerror());
+ softLinkVideoProcessingVPModuleInitialize();
+}
+
+}
+
#endif
#if ENABLE_VCP_ENCODER
Modified: trunk/Source/WebCore/ChangeLog (243849 => 243850)
--- trunk/Source/WebCore/ChangeLog 2019-04-04 03:23:11 UTC (rev 243849)
+++ trunk/Source/WebCore/ChangeLog 2019-04-04 03:34:53 UTC (rev 243850)
@@ -1,3 +1,17 @@
+2019-04-03 Youenn Fablet <[email protected]>
+
+ Add logging and ASSERTs to investigate issue with VPModuleInitialize
+ https://bugs.webkit.org/show_bug.cgi?id=196573
+
+ Reviewed by Eric Carlson.
+
+ Add some ASSERTs.
+ No change of behavior.
+
+ * platform/mediastream/libwebrtc/LibWebRTCProviderCocoa.cpp:
+ (WebCore::LibWebRTCProviderCocoa::createDecoderFactory):
+ (WebCore::LibWebRTCProviderCocoa::createEncoderFactory):
+
2019-04-03 Simon Fraser <[email protected]>
Remove some redundant memebers from ScrollingStateFrameScrollingNode
Modified: trunk/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProviderCocoa.cpp (243849 => 243850)
--- trunk/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProviderCocoa.cpp 2019-04-04 03:23:11 UTC (rev 243849)
+++ trunk/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProviderCocoa.cpp 2019-04-04 03:34:53 UTC (rev 243850)
@@ -51,6 +51,8 @@
std::unique_ptr<webrtc::VideoDecoderFactory> LibWebRTCProviderCocoa::createDecoderFactory()
{
+ ASSERT(isMainThread());
+
auto codecSupport = m_supportsVP8 ? webrtc::WebKitCodecSupport::H264AndVP8 : webrtc::WebKitCodecSupport::H264;
return webrtc::createWebKitDecoderFactory(codecSupport);
}
@@ -57,6 +59,8 @@
std::unique_ptr<webrtc::VideoEncoderFactory> LibWebRTCProviderCocoa::createEncoderFactory()
{
+ ASSERT(isMainThread());
+
auto codecSupport = m_supportsVP8 ? webrtc::WebKitCodecSupport::H264AndVP8 : webrtc::WebKitCodecSupport::H264;
return webrtc::createWebKitEncoderFactory(codecSupport);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
