Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove MediaPlayerPrivateInterface::duration() and co. #24233

Conversation

jyavenard
Copy link
Member

@jyavenard jyavenard commented Feb 11, 2024

2178ec4

Remove MediaPlayerPrivateInterface::duration() and co.
https://bugs.webkit.org/show_bug.cgi?id=269168
rdar://122743525

Reviewed by Eric Carlson.

Once upon time, we had `currentTime()` and `duration()` that returned a float.
We then had `currentTimeDouble()` and `durationDouble()` that returned a double.
In 110313@main, MediaTime support was added and got quickly adopted across all
the media stack. And so we now had `currentMediaTime()` and `durationMediaTime()`.
The MediaTime prefix was added to all methods and members that were dealing with MediaTime (the object not the media's time).

Now that we have eliminated all but the methods using MediaTime and that MediaTime
is exclusively used to descrine a time, we no longer have to have MediaTime in
the methods' name as when using any time values, a MediaTime type is implied.

Rename only, no change in observable behaviour.

* Source/WebCore/Modules/mediasource/ManagedMediaSource.cpp:
(WebCore::ManagedMediaSource::monitorSourceBuffers):
* Source/WebCore/Modules/mediasource/MediaSource.cpp:
(WebCore::MediaSource::currentTime const):
(WebCore::MediaSource::hasCurrentTime):
(WebCore::MediaSource::hasFutureTime):
(WebCore::MediaSource::currentMediaTime const): Deleted.
* Source/WebCore/Modules/mediasource/MediaSource.h:
* Source/WebCore/Modules/mediasource/SourceBuffer.cpp:
(WebCore::SourceBuffer::rangeRemoval):
(WebCore::SourceBuffer::appendBufferInternal):
(WebCore::SourceBuffer::sourceBufferPrivateAppendComplete):
(WebCore::SourceBuffer::canPlayThroughRange):
(WebCore::SourceBuffer::memoryPressure):
* Source/WebCore/platform/graphics/MediaPlayer.cpp:
(WebCore::MediaPlayer::duration const):
(WebCore::MediaPlayer::currentTime const):
(WebCore::MediaPlayer::currentTimeMayProgress const):
(WebCore::MediaPlayer::maxTimeSeekable const):
(WebCore::MediaPlayer::minTimeSeekable const):
(WebCore::MediaPlayer::performTaskAtTime):
(WebCore::MediaPlayer::performTaskAtMediaTime): Deleted.
* Source/WebCore/platform/graphics/MediaPlayer.h:
* Source/WebCore/platform/graphics/MediaPlayerPrivate.cpp:
(WebCore::MediaPlayerPrivateInterface::seekable const):
(WebCore::MediaPlayerPrivateInterface::currentOrPendingSeekTime const):
* Source/WebCore/platform/graphics/MediaPlayerPrivate.h:
(WebCore::MediaPlayerPrivateInterface::duration const):
(WebCore::MediaPlayerPrivateInterface::currentTime const):
(WebCore::MediaPlayerPrivateInterface::currentTimeMayProgress const):
(WebCore::MediaPlayerPrivateInterface::maxTimeSeekable const):
(WebCore::MediaPlayerPrivateInterface::minTimeSeekable const):
(WebCore::MediaPlayerPrivateInterface::extraMemoryCost const):
(WebCore::MediaPlayerPrivateInterface::performTaskAtTime):
(WebCore::MediaPlayerPrivateInterface::durationDouble const): Deleted.
(WebCore::MediaPlayerPrivateInterface::durationMediaTime const): Deleted.
(WebCore::MediaPlayerPrivateInterface::currentMediaTime const): Deleted.
(WebCore::MediaPlayerPrivateInterface::currentMediaTimeMayProgress const): Deleted.
(WebCore::MediaPlayerPrivateInterface::maxMediaTimeSeekable const): Deleted.
(WebCore::MediaPlayerPrivateInterface::minMediaTimeSeekable const): Deleted.
(WebCore::MediaPlayerPrivateInterface::performTaskAtMediaTime): Deleted.
* Source/WebCore/platform/graphics/MediaSourcePrivate.cpp:
(WebCore::MediaSourcePrivate::currentTime const):
(WebCore::MediaSourcePrivate::currentMediaTime const): Deleted.
* Source/WebCore/platform/graphics/MediaSourcePrivate.h:
* Source/WebCore/platform/graphics/SourceBufferPrivate.cpp:
(WebCore::SourceBufferPrivate::currentTime const):
(WebCore::SourceBufferPrivate::reenqueSamples):
(WebCore::SourceBufferPrivate::processMediaSample):
(WebCore::SourceBufferPrivate::currentMediaTime const): Deleted.
* Source/WebCore/platform/graphics/SourceBufferPrivate.h:
* Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
(WebCore::MediaPlayerPrivateAVFoundation::duration const):
(WebCore::MediaPlayerPrivateAVFoundation::seekToTarget):
(WebCore::MediaPlayerPrivateAVFoundation::maxTimeSeekable const):
(WebCore::MediaPlayerPrivateAVFoundation::minTimeSeekable const):
(WebCore::MediaPlayerPrivateAVFoundation::didLoadingProgress const):
(WebCore::MediaPlayerPrivateAVFoundation::updateStates):
(WebCore::MediaPlayerPrivateAVFoundation::didEnd):
(WebCore::MediaPlayerPrivateAVFoundation::durationMediaTime const): Deleted.
(WebCore::MediaPlayerPrivateAVFoundation::maxMediaTimeSeekable const): Deleted.
(WebCore::MediaPlayerPrivateAVFoundation::minMediaTimeSeekable const): Deleted.
* Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:
* Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
* Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::hasAvailableVideoFrame const):
(WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayer):
(WebCore::MediaPlayerPrivateAVFoundationObjC::currentTime const):
(WebCore::MediaPlayerPrivateAVFoundationObjC::currentTimeDidChange const):
(WebCore::MediaPlayerPrivateAVFoundationObjC::platformMaxTimeSeekable const):
(WebCore::MediaPlayerPrivateAVFoundationObjC::updateLastPixelBuffer):
(WebCore::MediaPlayerPrivateAVFoundationObjC::videoFrameForCurrentTime):
(WebCore::MediaPlayerPrivateAVFoundationObjC::performTaskAtTime):
(-[WebCoreAVFMovieObserver metadataOutput:didOutputTimedMetadataGroups:fromPlayerItemTrack:]):
(-[WebCoreAVFMovieObserver metadataCollector:didCollectDateRangeMetadataGroups:indexesOfNewGroups:indexesOfModifiedGroups:]):
(WebCore::MediaPlayerPrivateAVFoundationObjC::currentMediaTime const): Deleted.
(WebCore::MediaPlayerPrivateAVFoundationObjC::currentMediaTimeDidChange const): Deleted.
(WebCore::MediaPlayerPrivateAVFoundationObjC::performTaskAtMediaTime): Deleted.
* Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h:
* Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::playInternal):
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::duration const):
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::currentTime const):
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::currentTimeMayProgress const):
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::maxTimeSeekable const):
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::minTimeSeekable const):
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::updateLastPixelBuffer):
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::videoFrameForCurrentTime):
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::durationChanged):
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::sizeWillChangeAtTime):
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::performTaskAtTime):
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::durationMediaTime const): Deleted.
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::currentMediaTime const): Deleted.
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::currentMediaTimeMayProgress const): Deleted.
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::maxMediaTimeSeekable const): Deleted.
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::minMediaTimeSeekable const): Deleted.
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::performTaskAtMediaTime): Deleted.
* Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h:
* Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::duration const):
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::durationMediaTime const): Deleted.
* Source/WebCore/platform/graphics/cocoa/MediaPlayerPrivateWebM.h:
* Source/WebCore/platform/graphics/cocoa/MediaPlayerPrivateWebM.mm:
(WebCore::MediaPlayerPrivateWebM::play):
(WebCore::MediaPlayerPrivateWebM::currentTime const):
(WebCore::MediaPlayerPrivateWebM::updateLastPixelBuffer):
(WebCore::MediaPlayerPrivateWebM::videoFrameForCurrentTime):
(WebCore::MediaPlayerPrivateWebM::setDuration):
(WebCore::MediaPlayerPrivateWebM::reenqueSamples):
(WebCore::MediaPlayerPrivateWebM::currentMediaTime const): Deleted.
* Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
(WebCore::MediaPlayerPrivateGStreamer::pause):
(WebCore::MediaPlayerPrivateGStreamer::doSeek):
(WebCore::MediaPlayerPrivateGStreamer::seekToTarget):
(WebCore::MediaPlayerPrivateGStreamer::duration const):
(WebCore::MediaPlayerPrivateGStreamer::currentTime const):
(WebCore::MediaPlayerPrivateGStreamer::buffered const):
(WebCore::MediaPlayerPrivateGStreamer::maxTimeSeekable const):
(WebCore::MediaPlayerPrivateGStreamer::maxTimeLoaded const):
(WebCore::MediaPlayerPrivateGStreamer::didLoadingProgress const):
(WebCore::MediaPlayerPrivateGStreamer::durationChanged):
(WebCore::MediaPlayerPrivateGStreamer::playbackPosition const):
(WebCore::MediaPlayerPrivateGStreamer::handleMessage):
(WebCore::MediaPlayerPrivateGStreamer::updateMaxTimeLoaded):
(WebCore::MediaPlayerPrivateGStreamer::processMpegTsSection):
(WebCore::MediaPlayerPrivateGStreamer::didEnd):
(WebCore::MediaPlayerPrivateGStreamer::performTaskAtTime):
(WebCore::MediaPlayerPrivateGStreamer::durationMediaTime const): Deleted.
(WebCore::MediaPlayerPrivateGStreamer::currentMediaTime const): Deleted.
(WebCore::MediaPlayerPrivateGStreamer::maxMediaTimeSeekable const): Deleted.
(WebCore::MediaPlayerPrivateGStreamer::performTaskAtMediaTime): Deleted.
* Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
* Source/WebCore/platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.cpp:
(WebCore::MediaPlayerPrivateGStreamerMSE::duration const):
(WebCore::MediaPlayerPrivateGStreamerMSE::propagateReadyStateToPlayer):
(WebCore::MediaPlayerPrivateGStreamerMSE::didPreroll):
(WebCore::MediaPlayerPrivateGStreamerMSE::maxTimeSeekable const):
(WebCore::MediaPlayerPrivateGStreamerMSE::currentTimeMayProgress const):
(WebCore::MediaPlayerPrivateGStreamerMSE::durationMediaTime const): Deleted.
(WebCore::MediaPlayerPrivateGStreamerMSE::maxMediaTimeSeekable const): Deleted.
(WebCore::MediaPlayerPrivateGStreamerMSE::currentMediaTimeMayProgress const): Deleted.
* Source/WebCore/platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.h:
* Source/WebCore/platform/graphics/gstreamer/mse/WebKitMediaSourceGStreamer.cpp:
(webKitMediaSrcStreamFlush):
* Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp:
(WebCore::MediaPlayerPrivateMediaFoundation::duration const):
(WebCore::MediaPlayerPrivateMediaFoundation::currentTime const):
(WebCore::MediaPlayerPrivateMediaFoundation::maxTimeSeekable const):
(WebCore::MediaPlayerPrivateMediaFoundation::durationMediaTime const): Deleted.
(WebCore::MediaPlayerPrivateMediaFoundation::currentMediaTime const): Deleted.
(WebCore::MediaPlayerPrivateMediaFoundation::maxMediaTimeSeekable const): Deleted.
* Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.h:
* Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.cpp:
(WebCore::MockMediaPlayerMediaSource::maxTimeSeekable const):
(WebCore::MockMediaPlayerMediaSource::currentTime const):
(WebCore::MockMediaPlayerMediaSource::currentTimeMayProgress const):
(WebCore::MockMediaPlayerMediaSource::duration const):
(WebCore::MockMediaPlayerMediaSource::maxMediaTimeSeekable const): Deleted.
(WebCore::MockMediaPlayerMediaSource::currentMediaTime const): Deleted.
(WebCore::MockMediaPlayerMediaSource::currentMediaTimeMayProgress const): Deleted.
(WebCore::MockMediaPlayerMediaSource::durationMediaTime const): Deleted.
* Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.h:
* Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.cpp:
(WebKit::RemoteMediaPlayerProxy::performTaskAtMediaTime):
* Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.h:
* Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.messages.in:
* Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp:
(WebKit::MediaPlayerPrivateRemote::TimeProgressEstimator::currentTimeWithLockHeld const):
(WebKit::MediaPlayerPrivateRemote::duration const):
(WebKit::MediaPlayerPrivateRemote::currentTime const):
(WebKit::MediaPlayerPrivateRemote::maxTimeSeekable const):
(WebKit::MediaPlayerPrivateRemote::minTimeSeekable const):
(WebKit::MediaPlayerPrivateRemote::performTaskAtTime):
(WebKit::MediaPlayerPrivateRemote::durationMediaTime const): Deleted.
(WebKit::MediaPlayerPrivateRemote::currentMediaTime const): Deleted.
(WebKit::MediaPlayerPrivateRemote::maxMediaTimeSeekable const): Deleted.
(WebKit::MediaPlayerPrivateRemote::minMediaTimeSeekable const): Deleted.
(WebKit::MediaPlayerPrivateRemote::performTaskAtMediaTime): Deleted.
* Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.h:

