Diff
Modified: trunk/Source/WebCore/ChangeLog (261342 => 261343)
--- trunk/Source/WebCore/ChangeLog 2020-05-07 23:08:44 UTC (rev 261342)
+++ trunk/Source/WebCore/ChangeLog 2020-05-07 23:17:26 UTC (rev 261343)
@@ -1,3 +1,13 @@
+2020-05-07 Youenn Fablet <you...@apple.com>
+
+ Remove AudioMediaStreamTrackRenderer::muted
+ https://bugs.webkit.org/show_bug.cgi?id=211289
+
+ Reviewed by Eric Carlson.
+
+ * platform/mediastream/AudioMediaStreamTrackRenderer.h:
+ muted is unnecessary since we are using start/stop instead.
+
2020-05-07 Eric Carlson <eric.carl...@apple.com>
[macOS] Playhead in Touch Bar continues when loading stalls
Modified: trunk/Source/WebCore/platform/mediastream/AudioMediaStreamTrackRenderer.h (261342 => 261343)
--- trunk/Source/WebCore/platform/mediastream/AudioMediaStreamTrackRenderer.h 2020-05-07 23:08:44 UTC (rev 261342)
+++ trunk/Source/WebCore/platform/mediastream/AudioMediaStreamTrackRenderer.h 2020-05-07 23:17:26 UTC (rev 261343)
@@ -50,7 +50,6 @@
// May be called on a background thread. It should only be called after start/before stop is called.
virtual void pushSamples(const WTF::MediaTime&, const PlatformAudioData&, const AudioStreamDescription&, size_t) = 0;
- virtual void setMuted(bool);
virtual void setVolume(float);
float volume() const;
@@ -70,13 +69,10 @@
WTFLogChannel& logChannel() const final;
#endif
- bool isMuted() const;
-
private:
static RendererCreator m_rendererCreator;
// Main thread writable members
- bool m_muted { false };
float m_volume { 1 };
#if !RELEASE_LOG_DISABLED
@@ -85,11 +81,6 @@
#endif
};
-inline void AudioMediaStreamTrackRenderer::setMuted(bool value)
-{
- m_muted = value;
-}
-
inline void AudioMediaStreamTrackRenderer::setVolume(float volume)
{
m_volume = volume;
@@ -100,12 +91,6 @@
return m_volume;
}
-
-inline bool AudioMediaStreamTrackRenderer::isMuted() const
-{
- return m_muted;
-}
-
#if !RELEASE_LOG_DISABLED
inline const Logger& AudioMediaStreamTrackRenderer::logger() const
{
Modified: trunk/Source/WebKit/ChangeLog (261342 => 261343)
--- trunk/Source/WebKit/ChangeLog 2020-05-07 23:08:44 UTC (rev 261342)
+++ trunk/Source/WebKit/ChangeLog 2020-05-07 23:17:26 UTC (rev 261343)
@@ -1,3 +1,18 @@
+2020-05-07 Youenn Fablet <you...@apple.com>
+
+ Remove AudioMediaStreamTrackRenderer::muted
+ https://bugs.webkit.org/show_bug.cgi?id=211289
+
+ Reviewed by Eric Carlson.
+
+ muted is unnecessary since we are using start/stop instead.
+
+ * GPUProcess/webrtc/RemoteAudioMediaStreamTrackRenderer.cpp:
+ * GPUProcess/webrtc/RemoteAudioMediaStreamTrackRenderer.h:
+ * GPUProcess/webrtc/RemoteAudioMediaStreamTrackRenderer.messages.in:
+ * WebProcess/GPU/webrtc/AudioMediaStreamTrackRenderer.cpp:
+ * WebProcess/GPU/webrtc/AudioMediaStreamTrackRenderer.h:
+
2020-05-07 Don Olmstead <don.olmst...@sony.com>
Remove unused USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
Modified: trunk/Source/WebKit/GPUProcess/webrtc/RemoteAudioMediaStreamTrackRenderer.cpp (261342 => 261343)
--- trunk/Source/WebKit/GPUProcess/webrtc/RemoteAudioMediaStreamTrackRenderer.cpp 2020-05-07 23:08:44 UTC (rev 261342)
+++ trunk/Source/WebKit/GPUProcess/webrtc/RemoteAudioMediaStreamTrackRenderer.cpp 2020-05-07 23:17:26 UTC (rev 261343)
@@ -90,11 +90,6 @@
m_renderer->clear();
}
-void RemoteAudioMediaStreamTrackRenderer::setMuted(bool value)
-{
- m_renderer->setMuted(value);
-}
-
void RemoteAudioMediaStreamTrackRenderer::setVolume(float value)
{
m_renderer->setVolume(value);
Modified: trunk/Source/WebKit/GPUProcess/webrtc/RemoteAudioMediaStreamTrackRenderer.h (261342 => 261343)
--- trunk/Source/WebKit/GPUProcess/webrtc/RemoteAudioMediaStreamTrackRenderer.h 2020-05-07 23:08:44 UTC (rev 261342)
+++ trunk/Source/WebKit/GPUProcess/webrtc/RemoteAudioMediaStreamTrackRenderer.h 2020-05-07 23:17:26 UTC (rev 261343)
@@ -55,7 +55,6 @@
void start();
void stop();
void clear();
- void setMuted(bool);
void setVolume(float);
void audioSamplesStorageChanged(const SharedMemory::Handle&, const WebCore::CAAudioStreamDescription&, uint64_t numberOfFrames);
void audioSamplesAvailable(MediaTime, uint64_t numberOfFrames, uint64_t startFrame, uint64_t endFrame);
Modified: trunk/Source/WebKit/GPUProcess/webrtc/RemoteAudioMediaStreamTrackRenderer.messages.in (261342 => 261343)
--- trunk/Source/WebKit/GPUProcess/webrtc/RemoteAudioMediaStreamTrackRenderer.messages.in 2020-05-07 23:08:44 UTC (rev 261342)
+++ trunk/Source/WebKit/GPUProcess/webrtc/RemoteAudioMediaStreamTrackRenderer.messages.in 2020-05-07 23:17:26 UTC (rev 261343)
@@ -28,7 +28,6 @@
Stop()
Clear()
- SetMuted(bool value)
SetVolume(float value)
AudioSamplesStorageChanged(WebKit::SharedMemory::Handle storageHandle, WebCore::CAAudioStreamDescription description, uint64_t numberOfFrames)
Modified: trunk/Source/WebKit/WebProcess/GPU/webrtc/AudioMediaStreamTrackRenderer.cpp (261342 => 261343)
--- trunk/Source/WebKit/WebProcess/GPU/webrtc/AudioMediaStreamTrackRenderer.cpp 2020-05-07 23:08:44 UTC (rev 261342)
+++ trunk/Source/WebKit/WebProcess/GPU/webrtc/AudioMediaStreamTrackRenderer.cpp 2020-05-07 23:17:26 UTC (rev 261343)
@@ -73,12 +73,6 @@
m_connection->send(Messages::RemoteAudioMediaStreamTrackRenderer::Clear { }, m_identifier);
}
-void AudioMediaStreamTrackRenderer::setMuted(bool value)
-{
- WebCore::AudioMediaStreamTrackRenderer::setMuted(value);
- m_connection->send(Messages::RemoteAudioMediaStreamTrackRenderer::SetMuted { value }, m_identifier);
-}
-
void AudioMediaStreamTrackRenderer::setVolume(float value)
{
WebCore::AudioMediaStreamTrackRenderer::setVolume(value);
Modified: trunk/Source/WebKit/WebProcess/GPU/webrtc/AudioMediaStreamTrackRenderer.h (261342 => 261343)
--- trunk/Source/WebKit/WebProcess/GPU/webrtc/AudioMediaStreamTrackRenderer.h 2020-05-07 23:08:44 UTC (rev 261342)
+++ trunk/Source/WebKit/WebProcess/GPU/webrtc/AudioMediaStreamTrackRenderer.h 2020-05-07 23:17:26 UTC (rev 261343)
@@ -56,7 +56,6 @@
void start() final;
void stop() final;
void clear() final;
- void setMuted(bool) final;
void setVolume(float) final;
void pushSamples(const MediaTime&, const WebCore::PlatformAudioData&, const WebCore::AudioStreamDescription&, size_t) final;