Changeset 209125 in webkit

Timestamp:

Nov 30, 2016 12:36:45 AM (7 years ago)

Author:

Philippe Normand

Message:

[WebRTC][OpenWebRTC] Temporary device selection support
​https://bugs.webkit.org/show_bug.cgi?id=165141

Reviewed by Alejandro G. Castro.

Make sure the player handles only one audio and video track at
most for now. The device choice can be influenced with the
WEBKIT_VIDEO_DEVICE and WEBKIT_AUDIO_DEVICE environment variables.
Each variable optionally holds the name of the device to use.

• platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp:

(WebCore::MediaPlayerPrivateGStreamerOwr::play):
(WebCore::MediaPlayerPrivateGStreamerOwr::load):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-11-29  Philippe Normand  <pnormand@igalia.com>
+
+        [WebRTC][OpenWebRTC] Temporary device selection support
+        https://bugs.webkit.org/show_bug.cgi?id=165141
+
+        Reviewed by Alejandro G. Castro.
+
+        Make sure the player handles only one audio and video track at
+        most for now. The device choice can be influenced with the
+        WEBKIT_VIDEO_DEVICE and WEBKIT_AUDIO_DEVICE environment variables.
+        Each variable optionally holds the name of the device to use.
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp:
+        (WebCore::MediaPlayerPrivateGStreamerOwr::play):
+        (WebCore::MediaPlayerPrivateGStreamerOwr::load):
+
 2016-11-29  Claudio Saavedra  <csaavedra@igalia.com>
 

trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp

@@ -74 +74 @@
     GST_DEBUG("Connecting to live stream, descriptor: %p", m_streamPrivate.get());
 
