Changeset 247407 in webkit

Timestamp:

Jul 12, 2019 5:05:18 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

[GStreamer] Mock GStreamer realtime sources should keep a Ref of their mock realtime media sources
​https://bugs.webkit.org/show_bug.cgi?id=194326

WrappedMockRealtimeVideoSource is a subclass of RealtimeMediaSource which is refcounted, we can't
use a unique_ptr on those.

Also changed m_wrappedSource type to its actual type so it is cleaner even if needed
to upcast it to RealtimeMediaSource so some method that are made private in the mock
can still be called.

Patch by Thibault Saunier <​tsaunier@igalia.com> on 2019-07-12
Reviewed by Youenn Fablet.

This fixes MediaStream tests

• platform/mediastream/gstreamer/MockGStreamerAudioCaptureSource.cpp:

(WebCore::WrappedMockRealtimeAudioSource::create):
(WebCore::WrappedMockRealtimeAudioSource::asRealtimeMediaSource):
(WebCore::WrappedMockRealtimeAudioSource::WrappedMockRealtimeAudioSource):
(WebCore::m_wrappedSource):
(WebCore::MockGStreamerAudioCaptureSource::startProducingData):
(WebCore::MockGStreamerAudioCaptureSource::settings):
(WebCore::MockGStreamerAudioCaptureSource::capabilities):

• platform/mediastream/gstreamer/MockGStreamerAudioCaptureSource.h:
• platform/mediastream/gstreamer/MockGStreamerVideoCaptureSource.cpp:

(WebCore::WrappedMockRealtimeVideoSource::create):
(WebCore::WrappedMockRealtimeVideoSource::asRealtimeMediaSource):
(WebCore::WrappedMockRealtimeVideoSource::WrappedMockRealtimeVideoSource):
(WebCore::m_wrappedSource):
(WebCore::MockGStreamerVideoCaptureSource::settings):
(WebCore::MockGStreamerVideoCaptureSource::capabilities):

• platform/mediastream/gstreamer/MockGStreamerVideoCaptureSource.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mediastream/gstreamer/MockGStreamerAudioCaptureSource.cpp (modified) (4 diffs)
• platform/mediastream/gstreamer/MockGStreamerAudioCaptureSource.h (modified) (2 diffs)
• platform/mediastream/gstreamer/MockGStreamerVideoCaptureSource.cpp (modified) (4 diffs)
• platform/mediastream/gstreamer/MockGStreamerVideoCaptureSource.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-07-12  Thibault Saunier  <tsaunier@igalia.com>
+
+        [GStreamer] Mock GStreamer realtime sources should keep a Ref of their mock realtime media sources
+        https://bugs.webkit.org/show_bug.cgi?id=194326
+
+        WrappedMockRealtimeVideoSource is a subclass of RealtimeMediaSource which is refcounted, we can't
+        use a unique_ptr on those.
+
+        Also changed m_wrappedSource type to its actual type so it is cleaner even if needed
+        to upcast it to RealtimeMediaSource so some method that are made private in the mock
+        can still be called.
+
+        Reviewed by Youenn Fablet.
+
+        This fixes MediaStream tests
+
+        * platform/mediastream/gstreamer/MockGStreamerAudioCaptureSource.cpp:
+        (WebCore::WrappedMockRealtimeAudioSource::create):
+        (WebCore::WrappedMockRealtimeAudioSource::asRealtimeMediaSource):
+        (WebCore::WrappedMockRealtimeAudioSource::WrappedMockRealtimeAudioSource):
+        (WebCore::m_wrappedSource):
+        (WebCore::MockGStreamerAudioCaptureSource::startProducingData):
+        (WebCore::MockGStreamerAudioCaptureSource::settings):
+        (WebCore::MockGStreamerAudioCaptureSource::capabilities):
+        * platform/mediastream/gstreamer/MockGStreamerAudioCaptureSource.h:
+        * platform/mediastream/gstreamer/MockGStreamerVideoCaptureSource.cpp:
+        (WebCore::WrappedMockRealtimeVideoSource::create):
+        (WebCore::WrappedMockRealtimeVideoSource::asRealtimeMediaSource):
+        (WebCore::WrappedMockRealtimeVideoSource::WrappedMockRealtimeVideoSource):
+        (WebCore::m_wrappedSource):
+        (WebCore::MockGStreamerVideoCaptureSource::settings):
+        (WebCore::MockGStreamerVideoCaptureSource::capabilities):
+        * platform/mediastream/gstreamer/MockGStreamerVideoCaptureSource.h:
+
 2019-07-12  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/platform/mediastream/gstreamer/MockGStreamerAudioCaptureSource.cpp

