Changeset 218426 in webkit


Ignore:
Timestamp:
Jun 16, 2017 4:16:38 PM (7 years ago)
Author:
commit-queue@webkit.org
Message:

[iOS] Switching cameras in a WebRTC call makes black frames being sent
https://bugs.webkit.org/show_bug.cgi?id=173486

Patch by Youenn Fablet <youenn@apple.com> on 2017-06-16
Reviewed by Eric Carlson.

Source/WebCore:

Test: webrtc/video-replace-muted-track.html

  • platform/mediastream/mac/RealtimeOutgoingVideoSource.cpp:

(WebCore::RealtimeOutgoingVideoSource::updateBlackFramesSending):
Ensuring the timer is stopped if needed.
(WebCore::RealtimeOutgoingVideoSource::initializeFromSource):
Calling updateBlackFramesSending to stop sending frame if needed.

LayoutTests:

  • webrtc/video-replace-muted-track-expected.txt: Added.
  • webrtc/video-replace-muted-track.html: Added.
Location:
trunk
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r218425 r218426  
     12017-06-16  Youenn Fablet  <youenn@apple.com>
     2
     3        [iOS] Switching cameras in a WebRTC call makes black frames being sent
     4        https://bugs.webkit.org/show_bug.cgi?id=173486
     5
     6        Reviewed by Eric Carlson.
     7
     8        * webrtc/video-replace-muted-track-expected.txt: Added.
     9        * webrtc/video-replace-muted-track.html: Added.
     10
    1112017-06-16  Ryan Haddad  <ryanhaddad@apple.com>
    212
  • trunk/Source/WebCore/ChangeLog

    r218423 r218426  
     12017-06-16  Youenn Fablet  <youenn@apple.com>
     2
     3        [iOS] Switching cameras in a WebRTC call makes black frames being sent
     4        https://bugs.webkit.org/show_bug.cgi?id=173486
     5
     6        Reviewed by Eric Carlson.
     7
     8        Test: webrtc/video-replace-muted-track.html
     9
     10        * platform/mediastream/mac/RealtimeOutgoingVideoSource.cpp:
     11        (WebCore::RealtimeOutgoingVideoSource::updateBlackFramesSending):
     12        Ensuring the timer is stopped if needed.
     13        (WebCore::RealtimeOutgoingVideoSource::initializeFromSource):
     14        Calling updateBlackFramesSending to stop sending frame if needed.
     15
    1162017-06-16  Youenn Fablet  <youenn@apple.com>
    217
  • trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingVideoSource.cpp

    r218423 r218426  
    7575void RealtimeOutgoingVideoSource::updateBlackFramesSending()
    7676{
    77     if (!m_muted && m_enabled && m_blackFrameTimer.isActive()) {
    78         m_blackFrameTimer.stop();
     77    if (!m_muted && m_enabled) {
     78        if (m_blackFrameTimer.isActive())
     79            m_blackFrameTimer.stop();
    7980        return;
    8081    }
     
    110111    m_enabled = m_videoSource->enabled();
    111112
    112     sendBlackFramesIfNeeded();
     113    updateBlackFramesSending();
    113114}
    114115
Note: See TracChangeset for help on using the changeset viewer.