Canonical link: https://commits.webkit.org/274449@main

809efe5

Misc iOS, tvOS & watchOS macOS Linux Windows
❌ πŸ§ͺ style βœ… πŸ›  ios βœ… πŸ›  mac βœ… πŸ›  wpe βœ… πŸ›  wincairo
βœ… πŸ§ͺ bindings βœ… πŸ›  ios-sim βœ… πŸ›  mac-AS-debug   πŸ§ͺ wpe-wk2
βœ… πŸ§ͺ webkitperl βœ… πŸ§ͺ ios-wk2 βœ… πŸ§ͺ api-mac βœ… πŸ§ͺ api-wpe
βœ… πŸ§ͺ ios-wk2-wpt βœ… πŸ§ͺ mac-wk1 βœ… πŸ›  gtk
βœ… πŸ§ͺ api-ios βœ… πŸ§ͺ mac-wk2   πŸ§ͺ gtk-wk2
βœ… πŸ›  tv βœ… πŸ§ͺ mac-AS-debug-wk2   πŸ§ͺ api-gtk
βœ… πŸ›  tv-sim
βœ… πŸ›  πŸ§ͺ merge βœ… πŸ›  watch
βœ… πŸ›  watch-sim

@jyavenard jyavenard self-assigned this Feb 11, 2024
@jyavenard jyavenard added the Media Bugs related to the HTML 5 Media elements. label Feb 11, 2024
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Feb 11, 2024
@jyavenard jyavenard removed the merging-blocked Applied to prevent a change from being merged label Feb 11, 2024
@jyavenard jyavenard force-pushed the eng/Remove-MediaPlayerPrivateInterfaceduration-and-co- branch from 9e96787 to dea9134 Compare February 11, 2024 14:09
@jyavenard jyavenard force-pushed the eng/Remove-MediaPlayerPrivateInterfaceduration-and-co- branch from dea9134 to d03a7cd Compare February 11, 2024 14:11
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Feb 11, 2024
@jyavenard jyavenard removed the merging-blocked Applied to prevent a change from being merged label Feb 11, 2024
@jyavenard jyavenard force-pushed the eng/Remove-MediaPlayerPrivateInterfaceduration-and-co- branch from d03a7cd to 18a2564 Compare February 11, 2024 14:30
@jyavenard jyavenard requested review from eric-carlson and jernoble and removed request for philn, rniwa and cdumez February 11, 2024 14:33
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Feb 11, 2024
@jyavenard jyavenard removed the merging-blocked Applied to prevent a change from being merged label Feb 11, 2024
@jyavenard jyavenard force-pushed the eng/Remove-MediaPlayerPrivateInterfaceduration-and-co- branch from 18a2564 to 5c37141 Compare February 11, 2024 14:56
@jyavenard jyavenard force-pushed the eng/Remove-MediaPlayerPrivateInterfaceduration-and-co- branch from 5c37141 to 809efe5 Compare February 11, 2024 21:53
@jyavenard jyavenard added the merge-queue Applied to send a pull request to merge-queue label Feb 11, 2024
https://bugs.webkit.org/show_bug.cgi?id=269168
rdar://122743525

