Changeset 181153 in webkit
- Timestamp:
- Mar 6, 2015 6:10:11 AM (9 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r181152 r181153 1 2015-03-05 Philippe Normand <pnormand@igalia.com> 2 3 [MediaStream] new load method for MediaStreamPrivate objects 4 https://bugs.webkit.org/show_bug.cgi?id=142346 5 6 Reviewed by Eric Carlson. 7 8 No new tests, existing mediastream tests cover this use-case. 9 10 * html/HTMLMediaElement.cpp: 11 (WebCore::HTMLMediaElement::loadResource): Use new load method for MediaStreams. 12 * platform/graphics/MediaPlayer.cpp: 13 (WebCore::NullMediaPlayerPrivate::load): New stub. 14 (WebCore::MediaPlayer::load): New load method for 15 MediaStreamPrivate. 16 (WebCore::MediaPlayer::nextBestMediaEngine): Set a new boolean on 17 the MediaEngineSupportParameters to differenciate with MSE and 18 normal video resources. 19 (WebCore::MediaPlayer::loadWithNextMediaEngine): Defer loading of 20 the MediaStream to the MediaPlayerPrivate backend. 21 * platform/graphics/MediaPlayer.h: 22 (WebCore::MediaEngineSupportParameters::MediaEngineSupportParameters): 23 * platform/graphics/MediaPlayerPrivate.h: 24 * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h: 25 (WebCore::MediaPlayerPrivateAVFoundation::load): New empty load 26 method for MediaStreamPrivate objects. 27 * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h: 28 (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::load): Ditto. 29 * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp: 30 (WebCore::MediaPlayerPrivateGStreamer::load): Ditto. 31 * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h: 32 * platform/graphics/mac/MediaPlayerPrivateQTKit.h: 33 (WebCore::MediaPlayerPrivateQTKit::load): Ditto. 34 * platform/mock/mediasource/MockMediaPlayerMediaSource.h: 35 1 36 2015-03-05 Philippe Normand <pnormand@igalia.com> 2 37 -
trunk/Source/WebCore/html/HTMLMediaElement.cpp
r180801 r181153 1222 1222 } else 1223 1223 #endif 1224 #if ENABLE(MEDIA_STREAM) 1225 if (m_mediaStreamSrcObject) 1226 m_player->load(m_mediaStreamSrcObject->privateStream()); 1227 else 1228 #endif 1224 1229 if (!m_player->load(url, contentType, keySystem)) 1225 1230 mediaLoadingFailed(MediaPlayer::FormatError); -
trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp
r180839 r181153 48 48 #endif 49 49 50 #if ENABLE(MEDIA_STREAM) 51 #include "MediaStreamPrivate.h" 52 #endif 53 50 54 #if USE(GSTREAMER) 51 55 #include "MediaPlayerPrivateGStreamer.h" … … 85 89 #if ENABLE(MEDIA_SOURCE) 86 90 virtual void load(const String&, MediaSourcePrivateClient*) { } 91 #endif 92 #if ENABLE(MEDIA_STREAM) 93 virtual void load(MediaStreamPrivate*) { } 87 94 #endif 88 95 virtual void cancelLoad() { } … … 309 316 #if ENABLE(MEDIA_SOURCE) 310 317 m_mediaSource = 0; 318 #endif 319 #if ENABLE(MEDIA_STREAM) 320 m_mediaStream = 0; 311 321 #endif 312 322 … … 348 358 #endif 349 359 360 #if ENABLE(MEDIA_STREAM) 361 bool MediaPlayer::load(MediaStreamPrivate* mediaStream) 362 { 363 ASSERT(mediaStream); 364 m_mediaStream = mediaStream; 365 m_keySystem = ""; 366 m_contentMIMETypeWasInferredFromExtension = false; 367 loadWithNextMediaEngine(0); 368 return m_currentMediaEngine; 369 } 370 #endif 371 350 372 const MediaPlayerFactory* MediaPlayer::nextBestMediaEngine(const MediaPlayerFactory* current) const 351 373 { … … 359 381 #if ENABLE(MEDIA_SOURCE) 360 382 parameters.isMediaSource = !!m_mediaSource; 383 #endif 384 #if ENABLE(MEDIA_STREAM) 385 parameters.isMediaStream = !!m_mediaStream; 361 386 #endif 362 387 … … 397 422 else 398 423 #endif 424 #if ENABLE(MEDIA_STREAM) 425 if (m_mediaStream) 426 m_private->load(m_mediaStream.get()); 427 else 428 #endif 399 429 m_private->load(m_url.string()); 400 430 } else { -
trunk/Source/WebCore/platform/graphics/MediaPlayer.h
r180839 r181153 75 75 class MediaSourcePrivateClient; 76 76 #endif 77 #if ENABLE(MEDIA_STREAM) 78 class MediaStreamPrivate; 79 #endif 77 80 class MediaPlayerPrivateInterface; 78 81 class TextTrackRepresentation; … … 114 117 bool isMediaSource; 115 118 #endif 119 #if ENABLE(MEDIA_STREAM) 120 bool isMediaStream; 121 #endif 116 122 117 123 MediaEngineSupportParameters() … … 120 126 #endif 121 127 { 128 #if ENABLE(MEDIA_STREAM) 129 isMediaStream = false; 130 #endif 122 131 } 123 132 }; … … 325 334 bool load(const URL&, const ContentType&, MediaSourcePrivateClient*); 326 335 #endif 336 #if ENABLE(MEDIA_STREAM) 337 bool load(MediaStreamPrivate*); 338 #endif 327 339 void cancelLoad(); 328 340 … … 605 617 RefPtr<MediaSourcePrivateClient> m_mediaSource; 606 618 #endif 619 #if ENABLE(MEDIA_STREAM) 620 RefPtr<MediaStreamPrivate> m_mediaStream; 621 #endif 607 622 }; 608 623 -
trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h
r180839 r181153 49 49 virtual void load(const String& url, MediaSourcePrivateClient*) = 0; 50 50 #endif 51 #if ENABLE(MEDIA_STREAM) 52 virtual void load(MediaStreamPrivate*) = 0; 53 #endif 51 54 virtual void cancelLoad() = 0; 52 55 -
trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h
r180839 r181153 153 153 #if ENABLE(MEDIA_SOURCE) 154 154 virtual void load(const String&, MediaSourcePrivateClient*); 155 #endif 156 #if ENABLE(MEDIA_STREAM) 157 virtual void load(MediaStreamPrivate*) { } 155 158 #endif 156 159 virtual void cancelLoad() = 0; -
trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h
r181006 r181153 96 96 virtual void load(const String& url) override; 97 97 virtual void load(const String& url, MediaSourcePrivateClient*) override; 98 #if ENABLE(MEDIA_STREAM) 99 virtual void load(MediaStreamPrivate*) { } 100 #endif 98 101 virtual void cancelLoad() override; 99 102 -
trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
r180532 r181153 318 318 m_mediaSource = mediaSource; 319 319 load(mediasourceUri); 320 } 321 #endif 322 323 #if ENABLE(MEDIA_STREAM) 324 void MediaPlayerPrivateGStreamer::load(MediaStreamPrivate* mediaStream) 325 { 326 notImplemented(); 320 327 } 321 328 #endif -
trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h
r180531 r181153 76 76 #if ENABLE(MEDIA_SOURCE) 77 77 void load(const String& url, MediaSourcePrivateClient*); 78 #endif 79 #if ENABLE(MEDIA_STREAM) 80 void load(MediaStreamPrivate*); 78 81 #endif 79 82 void commitLoad(); -
trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h
r180839 r181153 86 86 #if ENABLE(MEDIA_SOURCE) 87 87 virtual void load(const String&, MediaSourcePrivateClient*); 88 #endif 89 #if ENABLE(MEDIA_STREAM) 90 virtual void load(MediaStreamPrivate*) { } 88 91 #endif 89 92 void cancelLoad(); -
trunk/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.h
r180839 r181153 61 61 virtual void load(const String& url) override; 62 62 virtual void load(const String& url, MediaSourcePrivateClient*) override; 63 #if ENABLE(MEDIA_STREAM) 64 virtual void load(MediaStreamPrivate*) override { }; 65 #endif 63 66 virtual void cancelLoad() override; 64 67 virtual void play() override;
Note: See TracChangeset
for help on using the changeset viewer.