- Revision
- 236511
- Author
- eric.carl...@apple.com
- Date
- 2018-09-26 11:21:52 -0700 (Wed, 26 Sep 2018)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (236510 => 236511)
--- trunk/Source/WebCore/ChangeLog 2018-09-26 18:20:09 UTC (rev 236510)
+++ trunk/Source/WebCore/ChangeLog 2018-09-26 18:21:52 UTC (rev 236511)
@@ -1,3 +1,36 @@
+2018-09-26 Eric Carlson <eric.carl...@apple.com>
+
+ [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):
+
2018-09-26 Antoine Quint <grao...@apple.com>
[Web Animations] Ensure renderers with accelerated animations have layers
Modified: trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp (236510 => 236511)
--- trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp 2018-09-26 18:20:09 UTC (rev 236510)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp 2018-09-26 18:21:52 UTC (rev 236511)
@@ -133,6 +133,10 @@
void RealtimeMediaSource::settingsDidChange(OptionSet<RealtimeMediaSourceSettings::Flag>)
{
+}
+
+void RealtimeMediaSource::notifySettingsDidChangeObservers(OptionSet<RealtimeMediaSourceSettings::Flag> flags)
+{
ASSERT(isMainThread());
if (m_pendingSettingsDidChangeNotification)
@@ -139,6 +143,8 @@
return;
m_pendingSettingsDidChangeNotification = true;
+ settingsDidChange(flags);
+
scheduleDeferredTask([this] {
m_pendingSettingsDidChangeNotification = false;
forEachObserver([](auto& observer) {
@@ -864,7 +870,7 @@
changed.add(RealtimeMediaSourceSettings::Flag::Height);
m_size = size;
- settingsDidChange(changed);
+ notifySettingsDidChangeObservers(changed);
}
void RealtimeMediaSource::setFrameRate(double rate)
@@ -873,7 +879,7 @@
return;
m_frameRate = rate;
- settingsDidChange(RealtimeMediaSourceSettings::Flag::FrameRate);
+ notifySettingsDidChangeObservers(RealtimeMediaSourceSettings::Flag::FrameRate);
}
void RealtimeMediaSource::setAspectRatio(double ratio)
@@ -883,7 +889,7 @@
m_aspectRatio = ratio;
m_size.setHeight(m_size.width() / ratio);
- settingsDidChange({ RealtimeMediaSourceSettings::Flag::AspectRatio, RealtimeMediaSourceSettings::Flag::Height });
+ notifySettingsDidChangeObservers({ RealtimeMediaSourceSettings::Flag::AspectRatio, RealtimeMediaSourceSettings::Flag::Height });
}
void RealtimeMediaSource::setFacingMode(RealtimeMediaSourceSettings::VideoFacingMode mode)
@@ -892,7 +898,7 @@
return;
m_facingMode = mode;
- settingsDidChange(RealtimeMediaSourceSettings::Flag::FacingMode);
+ notifySettingsDidChangeObservers(RealtimeMediaSourceSettings::Flag::FacingMode);
}
void RealtimeMediaSource::setVolume(double volume)
@@ -901,7 +907,7 @@
return;
m_volume = volume;
- settingsDidChange(RealtimeMediaSourceSettings::Flag::Volume);
+ notifySettingsDidChangeObservers(RealtimeMediaSourceSettings::Flag::Volume);
}
void RealtimeMediaSource::setSampleRate(int rate)
@@ -910,7 +916,7 @@
return;
m_sampleRate = rate;
- settingsDidChange(RealtimeMediaSourceSettings::Flag::SampleRate);
+ notifySettingsDidChangeObservers(RealtimeMediaSourceSettings::Flag::SampleRate);
}
std::optional<Vector<int>> RealtimeMediaSource::discreteSampleRates() const
@@ -924,7 +930,7 @@
return;
m_sampleSize = size;
- settingsDidChange(RealtimeMediaSourceSettings::Flag::SampleSize);
+ notifySettingsDidChangeObservers(RealtimeMediaSourceSettings::Flag::SampleSize);
}
std::optional<Vector<int>> RealtimeMediaSource::discreteSampleSizes() const
@@ -938,7 +944,7 @@
return;
m_echoCancellation = echoCancellation;
- settingsDidChange(RealtimeMediaSourceSettings::Flag::EchoCancellation);
+ notifySettingsDidChangeObservers(RealtimeMediaSourceSettings::Flag::EchoCancellation);
}
void RealtimeMediaSource::scheduleDeferredTask(WTF::Function<void()>&& function)
Modified: trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h (236510 => 236511)
--- trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h 2018-09-26 18:20:09 UTC (rev 236510)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h 2018-09-26 18:21:52 UTC (rev 236511)
@@ -247,6 +247,8 @@
virtual void startProducingData() { }
virtual void stopProducingData() { }
+ void notifySettingsDidChangeObservers(OptionSet<RealtimeMediaSourceSettings::Flag>);
+
void forEachObserver(const WTF::Function<void(Observer&)>&) const;
bool m_muted { false };
Modified: trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm (236510 => 236511)
--- trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm 2018-09-26 18:20:09 UTC (rev 236510)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm 2018-09-26 18:21:52 UTC (rev 236511)
@@ -229,10 +229,9 @@
[m_session commitConfiguration];
}
-void AVVideoCaptureSource::settingsDidChange(OptionSet<RealtimeMediaSourceSettings::Flag> settings)
+void AVVideoCaptureSource::settingsDidChange(OptionSet<RealtimeMediaSourceSettings::Flag>)
{
m_currentSettings = std::nullopt;
- RealtimeMediaSource::settingsDidChange(settings);
}
const RealtimeMediaSourceSettings& AVVideoCaptureSource::settings()
Modified: trunk/Source/WebCore/platform/mediastream/mac/CoreAudioCaptureSource.cpp (236510 => 236511)
--- trunk/Source/WebCore/platform/mediastream/mac/CoreAudioCaptureSource.cpp 2018-09-26 18:20:09 UTC (rev 236510)
+++ trunk/Source/WebCore/platform/mediastream/mac/CoreAudioCaptureSource.cpp 2018-09-26 18:21:52 UTC (rev 236511)
@@ -888,7 +888,6 @@
}
m_currentSettings = std::nullopt;
- RealtimeMediaSource::settingsDidChange(settings);
}
void CoreAudioCaptureSource::scheduleReconfiguration()
Modified: trunk/Source/WebCore/platform/mediastream/mac/DisplayCaptureSourceCocoa.cpp (236510 => 236511)
--- trunk/Source/WebCore/platform/mediastream/mac/DisplayCaptureSourceCocoa.cpp 2018-09-26 18:20:09 UTC (rev 236510)
+++ trunk/Source/WebCore/platform/mediastream/mac/DisplayCaptureSourceCocoa.cpp 2018-09-26 18:21:52 UTC (rev 236511)
@@ -117,8 +117,6 @@
}
m_currentSettings = { };
-
- RealtimeMediaSource::settingsDidChange(settings);
}
void DisplayCaptureSourceCocoa::startProducingData()
Modified: trunk/Source/WebCore/platform/mock/MockRealtimeAudioSource.cpp (236510 => 236511)
--- trunk/Source/WebCore/platform/mock/MockRealtimeAudioSource.cpp 2018-09-26 18:20:09 UTC (rev 236510)
+++ trunk/Source/WebCore/platform/mock/MockRealtimeAudioSource.cpp 2018-09-26 18:21:52 UTC (rev 236511)
@@ -134,10 +134,9 @@
return m_capabilities.value();
}
-void MockRealtimeAudioSource::settingsDidChange(OptionSet<RealtimeMediaSourceSettings::Flag> settings)
+void MockRealtimeAudioSource::settingsDidChange(OptionSet<RealtimeMediaSourceSettings::Flag>)
{
m_currentSettings = std::nullopt;
- RealtimeMediaSource::settingsDidChange(settings);
}
void MockRealtimeAudioSource::startProducingData()
Modified: trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp (236510 => 236511)
--- trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp 2018-09-26 18:20:09 UTC (rev 236510)
+++ trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp 2018-09-26 18:21:52 UTC (rev 236511)
@@ -229,8 +229,6 @@
m_statsFontSize = m_baseFontSize * .5;
m_imageBuffer = nullptr;
}
-
- RealtimeVideoSource::settingsDidChange(settings);
}
void MockRealtimeVideoSource::startCaptureTimer()