Changeset 196117 in webkit


Ignore:
Timestamp:
Feb 4, 2016 3:39:31 AM (8 years ago)
Author:
alex
Message:

[GTK] Implement mediastream mediaplayer
​https://bugs.webkit.org/show_bug.cgi?id=153541

Reviewed by Martin Robinson.

Added the implementation of the mediaplayer for the
mediastream. The code was implemented by Philippe Normand and
Alessandro Decina.

  • PlatformGTK.cmake: Added the file to the compilation.
  • html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::setSrcObject): Set the src of the
media element to the mediastream.

  • platform/graphics/MediaPlayer.cpp:

(WebCore::buildMediaEnginesVector): Register the mediastream
mediaplayer as an option in the media engines vector.

  • platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp: Added.

(WebCore::MediaPlayerPrivateGStreamerOwr::MediaPlayerPrivateGStreamerOwr):
(WebCore::MediaPlayerPrivateGStreamerOwr::~MediaPlayerPrivateGStreamerOwr):
(WebCore::MediaPlayerPrivateGStreamerOwr::play):
(WebCore::MediaPlayerPrivateGStreamerOwr::pause):
(WebCore::MediaPlayerPrivateGStreamerOwr::hasVideo):
(WebCore::MediaPlayerPrivateGStreamerOwr::hasAudio):
(WebCore::MediaPlayerPrivateGStreamerOwr::currentTime):
(WebCore::MediaPlayerPrivateGStreamerOwr::load):
(WebCore::MediaPlayerPrivateGStreamerOwr::loadingFailed):
(WebCore::MediaPlayerPrivateGStreamerOwr::didLoadingProgress):
(WebCore::MediaPlayerPrivateGStreamerOwr::internalLoad):
(WebCore::MediaPlayerPrivateGStreamerOwr::stop):
(WebCore::MediaPlayerPrivateGStreamerOwr::registerMediaEngine):
(WebCore::MediaPlayerPrivateGStreamerOwr::getSupportedTypes):
(WebCore::MediaPlayerPrivateGStreamerOwr::supportsType):
(WebCore::MediaPlayerPrivateGStreamerOwr::isAvailable):
(WebCore::MediaPlayerPrivateGStreamerOwr::createGSTAudioSinkBin):
(WebCore::MediaPlayerPrivateGStreamerOwr::sourceStopped):
(WebCore::MediaPlayerPrivateGStreamerOwr::sourceMutedChanged):
(WebCore::MediaPlayerPrivateGStreamerOwr::sourceSettingsChanged):
(WebCore::MediaPlayerPrivateGStreamerOwr::preventSourceFromStopping):
(WebCore::MediaPlayerPrivateGStreamerOwr::createVideoSink):

  • platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.h: Added.

(WebCore::MediaPlayerPrivateGStreamerOwr::engineDescription):
(WebCore::MediaPlayerPrivateGStreamerOwr::load):
(WebCore::MediaPlayerPrivateGStreamerOwr::cancelLoad):
(WebCore::MediaPlayerPrivateGStreamerOwr::prepareToPlay):
(WebCore::MediaPlayerPrivateGStreamerOwr::duration):
(WebCore::MediaPlayerPrivateGStreamerOwr::seek):
(WebCore::MediaPlayerPrivateGStreamerOwr::seeking):
(WebCore::MediaPlayerPrivateGStreamerOwr::setRate):
(WebCore::MediaPlayerPrivateGStreamerOwr::setPreservesPitch):
(WebCore::MediaPlayerPrivateGStreamerOwr::paused):
(WebCore::MediaPlayerPrivateGStreamerOwr::hasClosedCaptions):
(WebCore::MediaPlayerPrivateGStreamerOwr::setClosedCaptionsVisible):
(WebCore::MediaPlayerPrivateGStreamerOwr::maxTimeSeekable):
(WebCore::MediaPlayerPrivateGStreamerOwr::buffered):
(WebCore::MediaPlayerPrivateGStreamerOwr::totalBytes):
(WebCore::MediaPlayerPrivateGStreamerOwr::bytesLoaded):
(WebCore::MediaPlayerPrivateGStreamerOwr::canLoadPoster):
(WebCore::MediaPlayerPrivateGStreamerOwr::setPoster):
(WebCore::MediaPlayerPrivateGStreamerOwr::isLiveStream):
(WebCore::MediaPlayerPrivateGStreamerOwr::audioSink):

