Changeset 243850 in webkit


Ignore:
Timestamp:
Apr 3, 2019 8:34:53 PM (5 years ago)
Author:
youenn@apple.com
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):

Location:
trunk/Source
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/ThirdParty/libwebrtc/ChangeLog

    r243837 r243850  
     12019-04-03  Youenn Fablet  <youenn@apple.com>
     2
     3        Add logging and ASSERTs to investigate issue with VPModuleInitialize
     4        https://bugs.webkit.org/show_bug.cgi?id=196573
     5
     6        Reviewed by Eric Carlson.
     7
     8        Expand macros directly to add some logging.
     9        Removed the dispatch_once since VPModuleInitialize is already called in one.
     10
     11        * Source/webrtc/sdk/WebKit/VideoProcessingSoftLink.cpp:
     12        (webrtc::initVideoProcessingVPModuleInitialize):
     13
    1142019-04-03  Youenn Fablet  <youenn@apple.com>
    215
  • trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/VideoProcessingSoftLink.cpp

    r243811 r243850  
    6868
    6969SOFT_LINK_PRIVATE_FRAMEWORK_FOR_SOURCE(webrtc, VideoProcessing)
    70 SOFT_LINK_FUNCTION_FOR_SOURCE(webrtc, VideoProcessing, VPModuleInitialize, void, (), ())
     70
     71namespace webrtc {
     72static void initVideoProcessingVPModuleInitialize();
     73void (*softLinkVideoProcessingVPModuleInitialize) () = initVideoProcessingVPModuleInitialize;
     74static void initVideoProcessingVPModuleInitialize()
     75{
     76    auto* library = VideoProcessingLibrary();
     77    if (!library)
     78        fprintf(stderr, "Cannot find VideoProcessingLibrary: %s\n", dlerror());
     79    softLinkVideoProcessingVPModuleInitialize = (void (*)()) dlsym(library, "VPModuleInitialize");
     80    if (!softLinkVideoProcessingVPModuleInitialize)
     81        fprintf(stderr, "Cannot find function VPModuleInitialize: %s\n", dlerror());
     82    softLinkVideoProcessingVPModuleInitialize();
     83}
     84
     85}
    7186
    7287#endif
  • trunk/Source/WebCore/ChangeLog

    r243846 r243850  
     12019-04-03  Youenn Fablet  <youenn@apple.com>
     2
     3        Add logging and ASSERTs to investigate issue with VPModuleInitialize
     4        https://bugs.webkit.org/show_bug.cgi?id=196573
     5
     6        Reviewed by Eric Carlson.
     7
     8        Add some ASSERTs.
     9        No change of behavior.
     10
     11        * platform/mediastream/libwebrtc/LibWebRTCProviderCocoa.cpp:
     12        (WebCore::LibWebRTCProviderCocoa::createDecoderFactory):
     13        (WebCore::LibWebRTCProviderCocoa::createEncoderFactory):
     14
    1152019-04-03  Simon Fraser  <simon.fraser@apple.com>
    216
  • trunk/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProviderCocoa.cpp

    r238159 r243850  
    5252std::unique_ptr<webrtc::VideoDecoderFactory> LibWebRTCProviderCocoa::createDecoderFactory()
    5353{
     54    ASSERT(isMainThread());
     55
    5456    auto codecSupport = m_supportsVP8 ? webrtc::WebKitCodecSupport::H264AndVP8 : webrtc::WebKitCodecSupport::H264;
    5557    return webrtc::createWebKitDecoderFactory(codecSupport);
     
    5860std::unique_ptr<webrtc::VideoEncoderFactory> LibWebRTCProviderCocoa::createEncoderFactory()
    5961{
     62    ASSERT(isMainThread());
     63
    6064    auto codecSupport = m_supportsVP8 ? webrtc::WebKitCodecSupport::H264AndVP8 : webrtc::WebKitCodecSupport::H264;
    6165    return webrtc::createWebKitEncoderFactory(codecSupport);
Note: See TracChangeset for help on using the changeset viewer.