| commit | 4843f46ea7b6b6e17470e670d9c9f748c3455720 | [log] [tgz] |
|---|---|---|
| author | cturner@igalia.com <cturner@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> | Mon Nov 25 11:25:06 2019 +0000 |
| committer | cturner@igalia.com <cturner@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> | Mon Nov 25 11:25:06 2019 +0000 |
| tree | 1a976db1acdda30ef20ed3d131767020ad33cd69 | |
| parent | e4cd3b4fab6166d1288984ded40c588439dab925 [diff] |
[GStreamer] Flatten MediaPlayerPrivateGStreamer into MediaPlayerPrivateGStreamerBase https://bugs.webkit.org/show_bug.cgi?id=204352 Reviewed by Philippe Normand. Source/WebCore: The inheritance link between the base player and the private player no longer serves a purpose. The only user of the base class is the private player. Squashing these toghether makes it easy to do further refactorings, since everything can be seen in one place rather than being arbitrarily split into two classes and having to do derived-to-base conversions in your head for no gain in clarity elsewhere. Aside from merging the classes, the only other change here is switching to in-class initialization of many member variables, rather than a long list of initializations in the constructor that gets fiddly with -Wreorder. These classes are much too large and could use some redesign, this is only a first step toward that goal. This is a refactoring, hopefully well covered by our existing tests! * platform/GStreamer.cmake: * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp: (WebCore::greatestCommonDivisor): (WebCore::busMessageCallback): (WebCore::convertToInternalProtocol): (WebCore::GstVideoFrameHolder::GstVideoFrameHolder): (WebCore::GstVideoFrameHolder::~GstVideoFrameHolder): (WebCore::GstVideoFrameHolder::waitForCPUSync): (WebCore::GstVideoFrameHolder::size const): (WebCore::GstVideoFrameHolder::hasAlphaChannel const): (WebCore::GstVideoFrameHolder::flags const): (WebCore::GstVideoFrameHolder::textureID const): (WebCore::GstVideoFrameHolder::hasMappedTextures const): (WebCore::GstVideoFrameHolder::videoFrame const): (WebCore::GstVideoFrameHolder::updateTexture): (WebCore::GstVideoFrameHolder::platformLayerBuffer): (WebCore::MediaPlayerPrivateGStreamer::initializeDebugCategory): (WebCore::MediaPlayerPrivateGStreamer::MediaPlayerPrivateGStreamer): (WebCore::MediaPlayerPrivateGStreamer::~MediaPlayerPrivateGStreamer): (WebCore::MediaPlayerPrivateGStreamer::isAvailable): (WebCore::MediaPlayerPrivateGStreamer::registerMediaEngine): (WebCore::MediaPlayerPrivateGStreamer::load): (WebCore::MediaPlayerPrivateGStreamer::cancelLoad): (WebCore::MediaPlayerPrivateGStreamer::paused const): (WebCore::MediaPlayerPrivateGStreamer::doSeek): (WebCore::MediaPlayerPrivateGStreamer::platformDuration const): (WebCore::MediaPlayerPrivateGStreamer::durationMediaTime const): (WebCore::MediaPlayerPrivateGStreamer::currentMediaTime const): (WebCore::MediaPlayerPrivateGStreamer::setRate): (WebCore::MediaPlayerPrivateGStreamer::rate const): (WebCore::MediaPlayerPrivateGStreamer::setPreservesPitch): (WebCore::MediaPlayerPrivateGStreamer::setPreload): (WebCore::MediaPlayerPrivateGStreamer::buffered const): (WebCore::MediaPlayerPrivateGStreamer::maxMediaTimeSeekable const): (WebCore::MediaPlayerPrivateGStreamer::maxTimeLoaded const): (WebCore::MediaPlayerPrivateGStreamer::didLoadingProgress const): (WebCore::MediaPlayerPrivateGStreamer::totalBytes const): (WebCore::MediaPlayerPrivateGStreamer::hasSingleSecurityOrigin const): (WebCore::MediaPlayerPrivateGStreamer::wouldTaintOrigin const): (WebCore::MediaPlayerPrivateGStreamer::simulateAudioInterruption): (WebCore::MediaPlayerPrivateGStreamer::ensureAudioSourceProvider): (WebCore::MediaPlayerPrivateGStreamer::audioSourceProvider): (WebCore::MediaPlayerPrivateGStreamer::durationChanged): (WebCore::MediaPlayerPrivateGStreamer::sourceSetup): (WebCore::MediaPlayerPrivateGStreamer::setAudioStreamPropertiesCallback): (WebCore::MediaPlayerPrivateGStreamer::setAudioStreamProperties): (WebCore::MediaPlayerPrivateGStreamer::sourceSetupCallback): (WebCore::MediaPlayerPrivateGStreamer::changePipelineState): (WebCore::MediaPlayerPrivateGStreamer::setPlaybinURL): (WebCore::setSyncOnClock): (WebCore::MediaPlayerPrivateGStreamer::syncOnClock): (WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfVideo): (WebCore::MediaPlayerPrivateGStreamer::videoSinkCapsChangedCallback): (WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfVideoCaps): (WebCore::MediaPlayerPrivateGStreamer::audioChangedCallback): (WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfAudio): (WebCore::MediaPlayerPrivateGStreamer::textChangedCallback): (WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfText): (WebCore::MediaPlayerPrivateGStreamer::newTextSampleCallback): (WebCore::MediaPlayerPrivateGStreamer::newTextSample): (WebCore::MediaPlayerPrivateGStreamer::fillTimerFired): (WebCore::MediaPlayerPrivateGStreamer::loadStateChanged): (WebCore::MediaPlayerPrivateGStreamer::timeChanged): (WebCore::MediaPlayerPrivateGStreamer::loadingFailed): (WebCore::MediaPlayerPrivateGStreamer::createAudioSink): (WebCore::MediaPlayerPrivateGStreamer::audioSink const): (WebCore::MediaPlayerPrivateGStreamer::playbackPosition const): (WebCore::MediaPlayerPrivateGStreamer::enableTrack): (WebCore::MediaPlayerPrivateGStreamer::updateTracks): (WebCore::MediaPlayerPrivateGStreamer::clearTracks): (WebCore::MediaPlayerPrivateGStreamer::videoChangedCallback): (WebCore::MediaPlayerPrivateGStreamer::setPipeline): (WebCore::MediaPlayerPrivateGStreamer::handleSyncMessage): (WebCore::MediaPlayerPrivateGStreamer::requestGLContext): (WebCore::MediaPlayerPrivateGStreamer::ensureGstGLContext): (WebCore::MediaPlayerPrivateGStreamer::naturalSize const): (WebCore::MediaPlayerPrivateGStreamer::setVolume): (WebCore::MediaPlayerPrivateGStreamer::volume const): (WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfVolumeChange): (WebCore::MediaPlayerPrivateGStreamer::volumeChangedCallback): (WebCore::MediaPlayerPrivateGStreamer::networkState const): (WebCore::MediaPlayerPrivateGStreamer::readyState const): (WebCore::MediaPlayerPrivateGStreamer::sizeChanged): (WebCore::MediaPlayerPrivateGStreamer::setMuted): (WebCore::MediaPlayerPrivateGStreamer::muted const): (WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfMute): (WebCore::MediaPlayerPrivateGStreamer::muteChangedCallback): (WebCore::MediaPlayerPrivateGStreamer::handleMessage): (WebCore::MediaPlayerPrivateGStreamer::processBufferingStats): (WebCore::MediaPlayerPrivateGStreamer::updateMaxTimeLoaded): (WebCore::MediaPlayerPrivateGStreamer::updateBufferingStatus): (WebCore::MediaPlayerPrivateGStreamer::processMpegTsSection): (WebCore::MediaPlayerPrivateGStreamer::processTableOfContents): (WebCore::MediaPlayerPrivateGStreamer::processTableOfContentsEntry): (WebCore::MediaPlayerPrivateGStreamer::purgeInvalidAudioTracks): (WebCore::MediaPlayerPrivateGStreamer::purgeInvalidVideoTracks): (WebCore::MediaPlayerPrivateGStreamer::purgeInvalidTextTracks): (WebCore::MediaPlayerPrivateGStreamer::uriDecodeBinElementAddedCallback): (WebCore::MediaPlayerPrivateGStreamer::downloadBufferFileCreatedCallback): (WebCore::MediaPlayerPrivateGStreamer::purgeOldDownloadFiles): (WebCore::MediaPlayerPrivateGStreamer::asyncStateChangeDone): (WebCore::MediaPlayerPrivateGStreamer::updateStates): (WebCore::MediaPlayerPrivateGStreamer::mediaLocationChanged): (WebCore::MediaPlayerPrivateGStreamer::loadNextLocation): (WebCore::MediaPlayerPrivateGStreamer::didEnd): (WebCore::MediaPlayerPrivateGStreamer::getSupportedTypes): (WebCore::MediaPlayerPrivateGStreamer::supportsType): (WebCore::MediaPlayerPrivateGStreamer::updateDownloadBufferingFlag): (WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin): (WebCore::MediaPlayerPrivateGStreamer::didPassCORSAccessCheck const): (WebCore::MediaPlayerPrivateGStreamer::canSaveMediaData const): (WebCore::MediaPlayerPrivateGStreamer::readyTimerFired): (WebCore::MediaPlayerPrivateGStreamer::acceleratedRenderingStateChanged): (WebCore::MediaPlayerPrivateGStreamer::platformLayer const): (WebCore::MediaPlayerPrivateGStreamer::swapBuffersIfNeeded): (WebCore::MediaPlayerPrivateGStreamer::proxy const): (WebCore::MediaPlayerPrivateGStreamer::pushTextureToCompositor): (WebCore::MediaPlayerPrivateGStreamer::repaint): (WebCore::MediaPlayerPrivateGStreamer::triggerRepaint): (WebCore::MediaPlayerPrivateGStreamer::repaintCallback): (WebCore::MediaPlayerPrivateGStreamer::cancelRepaint): (WebCore::MediaPlayerPrivateGStreamer::repaintCancelledCallback): (WebCore::MediaPlayerPrivateGStreamer::newSampleCallback): (WebCore::MediaPlayerPrivateGStreamer::newPrerollCallback): (WebCore::MediaPlayerPrivateGStreamer::flushCurrentBuffer): (WebCore::MediaPlayerPrivateGStreamer::setSize): (WebCore::MediaPlayerPrivateGStreamer::paint): (WebCore::MediaPlayerPrivateGStreamer::copyVideoTextureToPlatformTexture): (WebCore::MediaPlayerPrivateGStreamer::nativeImageForCurrentTime): (WebCore::MediaPlayerPrivateGStreamer::setVideoSourceOrientation): (WebCore::MediaPlayerPrivateGStreamer::updateTextureMapperFlags): (WebCore::MediaPlayerPrivateGStreamer::supportsFullscreen const): (WebCore::MediaPlayerPrivateGStreamer::movieLoadType const): (WebCore::MediaPlayerPrivateGStreamer::createGLAppSink): (WebCore::MediaPlayerPrivateGStreamer::createVideoSinkGL): (WebCore::MediaPlayerPrivateGStreamer::ensureGLVideoSinkContext): (WebCore::setRectangleToVideoSink): (WebCore::GStreamerHolePunchClient::GStreamerHolePunchClient): (WebCore::MediaPlayerPrivateGStreamer::createHolePunchVideoSink): (WebCore::MediaPlayerPrivateGStreamer::pushNextHolePunchBuffer): (WebCore::MediaPlayerPrivateGStreamer::createVideoSink): (WebCore::MediaPlayerPrivateGStreamer::setStreamVolumeElement): (WebCore::MediaPlayerPrivateGStreamer::decodedFrameCount const): (WebCore::MediaPlayerPrivateGStreamer::droppedFrameCount const): (WebCore::MediaPlayerPrivateGStreamer::audioDecodedByteCount const): (WebCore::MediaPlayerPrivateGStreamer::videoDecodedByteCount const): (WebCore::MediaPlayerPrivateGStreamer::initializationDataEncountered): (WebCore::MediaPlayerPrivateGStreamer::cdmInstanceAttached): (WebCore::MediaPlayerPrivateGStreamer::cdmInstanceDetached): (WebCore::MediaPlayerPrivateGStreamer::attemptToDecryptWithInstance): (WebCore::MediaPlayerPrivateGStreamer::attemptToDecryptWithLocalInstance): (WebCore::MediaPlayerPrivateGStreamer::handleProtectionEvent): (WebCore::MediaPlayerPrivateGStreamer::setWaitingForKey): (WebCore::MediaPlayerPrivateGStreamer::waitingForKey const): (WebCore::MediaPlayerPrivateGStreamer::supportsKeySystem): (WebCore::MediaPlayerPrivateGStreamer::extendedSupportsType): * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h: (WebCore::MediaPlayerPrivateGStreamer::mediaPlayer const): (WebCore::MediaPlayerPrivateGStreamer::pipeline const): (WebCore::MediaPlayerPrivateGStreamer::isLiveStream const): (WebCore::MediaPlayerPrivateGStreamer::configurePlaySink): (WebCore::MediaPlayerPrivateGStreamer::gstGLContext const): (WebCore::MediaPlayerPrivateGStreamer::gstGLDisplay const): (WebCore::MediaPlayerPrivateGStreamer::videoSink const): * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp: Removed. * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h: Removed. Tools: * Scripts/webkitpy/style/checker.py: The base class no longer exists, perform the check on the player private. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@252852 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit is a cross-platform web browser engine. On iOS and macOS, it powers Safari, Mail, iBooks, and many other applications.
Visit WebKit Feature Status page to see which Web API has been implemented, in development, or under consideration.
On macOS, download Safari Technology Preview to test the latest version of WebKit. On Linux, download Epiphany Technology Preview. On Windows, you'll have to build it yourself.
Once your bug is filed, you will receive email when it is updated at each stage in the bug life cycle. After the bug is considered fixed, you may be asked to download the latest nightly and confirm that the fix works for you.
On Windows, follow the instructions on our website.
Run the following command to clone WebKit's Git SVN repository:
git clone git://git.webkit.org/WebKit.git WebKit
or
git clone https://git.webkit.org/git/WebKit.git WebKit
If you want to be able to commit changes to the repository, or just want to check out branches that aren’t contained in WebKit.git, you will need track WebKit's Subversion repository. You can run the following command to configure this and other options of the new Git clone for WebKit development.
Tools/Scripts/webkit-patch setup-git-clone
For information about this, and other aspects of using Git with WebKit, read the wiki page.
If you don‘t want to use Git, run the following command to check out WebKit’s Subversion repository:
svn checkout https://svn.webkit.org/repository/webkit/trunk WebKit
Install Xcode and its command line tools if you haven't done so already:
xcode-select --installRun the following command to build a debug build with debugging symbols and assertions:
Tools/Scripts/build-webkit --debug
For performance testing, and other purposes, use --release instead.
You can open WebKit.xcworkspace to build and debug WebKit within Xcode.
If you don't use a custom build location in Xcode preferences, you have to update the workspace settings to use WebKitBuild directory. In menu bar, choose File > Workspace Settings, then click the Advanced button, select “Custom”, “Relative to Workspace”, and enter WebKitBuild for both Products and Intermediates.
The first time after you install a new Xcode, you will need to run the following command to enable Xcode to build command line tools for iOS Simulator:
sudo Tools/Scripts/configure-xcode-for-ios-development
Without this step, you will see the error message: “target specifies product type ‘com.apple.product-type.tool’, but there’s no such product type for the ‘iphonesimulator’ platform.” when building target JSCLLIntOffsetsExtractor of project JavaScriptCore.
Run the following command to build a debug build with debugging symbols and assertions for iOS:
Tools/Scripts/build-webkit --debug --ios-simulator
For production builds:
cmake -DPORT=GTK -DCMAKE_BUILD_TYPE=RelWithDebInfo -GNinja ninja sudo ninja install
For development builds:
Tools/gtk/install-dependencies Tools/Scripts/update-webkitgtk-libs Tools/Scripts/build-webkit --gtk --debug
For more information on building WebKitGTK+, see the wiki page.
For production builds:
cmake -DPORT=WPE -DCMAKE_BUILD_TYPE=RelWithDebInfo -GNinja ninja sudo ninja install
For development builds:
Tools/wpe/install-dependencies Tools/Scripts/update-webkitwpe-libs Tools/Scripts/build-webkit --wpe --debug
For building WebKit on Windows, see the wiki page.
Run the following command to launch Safari with your local build of WebKit:
Tools/Scripts/run-safari --debug
The run-safari script sets the DYLD_FRAMEWORK_PATH environment variable to point to your build products, and then launches /Applications/Safari.app. DYLD_FRAMEWORK_PATH tells the system loader to prefer your build products over the frameworks installed in /System/Library/Frameworks.
To run other applications with your local build of WebKit, run the following command:
Tools/Scripts/run-webkit-app <application-path>
Run the following command to launch iOS simulator with your local build of WebKit:
run-safari --debug --ios-simulator
In both cases, if you have built release builds instead, use --release instead of --debug.
If you have a development build, you can use the run-minibrowser script, e.g.:
run-minibrowser --debug --wpe
Pass one of --gtk, --jsc-only, or --wpe to indicate the port to use.
Congratulations! You’re up and running. Now you can begin coding in WebKit and contribute your fixes and new features to the project. For details on submitting your code to the project, read Contributing Code.