Location:
trunk/Source/WebCore
Files:
2 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r196115 r196117  
     12016-02-04  Alejandro G. Castro  <alex@igalia.com>
     2
     3        [GTK] Implement mediastream mediaplayer
     4        https://bugs.webkit.org/show_bug.cgi?id=153541
     5
     6        Reviewed by Martin Robinson.
     7
     8        Added the implementation of the mediaplayer for the
     9        mediastream. The code was implemented by Philippe Normand and
     10        Alessandro Decina.
     11
     12        * PlatformGTK.cmake: Added the file to the compilation.
     13        * html/HTMLMediaElement.cpp:
     14        (WebCore::HTMLMediaElement::setSrcObject): Set the src of the
     15        media element to the mediastream.
     16        * platform/graphics/MediaPlayer.cpp:
     17        (WebCore::buildMediaEnginesVector): Register the mediastream
     18        mediaplayer as an option in the media engines vector.
     19        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp: Added.
     20        (WebCore::MediaPlayerPrivateGStreamerOwr::MediaPlayerPrivateGStreamerOwr):
     21        (WebCore::MediaPlayerPrivateGStreamerOwr::~MediaPlayerPrivateGStreamerOwr):
     22        (WebCore::MediaPlayerPrivateGStreamerOwr::play):
     23        (WebCore::MediaPlayerPrivateGStreamerOwr::pause):
     24        (WebCore::MediaPlayerPrivateGStreamerOwr::hasVideo):
     25        (WebCore::MediaPlayerPrivateGStreamerOwr::hasAudio):
     26        (WebCore::MediaPlayerPrivateGStreamerOwr::currentTime):
     27        (WebCore::MediaPlayerPrivateGStreamerOwr::load):
     28        (WebCore::MediaPlayerPrivateGStreamerOwr::loadingFailed):
     29        (WebCore::MediaPlayerPrivateGStreamerOwr::didLoadingProgress):
     30        (WebCore::MediaPlayerPrivateGStreamerOwr::internalLoad):
     31        (WebCore::MediaPlayerPrivateGStreamerOwr::stop):
     32        (WebCore::MediaPlayerPrivateGStreamerOwr::registerMediaEngine):
     33        (WebCore::MediaPlayerPrivateGStreamerOwr::getSupportedTypes):
     34        (WebCore::MediaPlayerPrivateGStreamerOwr::supportsType):
     35        (WebCore::MediaPlayerPrivateGStreamerOwr::isAvailable):
     36        (WebCore::MediaPlayerPrivateGStreamerOwr::createGSTAudioSinkBin):
     37        (WebCore::MediaPlayerPrivateGStreamerOwr::sourceStopped):
     38        (WebCore::MediaPlayerPrivateGStreamerOwr::sourceMutedChanged):
     39        (WebCore::MediaPlayerPrivateGStreamerOwr::sourceSettingsChanged):
     40        (WebCore::MediaPlayerPrivateGStreamerOwr::preventSourceFromStopping):
     41        (WebCore::MediaPlayerPrivateGStreamerOwr::createVideoSink):
     42        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.h: Added.
     43        (WebCore::MediaPlayerPrivateGStreamerOwr::engineDescription):
     44        (WebCore::MediaPlayerPrivateGStreamerOwr::load):
     45        (WebCore::MediaPlayerPrivateGStreamerOwr::cancelLoad):
     46        (WebCore::MediaPlayerPrivateGStreamerOwr::prepareToPlay):
     47        (WebCore::MediaPlayerPrivateGStreamerOwr::duration):
     48        (WebCore::MediaPlayerPrivateGStreamerOwr::seek):
     49        (WebCore::MediaPlayerPrivateGStreamerOwr::seeking):
     50        (WebCore::MediaPlayerPrivateGStreamerOwr::setRate):
     51        (WebCore::MediaPlayerPrivateGStreamerOwr::setPreservesPitch):
     52        (WebCore::MediaPlayerPrivateGStreamerOwr::paused):
     53        (WebCore::MediaPlayerPrivateGStreamerOwr::hasClosedCaptions):
     54        (WebCore::MediaPlayerPrivateGStreamerOwr::setClosedCaptionsVisible):
     55        (WebCore::MediaPlayerPrivateGStreamerOwr::maxTimeSeekable):
     56        (WebCore::MediaPlayerPrivateGStreamerOwr::buffered):
     57        (WebCore::MediaPlayerPrivateGStreamerOwr::totalBytes):
     58        (WebCore::MediaPlayerPrivateGStreamerOwr::bytesLoaded):
     59        (WebCore::MediaPlayerPrivateGStreamerOwr::canLoadPoster):
     60        (WebCore::MediaPlayerPrivateGStreamerOwr::setPoster):
     61        (WebCore::MediaPlayerPrivateGStreamerOwr::isLiveStream):
     62        (WebCore::MediaPlayerPrivateGStreamerOwr::audioSink):
     63
    1642016-02-04  Youenn Fablet  <youenn.fablet@crf.canon.fr>
    265

  • trunk/Source/WebCore/PlatformEfl.cmake

    r195661 r196117  
    389389        ${OPENWEBRTC_LIBRARIES}
    390390    )
     391    list(APPEND WebCore_SOURCES
     392        platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp
     393    )
    391394endif ()
    392395

  • trunk/Source/WebCore/PlatformGTK.cmake

    r195810 r196117  
    407407    list(APPEND WebCore_LIBRARIES
    408408        ${OPENWEBRTC_LIBRARIES}
     409    )
     410    list(APPEND WebCore_SOURCES
     411        platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp
    409412    )
    410413endif ()

  • trunk/Source/WebCore/html/HTMLMediaElement.cpp

    r196080 r196117  
    134134
    135135#if ENABLE(MEDIA_STREAM)
     136#include "DOMURL.h"
    136137#include "MediaStream.h"
    137138#include "MediaStreamRegistry.h"
    … …  
    909910
    910911    m_mediaStreamSrcObject = mediaStream;
     912    setSrc(DOMURL::createPublicURL(ActiveDOMObject::scriptExecutionContext(), mediaStream));
    911913}
    912914#endif

  • trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp

    r196080 r196117  
    5454#if USE(GSTREAMER)
    5555#include "MediaPlayerPrivateGStreamer.h"
     56#if ENABLE(MEDIA_STREAM) && USE(OPENWEBRTC)
     57#include "MediaPlayerPrivateGStreamerOwr.h"
     58#endif
    5659#define PlatformMediaEngineClassName MediaPlayerPrivateGStreamer
    5760#endif
    … …  
    208211    if (Settings::isQTKitEnabled())
    209212        MediaPlayerPrivateQTKit::registerMediaEngine(addMediaEngine);
     213#endif
     214
     215
     216#if ENABLE(MEDIA_STREAM) && USE(GSTREAMER) && USE(OPENWEBRTC)
     217    MediaPlayerPrivateGStreamerOwr::registerMediaEngine(addMediaEngine);
    210218#endif
    211219
Note: See TracChangeset for help on using the changeset viewer.