Changeset 263656 in webkit


Ignore:
Timestamp:
Jun 29, 2020 4:50:21 AM (4 years ago)
Author:
aboya@igalia.com
Message:

[MSE][GStreamer] Rename MediaSourceGStreamer to MediaSourcePrivateGStreamer
https://bugs.webkit.org/show_bug.cgi?id=213722

Reviewed by Xabier Rodriguez-Calvar.

It's about time to remove this FIXME:

FIXME: Should this be called MediaSourcePrivateGStreamer?

Yes, it should. Because it's a MediaSourcePrivate, and that is an
important fact. The MSE class diagram is confusing enough already,
let's fix this.

To rebase commits after this change use git format-patch first to
get them in a patch format and then run:

sed -i 's|\<MediaSourceGStreamer\>|MediaSourcePrivateGStreamer|g' *.patch

This patch is a refactor that produces no behavior changes.

  • platform/GStreamer.cmake:
  • platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.cpp:

(WebCore::MediaPlayerPrivateGStreamerMSE::sourceSetup):

  • platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.h:
  • platform/graphics/gstreamer/mse/MediaSourceClientGStreamerMSE.h:
  • platform/graphics/gstreamer/mse/MediaSourcePrivateGStreamer.cpp: Renamed from Source/WebCore/platform/graphics/gstreamer/mse/MediaSourceGStreamer.cpp.

(WebCore::MediaSourcePrivateGStreamer::open):
(WebCore::MediaSourcePrivateGStreamer::MediaSourcePrivateGStreamer):
(WebCore::MediaSourcePrivateGStreamer::~MediaSourcePrivateGStreamer):
(WebCore::MediaSourcePrivateGStreamer::addSourceBuffer):
(WebCore::MediaSourcePrivateGStreamer::removeSourceBuffer):
(WebCore::MediaSourcePrivateGStreamer::durationChanged):
(WebCore::MediaSourcePrivateGStreamer::markEndOfStream):
(WebCore::MediaSourcePrivateGStreamer::unmarkEndOfStream):
(WebCore::MediaSourcePrivateGStreamer::readyState const):
(WebCore::MediaSourcePrivateGStreamer::setReadyState):
(WebCore::MediaSourcePrivateGStreamer::waitForSeekCompleted):
(WebCore::MediaSourcePrivateGStreamer::seekCompleted):
(WebCore::MediaSourcePrivateGStreamer::sourceBufferPrivateDidChangeActiveState):
(WebCore::MediaSourcePrivateGStreamer::buffered):
(WebCore::MediaSourcePrivateGStreamer::logChannel const):

  • platform/graphics/gstreamer/mse/MediaSourcePrivateGStreamer.h: Renamed from Source/WebCore/platform/graphics/gstreamer/mse/MediaSourceGStreamer.h.
  • platform/graphics/gstreamer/mse/PlaybackPipeline.h:
  • platform/graphics/gstreamer/mse/SourceBufferPrivateGStreamer.cpp:

(WebCore::SourceBufferPrivateGStreamer::create):
(WebCore::SourceBufferPrivateGStreamer::SourceBufferPrivateGStreamer):

  • platform/graphics/gstreamer/mse/SourceBufferPrivateGStreamer.h:
  • platform/graphics/gstreamer/mse/WebKitMediaSourceGStreamer.cpp:
