⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 236511 in webkit


Ignore:
Timestamp:
Sep 26, 2018, 11:21:52 AM (8 years ago)
Author:
eric.carlson@apple.com
Message:

[MediaStream] Clean up RealtimeMediaSource settings change handling
​https://bugs.webkit.org/show_bug.cgi?id=189998
<rdar://problem/44797884>

Reviewed by Youenn Fablet.

No new tests, no change in functionality.

  • platform/mediastream/RealtimeMediaSource.cpp:

(WebCore::RealtimeMediaSource::notifySettingsDidChangeObservers):
(WebCore::RealtimeMediaSource::setSize):
(WebCore::RealtimeMediaSource::setFrameRate):
(WebCore::RealtimeMediaSource::setAspectRatio):
(WebCore::RealtimeMediaSource::setFacingMode):
(WebCore::RealtimeMediaSource::setVolume):
(WebCore::RealtimeMediaSource::setSampleRate):
(WebCore::RealtimeMediaSource::setSampleSize):
(WebCore::RealtimeMediaSource::setEchoCancellation):
(WebCore::RealtimeMediaSource::settingsDidChange): Deleted.

  • platform/mediastream/RealtimeMediaSource.h:
  • platform/mediastream/mac/AVVideoCaptureSource.mm:

(WebCore::AVVideoCaptureSource::settingsDidChange):

  • platform/mediastream/mac/CoreAudioCaptureSource.cpp:

(WebCore::CoreAudioCaptureSource::settingsDidChange):

  • platform/mediastream/mac/DisplayCaptureSourceCocoa.cpp:

(WebCore::DisplayCaptureSourceCocoa::settingsDidChange):

  • platform/mock/MockRealtimeAudioSource.cpp:

(WebCore::MockRealtimeAudioSource::settingsDidChange):

  • platform/mock/MockRealtimeVideoSource.cpp:

(WebCore::MockRealtimeVideoSource::settingsDidChange):