+    if (m_videoTrack)
+        maybeHandleChangeMutedState(*m_videoTrack.get());
+
+    if (m_audioTrack)
+        maybeHandleChangeMutedState(*m_audioTrack.get());
+}
+
+void MediaPlayerPrivateGStreamerOwr::pause()
+{
+    GST_DEBUG("Pause");
+    m_paused = true;
+    stop();
+}
+
+bool MediaPlayerPrivateGStreamerOwr::hasVideo() const
+{
+    return m_videoTrack;
+}
+
+bool MediaPlayerPrivateGStreamerOwr::hasAudio() const
+{
+    return m_audioTrack;
+}
+
+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);
+}
+
+float MediaPlayerPrivateGStreamerOwr::currentTime() const
+{
+    gint64 position = GST_CLOCK_TIME_NONE;
+    GstQuery* query = gst_query_new_position(GST_FORMAT_TIME);
+
+    if (m_videoTrack && gst_element_query(m_videoSink.get(), query))
+        gst_query_parse_position(query, 0, &position);
+    else if (m_audioTrack && gst_element_query(m_audioSink.get(), query))
+        gst_query_parse_position(query, 0, &position);
+
+    float result = 0;
+    if (static_cast<GstClockTime>(position) != GST_CLOCK_TIME_NONE)
+        result = static_cast<double>(position) / GST_SECOND;
+
+    GST_LOG("Position %" GST_TIME_FORMAT, GST_TIME_ARGS(position));
+    gst_query_unref(query);
+
+    return result;
+}
+
+void MediaPlayerPrivateGStreamerOwr::load(const String &)
+{
+    // Properly fail so the global MediaPlayer tries to fallback to the next MediaPlayerPrivate.
+    m_networkState = MediaPlayer::FormatError;
+    m_player->networkStateChanged();
+}
+
+#if ENABLE(MEDIA_SOURCE)
+void MediaPlayerPrivateGStreamerOwr::load(const String&, MediaSourcePrivateClient*)
+{
+    // Properly fail so the global MediaPlayer tries to fallback to the next MediaPlayerPrivate.
+    m_networkState = MediaPlayer::FormatError;
+    m_player->networkStateChanged();
+}
+#endif
+
+void MediaPlayerPrivateGStreamerOwr::load(MediaStreamPrivate& streamPrivate)
+{
+    if (!initializeGStreamer())
+        return;
+
+    m_streamPrivate = &streamPrivate;
+    if (!m_streamPrivate->active()) {
+        loadingFailed(MediaPlayer::NetworkError);
+        return;
+    }
+
+    if (streamPrivate.hasVideo() && !m_videoSink)
+        createVideoSink();
+
+    if (streamPrivate.hasAudio() && !m_audioSink)
+        createGSTAudioSinkBin();
+
+    GST_DEBUG("Loading MediaStreamPrivate %p video: %s, audio: %s", &streamPrivate, streamPrivate.hasVideo() ? "yes":"no", streamPrivate.hasAudio() ? "yes":"no");
+
+    m_readyState = MediaPlayer::HaveNothing;
+    m_networkState = MediaPlayer::Loading;
+    m_player->networkStateChanged();
+    m_player->readyStateChanged();
+
     for (auto track : m_streamPrivate->tracks()) {
         if (!track->enabled()) {
@@ -80 +190 @@
         }
 
-        maybeHandleChangeMutedState(*track);
-    }
-}
-
-void MediaPlayerPrivateGStreamerOwr::pause()
-{
-    GST_DEBUG("Pause");
-    m_paused = true;
-    stop();
-}
-
-bool MediaPlayerPrivateGStreamerOwr::hasVideo() const
-{
-    return m_videoTrack;
-}
-
-bool MediaPlayerPrivateGStreamerOwr::hasAudio() const
-{
-    return m_audioTrack;
-}
-
-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);
-}
-
-float MediaPlayerPrivateGStreamerOwr::currentTime() const
-{
-    gint64 position = GST_CLOCK_TIME_NONE;
-    GstQuery* query = gst_query_new_position(GST_FORMAT_TIME);
-
-    if (m_videoTrack && gst_element_query(m_videoSink.get(), query))
-        gst_query_parse_position(query, 0, &position);
-    else if (m_audioTrack && gst_element_query(m_audioSink.get(), query))
-        gst_query_parse_position(query, 0, &position);
-
-    float result = 0;
-    if (static_cast<GstClockTime>(position) != GST_CLOCK_TIME_NONE)
-        result = static_cast<double>(position) / GST_SECOND;
-
-    GST_LOG("Position %" GST_TIME_FORMAT, GST_TIME_ARGS(position));
-    gst_query_unref(query);
-
-    return result;
-}
-
-void MediaPlayerPrivateGStreamerOwr::load(const String &)
-{
-    // Properly fail so the global MediaPlayer tries to fallback to the next MediaPlayerPrivate.
-    m_networkState = MediaPlayer::FormatError;
-    m_player->networkStateChanged();
-}
-
-#if ENABLE(MEDIA_SOURCE)
-void MediaPlayerPrivateGStreamerOwr::load(const String&, MediaSourcePrivateClient*)
-{
-    // Properly fail so the global MediaPlayer tries to fallback to the next MediaPlayerPrivate.
-    m_networkState = MediaPlayer::FormatError;
-    m_player->networkStateChanged();
-}
-#endif
-
-void MediaPlayerPrivateGStreamerOwr::load(MediaStreamPrivate& streamPrivate)
-{
-    if (!initializeGStreamer())
-        return;
-
-    m_streamPrivate = &streamPrivate;
-    if (!m_streamPrivate->active()) {
-        loadingFailed(MediaPlayer::NetworkError);
-        return;
-    }
-
-    if (streamPrivate.hasVideo() && !m_videoSink)
-        createVideoSink();
-
-    if (streamPrivate.hasAudio() && !m_audioSink)
-        createGSTAudioSinkBin();
-
-    GST_DEBUG("Loading MediaStreamPrivate %p video: %s, audio: %s", &streamPrivate, streamPrivate.hasVideo() ? "yes":"no", streamPrivate.hasAudio() ? "yes":"no");
-
-    m_readyState = MediaPlayer::HaveNothing;
-    m_networkState = MediaPlayer::Loading;
-    m_player->networkStateChanged();
-    m_player->readyStateChanged();
-
-    for (auto track : m_streamPrivate->tracks()) {
-        if (!track->enabled()) {
-            GST_DEBUG("Track %s disabled", track->label().ascii().data());
-            continue;
-        }
-
-        track->addObserver(*this);
+        GST_DEBUG("Processing track %s", track->label().ascii().data());
+
+        bool observeTrack = false;
+
+        // TODO: Support for multiple tracks of the same type.
 
         switch (track->type()) {
         case RealtimeMediaSource::Audio:
-            m_audioTrack = track;
+            if (!m_audioTrack) {
+                String preSelectedDevice = getenv("WEBKIT_AUDIO_DEVICE");
+                if (!preSelectedDevice || (preSelectedDevice == track->label())) {
+                    m_audioTrack = track;
+                    observeTrack = true;
+                }
+            }
             break;
         case RealtimeMediaSource::Video:
-            m_videoTrack = track;
+            if (!m_videoTrack) {
+                String preSelectedDevice = getenv("WEBKIT_VIDEO_DEVICE");
+                if (!preSelectedDevice || (preSelectedDevice == track->label())) {
+                    m_videoTrack = track;
+                    observeTrack = true;
+                }
+            }
             break;
         case RealtimeMediaSource::None:
             GST_WARNING("Loading a track with None type");
         }
+
+        if (observeTrack)
+            track->addObserver(*this);
     }