@@ -42 +42 @@
 class WrappedMockRealtimeAudioSource : public MockRealtimeAudioSource {
 public:
-    WrappedMockRealtimeAudioSource(String&& deviceID, String&& name, String&& hashSalt)
-        : MockRealtimeAudioSource(WTFMove(deviceID), WTFMove(name), WTFMove(hashSalt))
-        , m_src(nullptr)
-    {
+    static Ref<WrappedMockRealtimeAudioSource> create(String&& deviceID, String&& name, String&& hashSalt)
+    {
+        return adoptRef(*new WrappedMockRealtimeAudioSource(WTFMove(deviceID), WTFMove(name), WTFMove(hashSalt)));
+    }
+
+    RealtimeMediaSource& asRealtimeMediaSource()
+    {
+        return *this;
     }
 
@@ -129 +133 @@
     uint64_t m_samplesEmitted { 0 };
     uint64_t m_samplesRendered { 0 };
+
+private:
+    WrappedMockRealtimeAudioSource(String&& deviceID, String&& name, String&& hashSalt)
+        : MockRealtimeAudioSource(WTFMove(deviceID), WTFMove(name), WTFMove(hashSalt))
+    {
+    }
 };
 
@@ -155 +165 @@
 MockGStreamerAudioCaptureSource::MockGStreamerAudioCaptureSource(String&& deviceID, String&& name, String&& hashSalt)
     : GStreamerAudioCaptureSource(String { deviceID }, String { name }, String { hashSalt })
-    , m_wrappedSource(std::make_unique<WrappedMockRealtimeAudioSource>(WTFMove(deviceID), WTFMove(name), WTFMove(hashSalt)))
+    , m_wrappedSource(WrappedMockRealtimeAudioSource::create(WTFMove(deviceID), WTFMove(name), WTFMove(hashSalt)))
 {
     m_wrappedSource->addObserver(*this);
@@ -175 +185 @@
 {
     GStreamerAudioCaptureSource::startProducingData();
-    static_cast<WrappedMockRealtimeAudioSource*>(m_wrappedSource.get())->start(capturer()->source());
+    static_cast<WrappedMockRealtimeAudioSource&>(m_wrappedSource.get()).start(capturer()->source());
 }
 
 const RealtimeMediaSourceSettings& MockGStreamerAudioCaptureSource::settings()
 {
-    return m_wrappedSource->settings();
+    return m_wrappedSource->asRealtimeMediaSource().settings();
 }
 
 const RealtimeMediaSourceCapabilities& MockGStreamerAudioCaptureSource::capabilities()
 {
-    m_capabilities = m_wrappedSource->capabilities();
-    m_currentSettings = m_wrappedSource->settings();
-    return m_wrappedSource->capabilities();
+    m_capabilities = m_wrappedSource->asRealtimeMediaSource().capabilities();
+    m_currentSettings = m_wrappedSource->asRealtimeMediaSource().settings();
+    return m_wrappedSource->asRealtimeMediaSource().capabilities();
 }
 

trunk/Source/WebCore/platform/mediastream/gstreamer/MockGStreamerAudioCaptureSource.h

@@ -28 +28 @@
 namespace WebCore {
 
+class WrappedMockRealtimeAudioSource;
 class MockGStreamerAudioCaptureSource final : public GStreamerAudioCaptureSource, RealtimeMediaSource::Observer {
 public:
@@ -40 +41 @@
     const RealtimeMediaSourceSettings& settings() final;
     const RealtimeMediaSourceCapabilities& capabilities() final;
+    void captureFailed() final;
+    void videoSampleAvailable(MediaSample&) final { };
 
-    void captureFailed();
-    std::unique_ptr<RealtimeMediaSource> m_wrappedSource;
-
-    void videoSampleAvailable(MediaSample&) override { };
+    Ref<WrappedMockRealtimeAudioSource> m_wrappedSource;
 };
 

trunk/Source/WebCore/platform/mediastream/gstreamer/MockGStreamerVideoCaptureSource.cpp

@@ -34 +34 @@
 class WrappedMockRealtimeVideoSource : public MockRealtimeVideoSource {
 public:
-    WrappedMockRealtimeVideoSource(String&& deviceID, String&& name, String&& hashSalt)
-        : MockRealtimeVideoSource(WTFMove(deviceID), WTFMove(name), WTFMove(hashSalt))
+    static Ref<WrappedMockRealtimeVideoSource> create(String&& deviceID, String&& name, String&& hashSalt)
     {
+        return adoptRef(*new WrappedMockRealtimeVideoSource(WTFMove(deviceID), WTFMove(name), WTFMove(hashSalt)));
+    }
+
+    RealtimeMediaSource& asRealtimeMediaSource()
+    {
+        return *this;
     }
 
@@ -59 +64 @@
 
         videoSampleAvailable(MediaSampleGStreamer::create(WTFMove(gstSample), FloatSize(), String()));
+    }
+
+private:
+    WrappedMockRealtimeVideoSource(String&& deviceID, String&& name, String&& hashSalt)
+        : MockRealtimeVideoSource(WTFMove(deviceID), WTFMove(name), WTFMove(hashSalt))
+    {
     }
 };
@@ -98 +109 @@
 MockGStreamerVideoCaptureSource::MockGStreamerVideoCaptureSource(String&& deviceID, String&& name, String&& hashSalt)
     : GStreamerVideoCaptureSource(String { deviceID }, String { name }, String { hashSalt }, "appsrc")
-    , m_wrappedSource(std::make_unique<WrappedMockRealtimeVideoSource>(WTFMove(deviceID), WTFMove(name), WTFMove(hashSalt)))
+    , m_wrappedSource(WrappedMockRealtimeVideoSource::create(WTFMove(deviceID), WTFMove(name), WTFMove(hashSalt)))
 {
     m_wrappedSource->addObserver(*this);
@@ -121 +132 @@
 const RealtimeMediaSourceSettings& MockGStreamerVideoCaptureSource::settings()
 {
-    return m_wrappedSource->settings();
+    return m_wrappedSource->asRealtimeMediaSource().settings();
 }
 
 const RealtimeMediaSourceCapabilities& MockGStreamerVideoCaptureSource::capabilities()
 {
-    m_capabilities = m_wrappedSource->capabilities();
-    m_currentSettings = m_wrappedSource->settings();
+    m_capabilities = m_wrappedSource->asRealtimeMediaSource().capabilities();
+    m_currentSettings = m_wrappedSource->asRealtimeMediaSource().settings();
     return m_capabilities.value();
 }

trunk/Source/WebCore/platform/mediastream/gstreamer/MockGStreamerVideoCaptureSource.h

@@ -44 +44 @@
     void startProducingData() final;
     const RealtimeMediaSourceSettings& settings() final;
-    std::unique_ptr<RealtimeMediaSource> m_wrappedSource;
     const RealtimeMediaSourceCapabilities& capabilities() final;
-    void captureFailed() override;
+    void captureFailed() final;
+    void videoSampleAvailable(MediaSample&) final;
 
-    void videoSampleAvailable(MediaSample&) override;
+    Ref<WrappedMockRealtimeVideoSource> m_wrappedSource;
 };