<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[208943] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/208943">208943</a></dd>
<dt>Author</dt> <dd>philn@webkit.org</dd>
<dt>Date</dt> <dd>2016-11-21 01:39:26 -0800 (Mon, 21 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Gstreamer] Add volume and mute support to the WebRTC mediaplayer
https://bugs.webkit.org/show_bug.cgi?id=153828
Reviewed by Darin Adler.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp:
(WebCore::MediaPlayerPrivateGStreamerOwr::setVolume): New implementation setting the OWR source volume property.
(WebCore::MediaPlayerPrivateGStreamerOwr::setMuted): New implementation setting the OWR source mute property.
(WebCore::MediaPlayerPrivateGStreamerOwr::maybeHandleChangeMutedState): Also set audio OWR source mute state depending on the track enabled state.
(WebCore::MediaPlayerPrivateGStreamerOwr::trackEnabledChanged): chain to maybeHandleChangeMuteState.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerOwrcpp">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerOwrh">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208942 => 208943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-21 09:29:22 UTC (rev 208942)
+++ trunk/Source/WebCore/ChangeLog 2016-11-21 09:39:26 UTC (rev 208943)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-11-21 Philippe Normand <pnormand@igalia.com>
+
+ [Gstreamer] Add volume and mute support to the WebRTC mediaplayer
+ https://bugs.webkit.org/show_bug.cgi?id=153828
+
+ Reviewed by Darin Adler.
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp:
+ (WebCore::MediaPlayerPrivateGStreamerOwr::setVolume): New implementation setting the OWR source volume property.
+ (WebCore::MediaPlayerPrivateGStreamerOwr::setMuted): New implementation setting the OWR source mute property.
+ (WebCore::MediaPlayerPrivateGStreamerOwr::maybeHandleChangeMutedState): Also set audio OWR source mute state depending on the track enabled state.
+ (WebCore::MediaPlayerPrivateGStreamerOwr::trackEnabledChanged): chain to maybeHandleChangeMuteState.
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.h:
+
</ins><span class="cx"> 2016-11-21 Alejandro G. Castro <alex@igalia.com> and Philippe Normand <pnormand@igalia.com>
</span><span class="cx">
</span><span class="cx"> [WebRTC][OpenWebRTC] RTP bundling support
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerOwrcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp (208942 => 208943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp 2016-11-21 09:29:22 UTC (rev 208942)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp 2016-11-21 09:39:26 UTC (rev 208943)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> #include "NotImplemented.h"
</span><span class="cx"> #include "RealtimeMediaSourceOwr.h"
</span><span class="cx"> #include "URL.h"
</span><del>-#include <gst/audio/streamvolume.h>
</del><span class="cx"> #include <owr/owr.h>
</span><span class="cx"> #include <owr/owr_gst_audio_renderer.h>
</span><span class="cx"> #include <owr/owr_gst_video_renderer.h>
</span><span class="lines">@@ -101,6 +100,32 @@
</span><span class="cx"> return m_audioTrack;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MediaPlayerPrivateGStreamerOwr::setVolume(float volume)
+{
+ if (!m_audioTrack)
+ return;
+
+ auto& realTimeMediaSource = static_cast<RealtimeMediaSourceOwr&>(m_audioTrack->source());
+ auto mediaSource = OWR_MEDIA_SOURCE(realTimeMediaSource.mediaSource());
+
+ GST_DEBUG("Setting volume: %f", volume);
+ g_object_set(mediaSource, "volume", static_cast<gdouble>(volume), nullptr);
+}
+
+void MediaPlayerPrivateGStreamerOwr::setMuted(bool muted)
+{
+ if (!m_audioTrack)
+ return;
+
+ auto& realTimeMediaSource = static_cast<RealtimeMediaSourceOwr&>(m_audioTrack->source());
+ auto mediaSource = OWR_MEDIA_SOURCE(realTimeMediaSource.mediaSource());
+ if (!mediaSource)
+ return;
+
+ GST_DEBUG("Setting mute: %s", muted ? "on":"off");
+ g_object_set(mediaSource, "mute", muted, nullptr);
+}
+
</ins><span class="cx"> float MediaPlayerPrivateGStreamerOwr::currentTime() const
</span><span class="cx"> {
</span><span class="cx"> gint64 position = GST_CLOCK_TIME_NONE;
</span><span class="lines">@@ -300,13 +325,13 @@
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateGStreamerOwr::maybeHandleChangeMutedState(MediaStreamTrackPrivate& track)
</span><span class="cx"> {
</span><del>- auto realTimeMediaSource = reinterpret_cast<RealtimeMediaSourceOwr*>(&track.source());
- auto mediaSource = OWR_MEDIA_SOURCE(realTimeMediaSource->mediaSource());
</del><ins>+ auto& realTimeMediaSource = static_cast<RealtimeMediaSourceOwr&>(track.source());
+ auto mediaSource = OWR_MEDIA_SOURCE(realTimeMediaSource.mediaSource());
</ins><span class="cx">
</span><del>- GST_DEBUG("%s track now %s", track.type() == RealtimeMediaSource::Audio ? "audio":"video", realTimeMediaSource->muted() ? "muted":"un-muted");
</del><ins>+ GST_DEBUG("%s track now %s", track.type() == RealtimeMediaSource::Audio ? "audio":"video", realTimeMediaSource.muted() ? "muted":"un-muted");
</ins><span class="cx"> switch (track.type()) {
</span><span class="cx"> case RealtimeMediaSource::Audio:
</span><del>- if (!realTimeMediaSource->muted()) {
</del><ins>+ if (!realTimeMediaSource.muted()) {
</ins><span class="cx"> g_object_set(m_audioRenderer.get(), "disabled", false, nullptr);
</span><span class="cx"> owr_media_renderer_set_source(OWR_MEDIA_RENDERER(m_audioRenderer.get()), mediaSource);
</span><span class="cx"> } else {
</span><span class="lines">@@ -313,9 +338,11 @@
</span><span class="cx"> g_object_set(m_audioRenderer.get(), "disabled", true, nullptr);
</span><span class="cx"> owr_media_renderer_set_source(OWR_MEDIA_RENDERER(m_audioRenderer.get()), nullptr);
</span><span class="cx"> }
</span><ins>+ if (mediaSource)
+ g_object_set(mediaSource, "mute", !track.enabled(), nullptr);
</ins><span class="cx"> break;
</span><span class="cx"> case RealtimeMediaSource::Video:
</span><del>- if (!realTimeMediaSource->muted()) {
</del><ins>+ if (!realTimeMediaSource.muted()) {
</ins><span class="cx"> g_object_set(m_videoRenderer.get(), "disabled", false, nullptr);
</span><span class="cx"> owr_media_renderer_set_source(OWR_MEDIA_RENDERER(m_videoRenderer.get()), mediaSource);
</span><span class="cx"> } else {
</span><span class="lines">@@ -333,9 +360,10 @@
</span><span class="cx"> GST_DEBUG("Track settings changed");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayerPrivateGStreamerOwr::trackEnabledChanged(MediaStreamTrackPrivate&)
</del><ins>+void MediaPlayerPrivateGStreamerOwr::trackEnabledChanged(MediaStreamTrackPrivate& track)
</ins><span class="cx"> {
</span><del>- GST_DEBUG("Track enabled changed");
</del><ins>+ GST_DEBUG("%s track now %s", track.type() == RealtimeMediaSource::Audio ? "audio":"video", track.enabled() ? "enabled":"disabled");
+ maybeHandleChangeMutedState(track);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> GstElement* MediaPlayerPrivateGStreamerOwr::createVideoSink()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerOwrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.h (208942 => 208943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.h 2016-11-21 09:29:22 UTC (rev 208942)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.h 2016-11-21 09:39:26 UTC (rev 208943)
</span><span class="lines">@@ -40,51 +40,54 @@
</span><span class="cx">
</span><span class="cx"> static void registerMediaEngine(MediaEngineRegistrar);
</span><span class="cx">
</span><del>- void setSize(const IntSize&) override;
</del><ins>+ void setSize(const IntSize&) final;
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- GstElement* createVideoSink() override;
- GstElement* audioSink() const override { return m_audioSink.get(); }
- bool isLiveStream() const override { return true; }
</del><ins>+ GstElement* createVideoSink() final;
+ GstElement* audioSink() const final { return m_audioSink.get(); }
+ bool isLiveStream() const final { return true; }
</ins><span class="cx">
</span><del>- String engineDescription() const override { return "OpenWebRTC"; }
</del><ins>+ String engineDescription() const final { return "OpenWebRTC"; }
</ins><span class="cx">
</span><del>- void load(const String&) override;
</del><ins>+ void load(const String&) final;
</ins><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><del>- void load(const String&, MediaSourcePrivateClient*) override;
</del><ins>+ void load(const String&, MediaSourcePrivateClient*) final;
</ins><span class="cx"> #endif
</span><del>- void load(MediaStreamPrivate&) override;
- void cancelLoad() override { }
</del><ins>+ void load(MediaStreamPrivate&) final;
+ void cancelLoad() final { }
</ins><span class="cx">
</span><del>- void prepareToPlay() override { }
- void play() override;
- void pause() override;
</del><ins>+ void prepareToPlay() final { }
+ void play() final;
+ void pause() final;
</ins><span class="cx">
</span><del>- bool hasVideo() const override;
- bool hasAudio() const override;
</del><ins>+ bool hasVideo() const final;
+ bool hasAudio() const final;
</ins><span class="cx">
</span><del>- float duration() const override { return 0; }
</del><ins>+ float duration() const final { return 0; }
</ins><span class="cx">
</span><del>- float currentTime() const override;
- void seek(float) override { }
- bool seeking() const override { return false; }
</del><ins>+ float currentTime() const final;
+ void seek(float) final { }
+ bool seeking() const final { return false; }
</ins><span class="cx">
</span><del>- void setRate(float) override { }
- void setPreservesPitch(bool) override { }
- bool paused() const override { return m_paused; }
</del><ins>+ void setRate(float) final { }
+ void setPreservesPitch(bool) final { }
+ bool paused() const final { return m_paused; }
</ins><span class="cx">
</span><del>- bool hasClosedCaptions() const override { return false; }
- void setClosedCaptionsVisible(bool) override { };
</del><ins>+ void setVolume(float) final;
+ void setMuted(bool) final;
</ins><span class="cx">
</span><del>- float maxTimeSeekable() const override { return 0; }
- std::unique_ptr<PlatformTimeRanges> buffered() const override { return std::make_unique<PlatformTimeRanges>(); }
- bool didLoadingProgress() const override;
</del><ins>+ bool hasClosedCaptions() const final { return false; }
+ void setClosedCaptionsVisible(bool) final { };
</ins><span class="cx">
</span><del>- unsigned long long totalBytes() const override { return 0; }
</del><ins>+ float maxTimeSeekable() const final { return 0; }
+ std::unique_ptr<PlatformTimeRanges> buffered() const final { return std::make_unique<PlatformTimeRanges>(); }
+ bool didLoadingProgress() const final;
</ins><span class="cx">
</span><del>- bool canLoadPoster() const override { return false; }
- void setPoster(const String&) override { }
</del><ins>+ unsigned long long totalBytes() const final { return 0; }
</ins><span class="cx">
</span><ins>+ bool canLoadPoster() const final { return false; }
+ void setPoster(const String&) final { }
+
</ins><span class="cx"> // MediaStreamTrackPrivate::Observer implementation.
</span><span class="cx"> void trackEnded(MediaStreamTrackPrivate&) final;
</span><span class="cx"> void trackMutedChanged(MediaStreamTrackPrivate&) final;
</span></span></pre>
</div>
</div>
</body>
</html>