Changeset 272646 in webkit

Timestamp:

Feb 10, 2021, 4:43:20 AM (6 years ago)

Author:

calvaris@igalia.com

Message:

[GStreamer] Make m_client WeakPtr in AudioSourceProviderGStreamer
​https://bugs.webkit.org/show_bug.cgi?id=217952

Reviewed by Carlos Garcia Campos.

• platform/audio/AudioSourceProviderClient.h: Turned into

CanMakeWeakPtr.

• platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp:

(WebCore::AudioSourceProviderGStreamer::setClient): Adapt to use
WeakPtr.

• platform/audio/gstreamer/AudioSourceProviderGStreamer.h: Turned

m_client into WeakPtr.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/audio/AudioSourceProviderClient.h (modified) (1 diff)
• platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp (modified) (2 diffs)
• platform/audio/gstreamer/AudioSourceProviderGStreamer.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-02-10  Xabier Rodriguez Calvar  <calvaris@igalia.com>
+
+        [GStreamer] Make m_client WeakPtr in AudioSourceProviderGStreamer
+        https://bugs.webkit.org/show_bug.cgi?id=217952
+
+        Reviewed by Carlos Garcia Campos.
+
+        * platform/audio/AudioSourceProviderClient.h: Turned into
+        CanMakeWeakPtr.
+        * platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp:
+        (WebCore::AudioSourceProviderGStreamer::setClient): Adapt to use
+        WeakPtr.
+        * platform/audio/gstreamer/AudioSourceProviderGStreamer.h: Turned
+        m_client into WeakPtr.
+
 2021-02-10  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/platform/audio/AudioSourceProviderClient.h

@@ -26 +26 @@
 #define AudioSourceProviderClient_h
 
+#include <wtf/WeakPtr.h>
+
 namespace WebCore {
 
-class AudioSourceProviderClient {
+class AudioSourceProviderClient : public CanMakeWeakPtr<AudioSourceProviderClient, WeakPtrFactoryInitialization::Eager> {
 public:
     virtual void setFormat(size_t numberOfChannels, float sampleRate) = 0;

trunk/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp

@@ -192 +192 @@
 }
 
-void AudioSourceProviderGStreamer::setClient(AudioSourceProviderClient* client)
-{
-    if (m_client == client)
+void AudioSourceProviderGStreamer::setClient(AudioSourceProviderClient* newClient)
+{
+    if (client() == newClient)
         return;
 
-    GST_DEBUG("Setting up client %p (previous: %p)", client, m_client);
-    bool previousClientWasValid = m_client;
-    m_client = client;
+    GST_DEBUG("Setting up client %p (previous: %p)", newClient, client());
+    bool previousClientWasValid = !!m_client;
+    m_client = makeWeakPtr(newClient);
 
     // The volume element is used to mute audio playback towards the
@@ -208 +208 @@
 
     if (volumeElement) {
-        bool shouldMute = m_client;
+        bool shouldMute = !!m_client;
         g_object_set(volumeElement.get(), "mute", shouldMute, nullptr);
     }

trunk/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.h

@@ -22 +22 @@
 
 #include "AudioSourceProvider.h"
+#include "AudioSourceProviderClient.h"
 #include "GRefPtrGStreamer.h"
 #include "MainThreadNotifier.h"
@@ -61 +62 @@
     void provideInput(AudioBus*, size_t framesToProcess) override;
     void setClient(AudioSourceProviderClient*) override;
-    const AudioSourceProviderClient* client() const { return m_client; }
+    const AudioSourceProviderClient* client() const { return m_client.get(); }
 
     void handleNewDeinterleavePad(GstPad*);
@@ -79 +80 @@
     Ref<MainThreadNotifier<MainThreadNotification>> m_notifier;
     GRefPtr<GstElement> m_audioSinkBin;
-    AudioSourceProviderClient* m_client { nullptr };
+    WeakPtr<AudioSourceProviderClient> m_client;
     int m_deinterleaveSourcePads { 0 };
     HashMap<int, GRefPtr<GstAdapter>> m_adapters;