Location:
trunk/Source/WebCore
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r236501 r236511  
     12018-09-26  Eric Carlson  <eric.carlson@apple.com>
     2
     3        [MediaStream] Clean up RealtimeMediaSource settings change handling
     4        https://bugs.webkit.org/show_bug.cgi?id=189998
     5        <rdar://problem/44797884>
     6
     7        Reviewed by Youenn Fablet.
     8
     9        No new tests, no change in functionality.
     10
     11        * platform/mediastream/RealtimeMediaSource.cpp:
     12        (WebCore::RealtimeMediaSource::notifySettingsDidChangeObservers):
     13        (WebCore::RealtimeMediaSource::setSize):
     14        (WebCore::RealtimeMediaSource::setFrameRate):
     15        (WebCore::RealtimeMediaSource::setAspectRatio):
     16        (WebCore::RealtimeMediaSource::setFacingMode):
     17        (WebCore::RealtimeMediaSource::setVolume):
     18        (WebCore::RealtimeMediaSource::setSampleRate):
     19        (WebCore::RealtimeMediaSource::setSampleSize):
     20        (WebCore::RealtimeMediaSource::setEchoCancellation):
     21        (WebCore::RealtimeMediaSource::settingsDidChange): Deleted.
     22        * platform/mediastream/RealtimeMediaSource.h:
     23        * platform/mediastream/mac/AVVideoCaptureSource.mm:
     24        (WebCore::AVVideoCaptureSource::settingsDidChange):
     25        * platform/mediastream/mac/CoreAudioCaptureSource.cpp:
     26        (WebCore::CoreAudioCaptureSource::settingsDidChange):
     27        * platform/mediastream/mac/DisplayCaptureSourceCocoa.cpp:
     28        (WebCore::DisplayCaptureSourceCocoa::settingsDidChange):
     29        * platform/mock/MockRealtimeAudioSource.cpp:
     30        (WebCore::MockRealtimeAudioSource::settingsDidChange):
     31        * platform/mock/MockRealtimeVideoSource.cpp:
     32        (WebCore::MockRealtimeVideoSource::settingsDidChange):
     33
    1342018-09-26  Antoine Quint  <graouts@apple.com>
    235

  • trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp

    r236015 r236511  
    134134void RealtimeMediaSource::settingsDidChange(OptionSet<RealtimeMediaSourceSettings::Flag>)
    135135{
     136}
     137
     138void RealtimeMediaSource::notifySettingsDidChangeObservers(OptionSet<RealtimeMediaSourceSettings::Flag> flags)
     139{
    136140    ASSERT(isMainThread());
    137141
    … …  
    139143        return;
    140144    m_pendingSettingsDidChangeNotification = true;
     145
     146    settingsDidChange(flags);
    141147
    142148    scheduleDeferredTask([this] {
    … …  
    865871
    866872    m_size = size;
    867     settingsDidChange(changed);
     873    notifySettingsDidChangeObservers(changed);
    868874}
    869875
    … …  
    874880
    875881    m_frameRate = rate;
    876     settingsDidChange(RealtimeMediaSourceSettings::Flag::FrameRate);
     882    notifySettingsDidChangeObservers(RealtimeMediaSourceSettings::Flag::FrameRate);
    877883}
    878884
    … …  
    884890    m_aspectRatio = ratio;
    885891    m_size.setHeight(m_size.width() / ratio);
    886     settingsDidChange({ RealtimeMediaSourceSettings::Flag::AspectRatio, RealtimeMediaSourceSettings::Flag::Height });
     892    notifySettingsDidChangeObservers({ RealtimeMediaSourceSettings::Flag::AspectRatio, RealtimeMediaSourceSettings::Flag::Height });
    887893}
    888894
    … …  
    893899
    894900    m_facingMode = mode;
    895     settingsDidChange(RealtimeMediaSourceSettings::Flag::FacingMode);
     901    notifySettingsDidChangeObservers(RealtimeMediaSourceSettings::Flag::FacingMode);
    896902}
    897903
    … …  
    902908
    903909    m_volume = volume;
    904     settingsDidChange(RealtimeMediaSourceSettings::Flag::Volume);
     910    notifySettingsDidChangeObservers(RealtimeMediaSourceSettings::Flag::Volume);
    905911}
    906912
    … …  
    911917
    912918    m_sampleRate = rate;
    913     settingsDidChange(RealtimeMediaSourceSettings::Flag::SampleRate);
     919    notifySettingsDidChangeObservers(RealtimeMediaSourceSettings::Flag::SampleRate);
    914920}
    915921
    … …  
    925931
    926932    m_sampleSize = size;
    927     settingsDidChange(RealtimeMediaSourceSettings::Flag::SampleSize);
     933    notifySettingsDidChangeObservers(RealtimeMediaSourceSettings::Flag::SampleSize);
    928934}
    929935
    … …  
    939945
    940946    m_echoCancellation = echoCancellation;
    941     settingsDidChange(RealtimeMediaSourceSettings::Flag::EchoCancellation);
     947    notifySettingsDidChangeObservers(RealtimeMediaSourceSettings::Flag::EchoCancellation);
    942948}
    943949

  • trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h

    r236015 r236511  
    248248    virtual void stopProducingData() { }
    249249
     250    void notifySettingsDidChangeObservers(OptionSet<RealtimeMediaSourceSettings::Flag>);
     251
    250252    void forEachObserver(const WTF::Function<void(Observer&)>&) const;
    251253

  • trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm

    r236422 r236511  
    230230}
    231231
    232 void AVVideoCaptureSource::settingsDidChange(OptionSet<RealtimeMediaSourceSettings::Flag> settings)
     232void AVVideoCaptureSource::settingsDidChange(OptionSet<RealtimeMediaSourceSettings::Flag>)
    233233{
    234234    m_currentSettings = std::nullopt;
    235     RealtimeMediaSource::settingsDidChange(settings);
    236235}
    237236

  • trunk/Source/WebCore/platform/mediastream/mac/CoreAudioCaptureSource.cpp

    r236015 r236511  
    889889
    890890    m_currentSettings = std::nullopt;
    891     RealtimeMediaSource::settingsDidChange(settings);
    892891}
    893892

  • trunk/Source/WebCore/platform/mediastream/mac/DisplayCaptureSourceCocoa.cpp

    r236494 r236511  
    118118
    119119    m_currentSettings = { };
    120 
    121     RealtimeMediaSource::settingsDidChange(settings);
    122120}
    123121

  • trunk/Source/WebCore/platform/mock/MockRealtimeAudioSource.cpp

    r236015 r236511  
    135135}
    136136
    137 void MockRealtimeAudioSource::settingsDidChange(OptionSet<RealtimeMediaSourceSettings::Flag> settings)
     137void MockRealtimeAudioSource::settingsDidChange(OptionSet<RealtimeMediaSourceSettings::Flag>)
    138138{
    139139    m_currentSettings = std::nullopt;
    140     RealtimeMediaSource::settingsDidChange(settings);
    141140}
    142141

  • trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp

    r236422 r236511  
    230230        m_imageBuffer = nullptr;
    231231    }
    232 
    233     RealtimeVideoSource::settingsDidChange(settings);
    234232}
    235233
Note: See TracChangeset for help on using the changeset viewer.