Location:
trunk/Source/WebCore
Files:
9 edited
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r263655 r263656  
     12020-06-29  Alicia Boya García  <aboya@igalia.com>
     2
     3        [MSE][GStreamer] Rename MediaSourceGStreamer to MediaSourcePrivateGStreamer
     4        https://bugs.webkit.org/show_bug.cgi?id=213722
     5
     6        Reviewed by Xabier Rodriguez-Calvar.
     7
     8        It's about time to remove this FIXME:
     9
     10        // FIXME: Should this be called MediaSourcePrivateGStreamer?
     11
     12        Yes, it should. Because it's a MediaSourcePrivate, and that is an
     13        important fact. The MSE class diagram is confusing enough already,
     14        let's fix this.
     15
     16        To rebase commits after this change use `git format-patch` first to
     17        get them in a patch format and then run:
     18
     19        sed -i 's|\<MediaSourceGStreamer\>|MediaSourcePrivateGStreamer|g' *.patch
     20
     21        This patch is a refactor that produces no behavior changes.
     22
     23        * platform/GStreamer.cmake:
     24        * platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.cpp:
     25        (WebCore::MediaPlayerPrivateGStreamerMSE::sourceSetup):
     26        * platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.h:
     27        * platform/graphics/gstreamer/mse/MediaSourceClientGStreamerMSE.h:
     28        * platform/graphics/gstreamer/mse/MediaSourcePrivateGStreamer.cpp: Renamed from Source/WebCore/platform/graphics/gstreamer/mse/MediaSourceGStreamer.cpp.
     29        (WebCore::MediaSourcePrivateGStreamer::open):
     30        (WebCore::MediaSourcePrivateGStreamer::MediaSourcePrivateGStreamer):
     31        (WebCore::MediaSourcePrivateGStreamer::~MediaSourcePrivateGStreamer):
     32        (WebCore::MediaSourcePrivateGStreamer::addSourceBuffer):
     33        (WebCore::MediaSourcePrivateGStreamer::removeSourceBuffer):
     34        (WebCore::MediaSourcePrivateGStreamer::durationChanged):
     35        (WebCore::MediaSourcePrivateGStreamer::markEndOfStream):
     36        (WebCore::MediaSourcePrivateGStreamer::unmarkEndOfStream):
     37        (WebCore::MediaSourcePrivateGStreamer::readyState const):
     38        (WebCore::MediaSourcePrivateGStreamer::setReadyState):
     39        (WebCore::MediaSourcePrivateGStreamer::waitForSeekCompleted):
     40        (WebCore::MediaSourcePrivateGStreamer::seekCompleted):
     41        (WebCore::MediaSourcePrivateGStreamer::sourceBufferPrivateDidChangeActiveState):
     42        (WebCore::MediaSourcePrivateGStreamer::buffered):
     43        (WebCore::MediaSourcePrivateGStreamer::logChannel const):
     44        * platform/graphics/gstreamer/mse/MediaSourcePrivateGStreamer.h: Renamed from Source/WebCore/platform/graphics/gstreamer/mse/MediaSourceGStreamer.h.
     45        * platform/graphics/gstreamer/mse/PlaybackPipeline.h:
     46        * platform/graphics/gstreamer/mse/SourceBufferPrivateGStreamer.cpp:
     47        (WebCore::SourceBufferPrivateGStreamer::create):
     48        (WebCore::SourceBufferPrivateGStreamer::SourceBufferPrivateGStreamer):
     49        * platform/graphics/gstreamer/mse/SourceBufferPrivateGStreamer.h:
     50        * platform/graphics/gstreamer/mse/WebKitMediaSourceGStreamer.cpp:
     51
    1522020-06-29  Youenn Fablet  <youenn@apple.com>
    253
  • trunk/Source/WebCore/platform/GStreamer.cmake

    r261922 r263656  
    3434        platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.cpp
    3535        platform/graphics/gstreamer/mse/MediaSourceClientGStreamerMSE.cpp
    36         platform/graphics/gstreamer/mse/MediaSourceGStreamer.cpp
     36        platform/graphics/gstreamer/mse/MediaSourcePrivateGStreamer.cpp
    3737        platform/graphics/gstreamer/mse/PlaybackPipeline.cpp
    3838        platform/graphics/gstreamer/mse/SourceBufferPrivateGStreamer.cpp
  • trunk/Source/WebCore/platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.cpp

    r261986 r263656  
    492492    m_playbackPipeline->setWebKitMediaSrc(WEBKIT_MEDIA_SRC(m_source.get()));
    493493
    494     MediaSourceGStreamer::open(*m_mediaSource.get(), *this);
     494    MediaSourcePrivateGStreamer::open(*m_mediaSource.get(), *this);
    495495    g_signal_connect_swapped(m_source.get(), "video-changed", G_CALLBACK(videoChangedCallback), this);
    496496    g_signal_connect_swapped(m_source.get(), "audio-changed", G_CALLBACK(audioChangedCallback), this);
  • trunk/Source/WebCore/platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.h

    r258691 r263656  
    3030#include "MediaPlayerPrivateGStreamer.h"
    3131#include "MediaSample.h"
    32 #include "MediaSourceGStreamer.h"
     32#include "MediaSourcePrivateGStreamer.h"
    3333#include "WebKitMediaSourceGStreamer.h"
    3434
  • trunk/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourceClientGStreamerMSE.h

    r251365 r263656  
    4141    virtual ~MediaSourceClientGStreamerMSE();
    4242
    43     // From MediaSourceGStreamer.
     43    // From MediaSourcePrivateGStreamer.
    4444    MediaSourcePrivate::AddStatus addSourceBuffer(RefPtr<SourceBufferPrivateGStreamer>, const ContentType&);
    4545    void durationChanged(const MediaTime&);
  • trunk/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourcePrivateGStreamer.cpp

    r263655 r263656  
    3434
    3535#include "config.h"
    36 #include "MediaSourceGStreamer.h"
     36#include "MediaSourcePrivateGStreamer.h"
    3737
    3838#if ENABLE(MEDIA_SOURCE) && USE(GSTREAMER)
     
    5252namespace WebCore {
    5353
    54 void MediaSourceGStreamer::open(MediaSourcePrivateClient& mediaSource, MediaPlayerPrivateGStreamerMSE& playerPrivate)
     54void MediaSourcePrivateGStreamer::open(MediaSourcePrivateClient& mediaSource, MediaPlayerPrivateGStreamerMSE& playerPrivate)
    5555{
    56     mediaSource.setPrivateAndOpen(adoptRef(*new MediaSourceGStreamer(mediaSource, playerPrivate)));
     56    mediaSource.setPrivateAndOpen(adoptRef(*new MediaSourcePrivateGStreamer(mediaSource, playerPrivate)));
    5757}
    5858
    59 MediaSourceGStreamer::MediaSourceGStreamer(MediaSourcePrivateClient& mediaSource, MediaPlayerPrivateGStreamerMSE& playerPrivate)
     59MediaSourcePrivateGStreamer::MediaSourcePrivateGStreamer(MediaSourcePrivateClient& mediaSource, MediaPlayerPrivateGStreamerMSE& playerPrivate)
    6060    : MediaSourcePrivate()
    6161    , m_client(MediaSourceClientGStreamerMSE::create(playerPrivate))
     
    6969}
    7070
    71 MediaSourceGStreamer::~MediaSourceGStreamer()
     71MediaSourcePrivateGStreamer::~MediaSourcePrivateGStreamer()
    7272{
    7373    ALWAYS_LOG(LOGIDENTIFIER);
     
    7676}
    7777
    78 MediaSourceGStreamer::AddStatus MediaSourceGStreamer::addSourceBuffer(const ContentType& contentType, RefPtr<SourceBufferPrivate>& sourceBufferPrivate)
     78MediaSourcePrivateGStreamer::AddStatus MediaSourcePrivateGStreamer::addSourceBuffer(const ContentType& contentType, RefPtr<SourceBufferPrivate>& sourceBufferPrivate)
    7979{
    8080    DEBUG_LOG(LOGIDENTIFIER, contentType);
     
    8585}
    8686
    87 void MediaSourceGStreamer::removeSourceBuffer(SourceBufferPrivate* sourceBufferPrivate)
     87void MediaSourcePrivateGStreamer::removeSourceBuffer(SourceBufferPrivate* sourceBufferPrivate)
    8888{
    8989    RefPtr<SourceBufferPrivateGStreamer> sourceBufferPrivateGStreamer = static_cast<SourceBufferPrivateGStreamer*>(sourceBufferPrivate);
     
    9595}
    9696
    97 void MediaSourceGStreamer::durationChanged()
     97void MediaSourcePrivateGStreamer::durationChanged()
    9898{
    9999    m_client->durationChanged(m_mediaSource->duration());
    100100}
    101101
    102 void MediaSourceGStreamer::markEndOfStream(EndOfStreamStatus status)
     102void MediaSourcePrivateGStreamer::markEndOfStream(EndOfStreamStatus status)
    103103{
    104104    m_client->markEndOfStream(status);
    105105}
    106106
    107 void MediaSourceGStreamer::unmarkEndOfStream()
     107void MediaSourcePrivateGStreamer::unmarkEndOfStream()
    108108{
    109109    notImplemented();
    110110}
    111111
    112 MediaPlayer::ReadyState MediaSourceGStreamer::readyState() const
     112MediaPlayer::ReadyState MediaSourcePrivateGStreamer::readyState() const
    113113{
    114114    return m_playerPrivate.readyState();
    115115}
    116116
    117 void MediaSourceGStreamer::setReadyState(MediaPlayer::ReadyState state)
     117void MediaSourcePrivateGStreamer::setReadyState(MediaPlayer::ReadyState state)
    118118{
    119119    m_playerPrivate.setReadyState(state);
    120120}
    121121
    122 void MediaSourceGStreamer::waitForSeekCompleted()
     122void MediaSourcePrivateGStreamer::waitForSeekCompleted()
    123123{
    124124    m_playerPrivate.waitForSeekCompleted();
    125125}
    126126
    127 void MediaSourceGStreamer::seekCompleted()
     127void MediaSourcePrivateGStreamer::seekCompleted()
    128128{
    129129    m_playerPrivate.seekCompleted();
    130130}
    131131
    132 void MediaSourceGStreamer::sourceBufferPrivateDidChangeActiveState(SourceBufferPrivateGStreamer* sourceBufferPrivate, bool isActive)
     132void MediaSourcePrivateGStreamer::sourceBufferPrivateDidChangeActiveState(SourceBufferPrivateGStreamer* sourceBufferPrivate, bool isActive)
    133133{
    134134    if (!isActive)
     
    138138}
    139139
    140 std::unique_ptr<PlatformTimeRanges> MediaSourceGStreamer::buffered()
     140std::unique_ptr<PlatformTimeRanges> MediaSourcePrivateGStreamer::buffered()
    141141{
    142142    return m_mediaSource->buffered();
     
    144144
    145145#if !RELEASE_LOG_DISABLED
    146 WTFLogChannel& MediaSourceGStreamer::logChannel() const
     146WTFLogChannel& MediaSourcePrivateGStreamer::logChannel() const
    147147{
    148148    return LogMediaSource;
  • trunk/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourcePrivateGStreamer.h

    r263655 r263656  
    5151class PlatformTimeRanges;
    5252
    53 // FIXME: Should this be called MediaSourcePrivateGStreamer?
    54 class MediaSourceGStreamer final : public MediaSourcePrivate
     53class MediaSourcePrivateGStreamer final : public MediaSourcePrivate
    5554#if !RELEASE_LOG_DISABLED
    5655    , private LoggerHelper
     
    5958public:
    6059    static void open(MediaSourcePrivateClient&, MediaPlayerPrivateGStreamerMSE&);
    61     virtual ~MediaSourceGStreamer();
     60    virtual ~MediaSourcePrivateGStreamer();
    6261
    6362    MediaSourceClientGStreamerMSE& client() { return m_client.get(); }
     
    8988
    9089private:
    91     MediaSourceGStreamer(MediaSourcePrivateClient&, MediaPlayerPrivateGStreamerMSE&);
     90    MediaSourcePrivateGStreamer(MediaSourcePrivateClient&, MediaPlayerPrivateGStreamerMSE&);
    9291
    9392    HashSet<RefPtr<SourceBufferPrivateGStreamer>> m_sourceBuffers;
  • trunk/Source/WebCore/platform/graphics/gstreamer/mse/PlaybackPipeline.h

    r251365 r263656  
    4242class ContentType;
    4343class SourceBufferPrivateGStreamer;
    44 class MediaSourceGStreamer;
     44class MediaSourcePrivateGStreamer;
    4545
    4646class PlaybackPipeline: public RefCounted<PlaybackPipeline> {
     
    6262    void notifyDurationChanged();
    6363
    64     // From MediaSourceGStreamer.
     64    // From MediaSourcePrivateGStreamer.
    6565    void markEndOfStream(MediaSourcePrivate::EndOfStreamStatus);
    6666
  • trunk/Source/WebCore/platform/graphics/gstreamer/mse/SourceBufferPrivateGStreamer.cpp

    r258547 r263656  
    4343#include "MediaSample.h"
    4444#include "MediaSourceClientGStreamerMSE.h"
    45 #include "MediaSourceGStreamer.h"
     45#include "MediaSourcePrivateGStreamer.h"
    4646#include "NotImplemented.h"
    4747#include "WebKitMediaSourceGStreamer.h"
     
    4949namespace WebCore {
    5050
    51 Ref<SourceBufferPrivateGStreamer> SourceBufferPrivateGStreamer::create(MediaSourceGStreamer* mediaSource, Ref<MediaSourceClientGStreamerMSE> client, const ContentType& contentType)
     51Ref<SourceBufferPrivateGStreamer> SourceBufferPrivateGStreamer::create(MediaSourcePrivateGStreamer* mediaSource, Ref<MediaSourceClientGStreamerMSE> client, const ContentType& contentType)
    5252{
    5353    return adoptRef(*new SourceBufferPrivateGStreamer(mediaSource, client.get(), contentType));
    5454}
    5555
    56 SourceBufferPrivateGStreamer::SourceBufferPrivateGStreamer(MediaSourceGStreamer* mediaSource, Ref<MediaSourceClientGStreamerMSE> client, const ContentType& contentType)
     56SourceBufferPrivateGStreamer::SourceBufferPrivateGStreamer(MediaSourcePrivateGStreamer* mediaSource, Ref<MediaSourceClientGStreamerMSE> client, const ContentType& contentType)
    5757    : SourceBufferPrivate()
    5858    , m_mediaSource(mediaSource)
  • trunk/Source/WebCore/platform/graphics/gstreamer/mse/SourceBufferPrivateGStreamer.h

    r258547 r263656  
    4646namespace WebCore {
    4747
    48 class MediaSourceGStreamer;
     48class MediaSourcePrivateGStreamer;
    4949
    5050class SourceBufferPrivateGStreamer final : public SourceBufferPrivate
     
    5555
    5656public:
    57     static Ref<SourceBufferPrivateGStreamer> create(MediaSourceGStreamer*, Ref<MediaSourceClientGStreamerMSE>, const ContentType&);
     57    static Ref<SourceBufferPrivateGStreamer> create(MediaSourcePrivateGStreamer*, Ref<MediaSourceClientGStreamerMSE>, const ContentType&);
    5858    virtual ~SourceBufferPrivateGStreamer() = default;
    5959
     
    9595
    9696private:
    97     SourceBufferPrivateGStreamer(MediaSourceGStreamer*, Ref<MediaSourceClientGStreamerMSE>, const ContentType&);
     97    SourceBufferPrivateGStreamer(MediaSourcePrivateGStreamer*, Ref<MediaSourceClientGStreamerMSE>, const ContentType&);
    9898    friend class MediaSourceClientGStreamerMSE;
    9999
    100     MediaSourceGStreamer* m_mediaSource;
     100    MediaSourcePrivateGStreamer* m_mediaSource;
    101101    ContentType m_type;
    102102    Ref<MediaSourceClientGStreamerMSE> m_client;
  • trunk/Source/WebCore/platform/graphics/gstreamer/mse/WebKitMediaSourceGStreamer.cpp

    r260506 r263656  
    3434#include "MediaPlayerPrivateGStreamerMSE.h"
    3535#include "MediaSample.h"
    36 #include "MediaSourceGStreamer.h"
     36#include "MediaSourcePrivateGStreamer.h"
    3737#include "NotImplemented.h"
    3838#include "SourceBufferPrivateGStreamer.h"
Note: See TracChangeset for help on using the changeset viewer.