Changeset 145721 in webkit


Ignore:
Timestamp:
Mar 13, 2013 8:37:57 AM (11 years ago)
Author:
acolwell@chromium.org
Message:

Cleanup dead MediaSource code now that the Chromium-side refactor is complete.
https://bugs.webkit.org/show_bug.cgi?id=110371

Reviewed by Adam Barth.

  • public/WebMediaPlayer.h:

(WebKit):
(WebMediaPlayer): Remove old MediaSource methods and default MediaSource load() implementation.

  • public/WebMediaPlayerClient.h: Remove old MediaSource methods.
  • src/WebMediaPlayerClientImpl.cpp: Remove WebMediaSourceClientImpl & WebSourceBufferImpl classes that

are no longer needed.

  • src/WebMediaPlayerClientImpl.h: Remove old MediaSource methods.

(WebMediaPlayerClientImpl):

Location:
trunk/Source/WebKit/chromium
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/chromium/ChangeLog

    r145717 r145721  
     12013-03-13  Aaron Colwell  <acolwell@chromium.org>
     2
     3        Cleanup dead MediaSource code now that the Chromium-side refactor is complete.
     4        https://bugs.webkit.org/show_bug.cgi?id=110371
     5
     6        Reviewed by Adam Barth.
     7
     8        * public/WebMediaPlayer.h:
     9        (WebKit):
     10        (WebMediaPlayer): Remove old MediaSource methods and default MediaSource load() implementation.
     11        * public/WebMediaPlayerClient.h: Remove old MediaSource methods.
     12        * src/WebMediaPlayerClientImpl.cpp: Remove WebMediaSourceClientImpl & WebSourceBufferImpl classes that
     13                                            are no longer needed.
     14        * src/WebMediaPlayerClientImpl.h: Remove old MediaSource methods.
     15        (WebMediaPlayerClientImpl):
     16
    1172013-03-13  Pavel Feldman  <pfeldman@chromium.org>
    218
  • trunk/Source/WebKit/chromium/public/WebMediaPlayer.h

    r145669 r145721  
    3535#include "../../../Platform/chromium/public/WebString.h"
    3636#include "../../../Platform/chromium/public/WebVideoFrame.h"
    37 #include "WebMediaSource.h"
    3837#include "WebTimeRange.h"
    3938
     
    4342class WebAudioSourceProviderClient;
    4443class WebMediaPlayerClient;
     44class WebMediaSource;
    4545class WebStreamTextureClient;
    4646class WebString;
     
    8383    };
    8484
    85     enum AddIdStatus {
    86         AddIdStatusOk,
    87         AddIdStatusNotSupported,
    88         AddIdStatusReachedIdLimit
    89     };
    90 
    91     enum EndOfStreamStatus {
    92         EndOfStreamStatusNoError,
    93         EndOfStreamStatusNetworkError,
    94         EndOfStreamStatusDecodeError,
    95     };
    96 
    9785    // Represents synchronous exceptions that can be thrown from the Encrypted
    9886    // Media methods. This is different from the asynchronous MediaKeyError.
     
    112100
    113101    virtual void load(const WebURL&, CORSMode) = 0;
    114     // FIXME: Remove the default implementation once the Chromium code implements this method.
    115     // https://bugs.webkit.org/show_bug.cgi?id=110371
    116     virtual void load(const WebURL& url, WebMediaSource* mediaSource, CORSMode corsMode) { delete mediaSource; load(url, corsMode); };
     102    virtual void load(const WebURL&, WebMediaSource*, CORSMode) = 0;
    117103    virtual void cancelLoad() = 0;
    118104
     
    189175    virtual WebAudioSourceProvider* audioSourceProvider() { return 0; }
    190176
    191     virtual AddIdStatus sourceAddId(const WebString& id, const WebString& type,
    192                                     const WebVector<WebString>& codecs) { return AddIdStatusNotSupported; }
    193     virtual bool sourceRemoveId(const WebString& id) { return false; }
    194     virtual WebTimeRanges sourceBuffered(const WebString& id) { return WebTimeRanges(); };
    195     virtual bool sourceAppend(const WebString& id, const unsigned char* data, unsigned length) { return false; }
    196     virtual bool sourceAbort(const WebString& id) { return false; }
    197     virtual void sourceSetDuration(double) { }
    198     virtual void sourceEndOfStream(EndOfStreamStatus)  { }
    199     virtual bool sourceSetTimestampOffset(const WebString& id, double offset) { return false; }
    200 
    201177    // Returns whether keySystem is supported. If true, the result will be
    202178    // reported by an event.
  • trunk/Source/WebKit/chromium/public/WebMediaPlayerClient.h

    r143826 r145721  
    7373    virtual void playbackStateChanged() = 0;
    7474    virtual WebMediaPlayer::Preload preload() const = 0;
    75     virtual void sourceOpened() = 0;
    76     virtual WebKit::WebURL sourceURL() const = 0;
    7775    virtual void keyAdded(const WebString& keySystem, const WebString& sessionId) = 0;
    7876    virtual void keyError(const WebString& keySystem, const WebString& sessionId, MediaKeyErrorCode, unsigned short systemCode) = 0;
  • trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp

    r145669 r145721  
    2323#include "RenderView.h"
    2424#include "TimeRanges.h"
    25 #include "UUID.h"
    2625#include "WebAudioSourceProvider.h"
    2726#include "WebDocument.h"
     
    3029#include "WebHelperPluginImpl.h"
    3130#include "WebMediaPlayer.h"
    32 #include "WebMediaSourceClient.h"
    3331#include "WebMediaSourceImpl.h"
    34 #include "WebSourceBuffer.h"
    3532#include "WebViewImpl.h"
    3633#include <public/Platform.h>
     
    5653namespace WebKit {
    5754
    58 // FIXME: Remove this class once the Chromium code implements its own
    59 // version of WebMediaPlayer::load(WebURL, WebMediaSource, CORSMode).
    60 // https://bugs.webkit.org/show_bug.cgi?id=110371
    61 class WebMediaSourceClientImpl : public WebMediaSourceClient {
    62 public:
    63     explicit WebMediaSourceClientImpl(WebMediaPlayer*);
    64     virtual ~WebMediaSourceClientImpl();
    65 
    66     // WebMediaSourceClient methods.
    67     virtual AddStatus addSourceBuffer(const WebString& type, const WebVector<WebString>& codecs, WebSourceBuffer**);
    68     virtual double duration();
    69     virtual void setDuration(double);
    70     virtual void endOfStream(EndOfStreamStatus);
    71 
    72 private:
    73     WebMediaPlayer* m_webMediaPlayer;
    74 };
    75 
    76 // FIXME: Remove this class once the Chromium code implements its own
    77 // version of WebMediaPlayer::load(WebURL, WebMediaSource, CORSMode).
    78 // https://bugs.webkit.org/show_bug.cgi?id=110371
    79 class WebSourceBufferImpl : public WebSourceBuffer {
    80 public:
    81     WebSourceBufferImpl(WebMediaPlayer*, const WebString& id);
    82 
    83     // WebSourceBuffer methods.
    84     virtual WebTimeRanges buffered();
    85     virtual void append(const unsigned char* data, unsigned length);
    86     virtual void abort();
    87     virtual bool setTimestampOffset(double);
    88     virtual void removedFromMediaSource();
    89 
    90 private:
    91     WebMediaPlayer* m_webMediaPlayer;
    92     WebString m_id;
    93 };
    94 
    95 WebMediaSourceClientImpl::WebMediaSourceClientImpl(WebMediaPlayer* webMediaPlayer)
    96     : m_webMediaPlayer(webMediaPlayer)
    97 {
    98 }
    99 
    100 WebMediaSourceClientImpl::~WebMediaSourceClientImpl()
    101 {
    102 }
    103 
    104 WebMediaSourceClient::AddStatus WebMediaSourceClientImpl::addSourceBuffer(const WebString& type, const WebVector<WebString>& codecs,
    105     WebSourceBuffer** sourceBuffer)
    106 {
    107     WebString id = WebCore::createCanonicalUUIDString();
    108     WebMediaSourceClient::AddStatus result = static_cast<WebMediaSourceClient::AddStatus>(m_webMediaPlayer->sourceAddId(id, type, codecs));
    109     if (result == WebMediaSourceClient::AddStatusOk)
    110         *sourceBuffer = new WebSourceBufferImpl(m_webMediaPlayer, id);
    111 
    112     return result;
    113 }
    114 
    115 double WebMediaSourceClientImpl::duration()
    116 {
    117     return m_webMediaPlayer->duration();
    118 }
    119 
    120 void WebMediaSourceClientImpl::setDuration(double duration)
    121 {
    122     return m_webMediaPlayer->sourceSetDuration(duration);
    123 }
    124 
    125 void WebMediaSourceClientImpl::endOfStream(EndOfStreamStatus status)
    126 {
    127     m_webMediaPlayer->sourceEndOfStream(static_cast<WebMediaPlayer::EndOfStreamStatus>(status));
    128 }
    129 
    130 WebSourceBufferImpl::WebSourceBufferImpl(WebMediaPlayer* webMediaPlayer, const WebString& id)
    131     : m_webMediaPlayer(webMediaPlayer)
    132     , m_id(id)
    133 {
    134 }
    135 
    136 WebTimeRanges WebSourceBufferImpl::buffered()
    137 {
    138     return m_webMediaPlayer->sourceBuffered(m_id);
    139 }
    140 
    141 void WebSourceBufferImpl::append(const unsigned char* data, unsigned length)
    142 {
    143     m_webMediaPlayer->sourceAppend(m_id, data, length);
    144 }
    145 
    146 void WebSourceBufferImpl::abort()
    147 {
    148     m_webMediaPlayer->sourceAbort(m_id);
    149 }
    150 
    151 bool WebSourceBufferImpl::setTimestampOffset(double offset)
    152 {
    153     return m_webMediaPlayer->sourceSetTimestampOffset(m_id, offset);
    154 }
    155 
    156 void WebSourceBufferImpl::removedFromMediaSource()
    157 {
    158     if (!m_webMediaPlayer)
    159         return;
    160 
    161     m_webMediaPlayer->sourceRemoveId(m_id);
    162     m_webMediaPlayer = 0;
    163 }
    164 
    16555static PassOwnPtr<WebMediaPlayer> createWebMediaPlayer(WebMediaPlayerClient* client, const WebURL& url, Frame* frame)
    16656{
     
    330220        return static_cast<WebMediaPlayer::Preload>(m_mediaPlayer->preload());
    331221    return static_cast<WebMediaPlayer::Preload>(m_preload);
    332 }
    333 
    334 // FIXME: Remove this and sourceURL() once the Chromium code implements
    335 // its own version of WebMediaPlayer::load(WebURL, WebMediaSource, CORSMode).
    336 // https://bugs.webkit.org/show_bug.cgi?id=110371
    337 void WebMediaPlayerClientImpl::sourceOpened()
    338 {
    339 #if ENABLE(MEDIA_SOURCE)
    340     ASSERT(m_webMediaPlayer);
    341     if (m_mediaSource) {
    342         OwnPtr<WebMediaSource> mediaSource = adoptPtr(new WebMediaSourceImpl(m_mediaSource));
    343         mediaSource->open(new WebMediaSourceClientImpl(m_webMediaPlayer.get()));
    344     }
    345 #endif
    346 }
    347 
    348 WebKit::WebURL WebMediaPlayerClientImpl::sourceURL() const
    349 {
    350 #if ENABLE(MEDIA_SOURCE)
    351     if (m_mediaSource)
    352         return m_url;
    353 #endif
    354     return KURL();
    355222}
    356223
  • trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h

    r145669 r145721  
    8585    virtual void playbackStateChanged();
    8686    virtual WebMediaPlayer::Preload preload() const;
    87     virtual void sourceOpened();
    88     virtual WebKit::WebURL sourceURL() const;
    8987    virtual void keyAdded(const WebString& keySystem, const WebString& sessionId);
    9088    virtual void keyError(const WebString& keySystem, const WebString& sessionId, MediaKeyErrorCode, unsigned short systemCode);
Note: See TracChangeset for help on using the changeset viewer.