Attachment 360658 Details for Bug 194069 – Patch

[patch] Patch

bug-194069-20190131024030.patch (text/plain), 6.34 KB, created by Alicia Boya García on 2019-01-30 17:40:32 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Alicia Boya García

Created: 2019-01-30 17:40:32 PST

Size: 6.34 KB

patch

obsolete

>Subversion Revision: 240726
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index d77026b2677b760940371273f2fe8a6dab375522..20aa8de6278528f9bfb5b8c5c74af1b494982100 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,30 @@
>+2019-01-30  Alicia Boya GarcÃa  <aboya@igalia.com>
>+
>+        [MSE][GStreamer] Remove if (m_playerPrivate) from MediaSourceClientGStreamerMSE
>+        https://bugs.webkit.org/show_bug.cgi?id=194069
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        m_playerPrivate is non-NULL since MediaSourceClientGStreamerMSE
>+        creation well until its destruction.
>+
>+        The only case that could make a NULL m_playerPrivate is
>+        clearPlayerPrivate() but that method is not used anymore.
>+
>+        * platform/graphics/gstreamer/mse/MediaSourceClientGStreamerMSE.cpp:
>+        (WebCore::MediaSourceClientGStreamerMSE::addSourceBuffer):
>+        (WebCore::MediaSourceClientGStreamerMSE::durationChanged):
>+        (WebCore::MediaSourceClientGStreamerMSE::abort):
>+        (WebCore::MediaSourceClientGStreamerMSE::resetParserState):
>+        (WebCore::MediaSourceClientGStreamerMSE::markEndOfStream):
>+        (WebCore::MediaSourceClientGStreamerMSE::removedFromMediaSource):
>+        (WebCore::MediaSourceClientGStreamerMSE::flush):
>+        (WebCore::MediaSourceClientGStreamerMSE::enqueueSample):
>+        (WebCore::MediaSourceClientGStreamerMSE::allSamplesInTrackEnqueued):
>+        (WebCore::MediaSourceClientGStreamerMSE::webKitMediaSrc):
>+        (WebCore::MediaSourceClientGStreamerMSE::clearPlayerPrivate): Deleted.
>+        * platform/graphics/gstreamer/mse/MediaSourceClientGStreamerMSE.h:
>+
> 2019-01-17  Alicia Boya GarcÃa  <aboya@igalia.com>
> 
>         [MSE][GStreamer] Remove unused GstFlowReturn in AppendPipeline methods
>diff --git a/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourceClientGStreamerMSE.cpp b/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourceClientGStreamerMSE.cpp
>index 194e921923d1a0714bf720357472e5730762eaf4..3fe48bbf547ddda016f2fdbc82f1073b45a44e94 100644
>--- a/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourceClientGStreamerMSE.cpp
>+++ b/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourceClientGStreamerMSE.cpp
>@@ -60,9 +60,6 @@ MediaSourcePrivate::AddStatus MediaSourceClientGStreamerMSE::addSourceBuffer(Ref
> {
>     ASSERT(WTF::isMainThread());
> 
>-    if (!m_playerPrivate)
>-        return MediaSourcePrivate::AddStatus::NotSupported;
>-
>     ASSERT(m_playerPrivate->m_playbackPipeline);
>     ASSERT(sourceBufferPrivate);
> 
>@@ -89,8 +86,7 @@ void MediaSourceClientGStreamerMSE::durationChanged(const MediaTime& duration)
>         return;
> 
>     m_duration = duration;
>-    if (m_playerPrivate)
>-        m_playerPrivate->durationChanged();
>+    m_playerPrivate->durationChanged();
> }
> 
> void MediaSourceClientGStreamerMSE::abort(RefPtr<SourceBufferPrivateGStreamer> sourceBufferPrivate)
>@@ -99,9 +95,6 @@ void MediaSourceClientGStreamerMSE::abort(RefPtr<SourceBufferPrivateGStreamer> s
> 
>     GST_DEBUG("aborting");
> 
>-    if (!m_playerPrivate)
>-        return;
>-
>     RefPtr<AppendPipeline> appendPipeline = m_playerPrivate->m_appendPipelinesMap.get(sourceBufferPrivate);
> 
>     ASSERT(appendPipeline);
>@@ -115,9 +108,6 @@ void MediaSourceClientGStreamerMSE::resetParserState(RefPtr<SourceBufferPrivateG
> 
>     GST_DEBUG("resetting parser state");
> 
>-    if (!m_playerPrivate)
>-        return;
>-
>     RefPtr<AppendPipeline> appendPipeline = m_playerPrivate->m_appendPipelinesMap.get(sourceBufferPrivate);
> 
>     ASSERT(appendPipeline);
>@@ -153,9 +143,6 @@ void MediaSourceClientGStreamerMSE::markEndOfStream(MediaSourcePrivate::EndOfStr
> {
>     ASSERT(WTF::isMainThread());
> 
>-    if (!m_playerPrivate)
>-        return;
>-
>     m_playerPrivate->markEndOfStream(status);
> }
> 
>@@ -163,9 +150,6 @@ void MediaSourceClientGStreamerMSE::removedFromMediaSource(RefPtr<SourceBufferPr
> {
>     ASSERT(WTF::isMainThread());
> 
>-    if (!m_playerPrivate)
>-        return;
>-
>     ASSERT(m_playerPrivate->m_playbackPipeline);
> 
>     // Remove the AppendPipeline from the map. This should cause its destruction since there should be no alive
>@@ -181,7 +165,7 @@ void MediaSourceClientGStreamerMSE::flush(AtomicString trackId)
>     ASSERT(WTF::isMainThread());
> 
>     // This is only for on-the-fly reenqueues after appends. When seeking, the seek will do its own flush.
>-    if (m_playerPrivate && !m_playerPrivate->m_seeking)
>+    if (!m_playerPrivate->m_seeking)
>         m_playerPrivate->m_playbackPipeline->flush(trackId);
> }
> 
>@@ -189,25 +173,20 @@ void MediaSourceClientGStreamerMSE::enqueueSample(Ref<MediaSample>&& sample)
> {
>     ASSERT(WTF::isMainThread());
> 
>-    if (m_playerPrivate)
>-        m_playerPrivate->m_playbackPipeline->enqueueSample(WTFMove(sample));
>+    m_playerPrivate->m_playbackPipeline->enqueueSample(WTFMove(sample));
> }
> 
> void MediaSourceClientGStreamerMSE::allSamplesInTrackEnqueued(const AtomicString& trackId)
> {
>     ASSERT(WTF::isMainThread());
> 
>-    if (m_playerPrivate)
>-        m_playerPrivate->m_playbackPipeline->allSamplesInTrackEnqueued(trackId);
>+    m_playerPrivate->m_playbackPipeline->allSamplesInTrackEnqueued(trackId);
> }
> 
> GRefPtr<WebKitMediaSrc> MediaSourceClientGStreamerMSE::webKitMediaSrc()
> {
>     ASSERT(WTF::isMainThread());
> 
>-    if (!m_playerPrivate)
>-        return nullptr;
>-
>     WebKitMediaSrc* source = WEBKIT_MEDIA_SRC(m_playerPrivate->m_source.get());
> 
>     ASSERT(WEBKIT_IS_MEDIA_SRC(source));
>@@ -215,13 +194,6 @@ GRefPtr<WebKitMediaSrc> MediaSourceClientGStreamerMSE::webKitMediaSrc()
>     return source;
> }
> 
>-void MediaSourceClientGStreamerMSE::clearPlayerPrivate()
>-{
>-    ASSERT(WTF::isMainThread());
>-
>-    m_playerPrivate = nullptr;
>-}
>-
> } // namespace WebCore.
> 
> #endif // USE(GSTREAMER)
>diff --git a/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourceClientGStreamerMSE.h b/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourceClientGStreamerMSE.h
>index 5b2c936840c027fee8be69dd4c8fa3bd2c0a9ef4..a2360bcdc0c030a6a8562f2c13ba906177197c4a 100644
>--- a/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourceClientGStreamerMSE.h
>+++ b/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourceClientGStreamerMSE.h
>@@ -54,8 +54,6 @@ public:
>     void enqueueSample(Ref<MediaSample>&&);
>     void allSamplesInTrackEnqueued(const AtomicString&);
> 
>-    void clearPlayerPrivate();
>-
>     const MediaTime& duration();
>     GRefPtr<WebKitMediaSrc> webKitMediaSrc();
>

Actions: View | Formatted Diff | Diff

Attachments on bug 194069: 360658