Reviewed by Eric Carlson.

Once upon time, we had `currentTime()` and `duration()` that returned a float.
We then had `currentTimeDouble()` and `durationDouble()` that returned a double.
In 110313@main, MediaTime support was added and got quickly adopted across all
the media stack. And so we now had `currentMediaTime()` and `durationMediaTime()`.
The MediaTime prefix was added to all methods and members that were dealing with MediaTime (the object not the media's time).

Now that we have eliminated all but the methods using MediaTime and that MediaTime
is exclusively used to descrine a time, we no longer have to have MediaTime in
the methods' name as when using any time values, a MediaTime type is implied.

Rename only, no change in observable behaviour.

* Source/WebCore/Modules/mediasource/ManagedMediaSource.cpp:
(WebCore::ManagedMediaSource::monitorSourceBuffers):
* Source/WebCore/Modules/mediasource/MediaSource.cpp:
(WebCore::MediaSource::currentTime const):
(WebCore::MediaSource::hasCurrentTime):
(WebCore::MediaSource::hasFutureTime):
(WebCore::MediaSource::currentMediaTime const): Deleted.
* Source/WebCore/Modules/mediasource/MediaSource.h:
* Source/WebCore/Modules/mediasource/SourceBuffer.cpp:
(WebCore::SourceBuffer::rangeRemoval):
(WebCore::SourceBuffer::appendBufferInternal):
(WebCore::SourceBuffer::sourceBufferPrivateAppendComplete):
(WebCore::SourceBuffer::canPlayThroughRange):
(WebCore::SourceBuffer::memoryPressure):
* Source/WebCore/platform/graphics/MediaPlayer.cpp:
(WebCore::MediaPlayer::duration const):
(WebCore::MediaPlayer::currentTime const):
(WebCore::MediaPlayer::currentTimeMayProgress const):
(WebCore::MediaPlayer::maxTimeSeekable const):
(WebCore::MediaPlayer::minTimeSeekable const):
(WebCore::MediaPlayer::performTaskAtTime):
(WebCore::MediaPlayer::performTaskAtMediaTime): Deleted.
* Source/WebCore/platform/graphics/MediaPlayer.h:
* Source/WebCore/platform/graphics/MediaPlayerPrivate.cpp:
(WebCore::MediaPlayerPrivateInterface::seekable const):
(WebCore::MediaPlayerPrivateInterface::currentOrPendingSeekTime const):
* Source/WebCore/platform/graphics/MediaPlayerPrivate.h:
(WebCore::MediaPlayerPrivateInterface::duration const):
(WebCore::MediaPlayerPrivateInterface::currentTime const):
(WebCore::MediaPlayerPrivateInterface::currentTimeMayProgress const):
(WebCore::MediaPlayerPrivateInterface::maxTimeSeekable const):
(WebCore::MediaPlayerPrivateInterface::minTimeSeekable const):
(WebCore::MediaPlayerPrivateInterface::extraMemoryCost const):
(WebCore::MediaPlayerPrivateInterface::performTaskAtTime):
(WebCore::MediaPlayerPrivateInterface::durationDouble const): Deleted.
(WebCore::MediaPlayerPrivateInterface::durationMediaTime const): Deleted.
(WebCore::MediaPlayerPrivateInterface::currentMediaTime const): Deleted.
(WebCore::MediaPlayerPrivateInterface::currentMediaTimeMayProgress const): Deleted.
(WebCore::MediaPlayerPrivateInterface::maxMediaTimeSeekable const): Deleted.
(WebCore::MediaPlayerPrivateInterface::minMediaTimeSeekable const): Deleted.
(WebCore::MediaPlayerPrivateInterface::performTaskAtMediaTime): Deleted.
* Source/WebCore/platform/graphics/MediaSourcePrivate.cpp:
(WebCore::MediaSourcePrivate::currentTime const):
(WebCore::MediaSourcePrivate::currentMediaTime const): Deleted.
* Source/WebCore/platform/graphics/MediaSourcePrivate.h:
* Source/WebCore/platform/graphics/SourceBufferPrivate.cpp:
(WebCore::SourceBufferPrivate::currentTime const):
(WebCore::SourceBufferPrivate::reenqueSamples):
(WebCore::SourceBufferPrivate::processMediaSample):
(WebCore::SourceBufferPrivate::currentMediaTime const): Deleted.
* Source/WebCore/platform/graphics/SourceBufferPrivate.h:
* Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
(WebCore::MediaPlayerPrivateAVFoundation::duration const):
(WebCore::MediaPlayerPrivateAVFoundation::seekToTarget):
(WebCore::MediaPlayerPrivateAVFoundation::maxTimeSeekable const):
(WebCore::MediaPlayerPrivateAVFoundation::minTimeSeekable const):
(WebCore::MediaPlayerPrivateAVFoundation::didLoadingProgress const):
(WebCore::MediaPlayerPrivateAVFoundation::updateStates):
(WebCore::MediaPlayerPrivateAVFoundation::didEnd):
(WebCore::MediaPlayerPrivateAVFoundation::durationMediaTime const): Deleted.
(WebCore::MediaPlayerPrivateAVFoundation::maxMediaTimeSeekable const): Deleted.
(WebCore::MediaPlayerPrivateAVFoundation::minMediaTimeSeekable const): Deleted.
* Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:
* Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
* Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::hasAvailableVideoFrame const):
(WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayer):
(WebCore::MediaPlayerPrivateAVFoundationObjC::currentTime const):
(WebCore::MediaPlayerPrivateAVFoundationObjC::currentTimeDidChange const):
(WebCore::MediaPlayerPrivateAVFoundationObjC::platformMaxTimeSeekable const):
(WebCore::MediaPlayerPrivateAVFoundationObjC::updateLastPixelBuffer):
(WebCore::MediaPlayerPrivateAVFoundationObjC::videoFrameForCurrentTime):
(WebCore::MediaPlayerPrivateAVFoundationObjC::performTaskAtTime):
(-[WebCoreAVFMovieObserver metadataOutput:didOutputTimedMetadataGroups:fromPlayerItemTrack:]):
(-[WebCoreAVFMovieObserver metadataCollector:didCollectDateRangeMetadataGroups:indexesOfNewGroups:indexesOfModifiedGroups:]):
(WebCore::MediaPlayerPrivateAVFoundationObjC::currentMediaTime const): Deleted.
(WebCore::MediaPlayerPrivateAVFoundationObjC::currentMediaTimeDidChange const): Deleted.
(WebCore::MediaPlayerPrivateAVFoundationObjC::performTaskAtMediaTime): Deleted.
* Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h:
* Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::playInternal):
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::duration const):
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::currentTime const):
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::currentTimeMayProgress const):
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::maxTimeSeekable const):
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::minTimeSeekable const):
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::updateLastPixelBuffer):
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::videoFrameForCurrentTime):
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::durationChanged):
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::sizeWillChangeAtTime):
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::performTaskAtTime):
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::durationMediaTime const): Deleted.
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::currentMediaTime const): Deleted.
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::currentMediaTimeMayProgress const): Deleted.
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::maxMediaTimeSeekable const): Deleted.
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::minMediaTimeSeekable const): Deleted.
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::performTaskAtMediaTime): Deleted.
* Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h:
* Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::duration const):
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::durationMediaTime const): Deleted.
* Source/WebCore/platform/graphics/cocoa/MediaPlayerPrivateWebM.h:
* Source/WebCore/platform/graphics/cocoa/MediaPlayerPrivateWebM.mm:
(WebCore::MediaPlayerPrivateWebM::play):
(WebCore::MediaPlayerPrivateWebM::currentTime const):
(WebCore::MediaPlayerPrivateWebM::updateLastPixelBuffer):
(WebCore::MediaPlayerPrivateWebM::videoFrameForCurrentTime):
(WebCore::MediaPlayerPrivateWebM::setDuration):
(WebCore::MediaPlayerPrivateWebM::reenqueSamples):
(WebCore::MediaPlayerPrivateWebM::currentMediaTime const): Deleted.
* Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
(WebCore::MediaPlayerPrivateGStreamer::pause):
(WebCore::MediaPlayerPrivateGStreamer::doSeek):
(WebCore::MediaPlayerPrivateGStreamer::seekToTarget):
(WebCore::MediaPlayerPrivateGStreamer::duration const):
(WebCore::MediaPlayerPrivateGStreamer::currentTime const):
(WebCore::MediaPlayerPrivateGStreamer::buffered const):
(WebCore::MediaPlayerPrivateGStreamer::maxTimeSeekable const):
(WebCore::MediaPlayerPrivateGStreamer::maxTimeLoaded const):
(WebCore::MediaPlayerPrivateGStreamer::didLoadingProgress const):
(WebCore::MediaPlayerPrivateGStreamer::durationChanged):
(WebCore::MediaPlayerPrivateGStreamer::playbackPosition const):
(WebCore::MediaPlayerPrivateGStreamer::handleMessage):
(WebCore::MediaPlayerPrivateGStreamer::updateMaxTimeLoaded):
(WebCore::MediaPlayerPrivateGStreamer::processMpegTsSection):
(WebCore::MediaPlayerPrivateGStreamer::didEnd):
(WebCore::MediaPlayerPrivateGStreamer::performTaskAtTime):
(WebCore::MediaPlayerPrivateGStreamer::durationMediaTime const): Deleted.
(WebCore::MediaPlayerPrivateGStreamer::currentMediaTime const): Deleted.
(WebCore::MediaPlayerPrivateGStreamer::maxMediaTimeSeekable const): Deleted.
(WebCore::MediaPlayerPrivateGStreamer::performTaskAtMediaTime): Deleted.
* Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
* Source/WebCore/platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.cpp:
(WebCore::MediaPlayerPrivateGStreamerMSE::duration const):
(WebCore::MediaPlayerPrivateGStreamerMSE::propagateReadyStateToPlayer):
(WebCore::MediaPlayerPrivateGStreamerMSE::didPreroll):
(WebCore::MediaPlayerPrivateGStreamerMSE::maxTimeSeekable const):
(WebCore::MediaPlayerPrivateGStreamerMSE::currentTimeMayProgress const):
(WebCore::MediaPlayerPrivateGStreamerMSE::durationMediaTime const): Deleted.
(WebCore::MediaPlayerPrivateGStreamerMSE::maxMediaTimeSeekable const): Deleted.
(WebCore::MediaPlayerPrivateGStreamerMSE::currentMediaTimeMayProgress const): Deleted.
* Source/WebCore/platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.h:
* Source/WebCore/platform/graphics/gstreamer/mse/WebKitMediaSourceGStreamer.cpp:
(webKitMediaSrcStreamFlush):
* Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp:
(WebCore::MediaPlayerPrivateMediaFoundation::duration const):
(WebCore::MediaPlayerPrivateMediaFoundation::currentTime const):
(WebCore::MediaPlayerPrivateMediaFoundation::maxTimeSeekable const):
(WebCore::MediaPlayerPrivateMediaFoundation::durationMediaTime const): Deleted.
(WebCore::MediaPlayerPrivateMediaFoundation::currentMediaTime const): Deleted.
(WebCore::MediaPlayerPrivateMediaFoundation::maxMediaTimeSeekable const): Deleted.
* Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.h:
* Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.cpp:
(WebCore::MockMediaPlayerMediaSource::maxTimeSeekable const):
(WebCore::MockMediaPlayerMediaSource::currentTime const):
(WebCore::MockMediaPlayerMediaSource::currentTimeMayProgress const):
(WebCore::MockMediaPlayerMediaSource::duration const):
(WebCore::MockMediaPlayerMediaSource::maxMediaTimeSeekable const): Deleted.
(WebCore::MockMediaPlayerMediaSource::currentMediaTime const): Deleted.
(WebCore::MockMediaPlayerMediaSource::currentMediaTimeMayProgress const): Deleted.
(WebCore::MockMediaPlayerMediaSource::durationMediaTime const): Deleted.
* Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.h:
* Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.cpp:
(WebKit::RemoteMediaPlayerProxy::performTaskAtMediaTime):
* Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.h:
* Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.messages.in:
* Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp:
(WebKit::MediaPlayerPrivateRemote::TimeProgressEstimator::currentTimeWithLockHeld const):
(WebKit::MediaPlayerPrivateRemote::duration const):
(WebKit::MediaPlayerPrivateRemote::currentTime const):
(WebKit::MediaPlayerPrivateRemote::maxTimeSeekable const):
(WebKit::MediaPlayerPrivateRemote::minTimeSeekable const):
(WebKit::MediaPlayerPrivateRemote::performTaskAtTime):
(WebKit::MediaPlayerPrivateRemote::durationMediaTime const): Deleted.
(WebKit::MediaPlayerPrivateRemote::currentMediaTime const): Deleted.
(WebKit::MediaPlayerPrivateRemote::maxMediaTimeSeekable const): Deleted.
(WebKit::MediaPlayerPrivateRemote::minMediaTimeSeekable const): Deleted.
(WebKit::MediaPlayerPrivateRemote::performTaskAtMediaTime): Deleted.
* Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.h:

Canonical link: https://commits.webkit.org/274449@main
@webkit-commit-queue webkit-commit-queue force-pushed the eng/Remove-MediaPlayerPrivateInterfaceduration-and-co- branch from 809efe5 to 2178ec4 Compare February 11, 2024 23:11
@webkit-commit-queue
Copy link
Collaborator

Committed 274449@main (2178ec4): https://commits.webkit.org/274449@main

Reviewed commits have been landed. Closing PR #24233 and removing active labels.

@webkit-commit-queue webkit-commit-queue merged commit 2178ec4 into WebKit:main Feb 11, 2024
@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Feb 11, 2024
@jyavenard jyavenard deleted the eng/Remove-MediaPlayerPrivateInterfaceduration-and-co- branch February 26, 2024 04:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Media Bugs related to the HTML 5 Media elements.
Projects
None yet
5 participants