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

Changeset 236521 in webkit


Ignore:
Timestamp:
Sep 26, 2018, 1:31:29 PM (8 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r236511.
​https://bugs.webkit.org/show_bug.cgi?id=190008

It is breaking some WebRTC tests (Requested by youenn on
#webkit).

Reverted changeset:

"[MediaStream] Clean up RealtimeMediaSource settings change
handling"
​https://bugs.webkit.org/show_bug.cgi?id=189998
​https://trac.webkit.org/changeset/236511

Location:
trunk/Source/WebCore
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r236519 r236521  
     12018-09-26  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r236511.
     4        https://bugs.webkit.org/show_bug.cgi?id=190008
     5
     6        It is breaking some WebRTC tests (Requested by youenn on
     7        #webkit).
     8
     9        Reverted changeset:
     10
     11        "[MediaStream] Clean up RealtimeMediaSource settings change
     12        handling"
     13        https://bugs.webkit.org/show_bug.cgi?id=189998
     14        https://trac.webkit.org/changeset/236511
     15
    1162018-09-26  Ryosuke Niwa  <rniwa@webkit.org>
    217

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

    r236511 r236521  
    134134void RealtimeMediaSource::settingsDidChange(OptionSet<RealtimeMediaSourceSettings::Flag>)
    135135{
    136 }
    137 
    138 void RealtimeMediaSource::notifySettingsDidChangeObservers(OptionSet<RealtimeMediaSourceSettings::Flag> flags)
    139 {
    140136    ASSERT(isMainThread());
    141137
    … …  
    143139        return;
    144140    m_pendingSettingsDidChangeNotification = true;
    145 
    146     settingsDidChange(flags);
    147141
    148142    scheduleDeferredTask([this] {
    … …  
    871865
    872866    m_size = size;
    873     notifySettingsDidChangeObservers(changed);
     867    settingsDidChange(changed);
    874868}
    875869
    … …  
    880874
    881875    m_frameRate = rate;
    882     notifySettingsDidChangeObservers(RealtimeMediaSourceSettings::Flag::FrameRate);
     876    settingsDidChange(RealtimeMediaSourceSettings::Flag::FrameRate);
    883877}
    884878
    … …  
    890884    m_aspectRatio = ratio;
    891885    m_size.setHeight(m_size.width() / ratio);
    892     notifySettingsDidChangeObservers({ RealtimeMediaSourceSettings::Flag::AspectRatio, RealtimeMediaSourceSettings::Flag::Height });
     886    settingsDidChange({ RealtimeMediaSourceSettings::Flag::AspectRatio, RealtimeMediaSourceSettings::Flag::Height });
    893887}
    894888
    … …  
    899893
    900894    m_facingMode = mode;
    901     notifySettingsDidChangeObservers(RealtimeMediaSourceSettings::Flag::FacingMode);
     895    settingsDidChange(RealtimeMediaSourceSettings::Flag::FacingMode);
    902896}
    903897
    … …  
    908902
    909903    m_volume = volume;
    910     notifySettingsDidChangeObservers(RealtimeMediaSourceSettings::Flag::Volume);
     904    settingsDidChange(RealtimeMediaSourceSettings::Flag::Volume);
    911905}
    912906
    … …  
    917911
    918912    m_sampleRate = rate;
    919     notifySettingsDidChangeObservers(RealtimeMediaSourceSettings::Flag::SampleRate);
     913    settingsDidChange(RealtimeMediaSourceSettings::Flag::SampleRate);
    920914}
    921915
    … …  
    931925
    932926    m_sampleSize = size;
    933     notifySettingsDidChangeObservers(RealtimeMediaSourceSettings::Flag::SampleSize);
     927    settingsDidChange(RealtimeMediaSourceSettings::Flag::SampleSize);
    934928}
    935929
    … …  
    945939
    946940    m_echoCancellation = echoCancellation;
    947     notifySettingsDidChangeObservers(RealtimeMediaSourceSettings::Flag::EchoCancellation);
     941    settingsDidChange(RealtimeMediaSourceSettings::Flag::EchoCancellation);
    948942}
    949943

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

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

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

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

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

    r236511 r236521  
    889889
    890890    m_currentSettings = std::nullopt;
     891    RealtimeMediaSource::settingsDidChange(settings);
    891892}
    892893

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

    r236511 r236521  
    118118
    119119    m_currentSettings = { };
     120
     121    RealtimeMediaSource::settingsDidChange(settings);
    120122}
    121123

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

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

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

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