Diff
Modified: trunk/Source/WebCore/ChangeLog (272695 => 272696)
--- trunk/Source/WebCore/ChangeLog 2021-02-10 23:56:18 UTC (rev 272695)
+++ trunk/Source/WebCore/ChangeLog 2021-02-11 00:07:25 UTC (rev 272696)
@@ -1,3 +1,24 @@
+2021-02-10 Peng Liu <[email protected]>
+
+ Remove MediaSourcePrivateClient::monitorSourceBuffers()
+ https://bugs.webkit.org/show_bug.cgi?id=220945
+
+ Reviewed by Youenn Fablet.
+
+ Remove MediaSourcePrivateClient::monitorSourceBuffers() for all ports except GStreamer
+ port because MediaSourcePrivate does not call it. This patch also adds some log messages
+ related to seeking.
+
+ No new tests, no functional change.
+
+ * Modules/mediasource/MediaSource.h:
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::seekWithTolerance):
+ * platform/graphics/MediaSourcePrivateClient.h:
+ * platform/graphics/SourceBufferPrivate.cpp:
+ (WebCore::SourceBufferPrivate::appendCompleted):
+ * platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.h:
+
2021-02-10 Don Olmstead <[email protected]>
Non-unified build fixes, early February 2021 edition
Modified: trunk/Source/WebCore/Modules/mediasource/MediaSource.h (272695 => 272696)
--- trunk/Source/WebCore/Modules/mediasource/MediaSource.h 2021-02-10 23:56:18 UTC (rev 272695)
+++ trunk/Source/WebCore/Modules/mediasource/MediaSource.h 2021-02-11 00:07:25 UTC (rev 272696)
@@ -83,7 +83,11 @@
bool attachToElement(HTMLMediaElement&);
void detachFromElement(HTMLMediaElement&);
- void monitorSourceBuffers() override;
+#if USE(GSTREAMER)
+ void monitorSourceBuffers() final;
+#else
+ void monitorSourceBuffers();
+#endif
bool isSeeking() const { return m_pendingSeekTime.isValid(); }
Ref<TimeRanges> seekable();
ExceptionOr<void> setLiveSeekableRange(double start, double end);
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (272695 => 272696)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2021-02-10 23:56:18 UTC (rev 272695)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2021-02-11 00:07:25 UTC (rev 272696)
@@ -2898,6 +2898,7 @@
void HTMLMediaElement::seekWithTolerance(const MediaTime& inTime, const MediaTime& negativeTolerance, const MediaTime& positiveTolerance, bool fromDOM)
{
+ INFO_LOG(LOGIDENTIFIER, "time = ", inTime, ", negativeTolerance = ", negativeTolerance, ", positiveTolerance = ", positiveTolerance);
// 4.8.10.9 Seeking
MediaTime time = inTime;
Modified: trunk/Source/WebCore/platform/graphics/MediaSourcePrivateClient.h (272695 => 272696)
--- trunk/Source/WebCore/platform/graphics/MediaSourcePrivateClient.h 2021-02-10 23:56:18 UTC (rev 272695)
+++ trunk/Source/WebCore/platform/graphics/MediaSourcePrivateClient.h 2021-02-11 00:07:25 UTC (rev 272696)
@@ -44,7 +44,9 @@
virtual MediaTime duration() const = 0;
virtual std::unique_ptr<PlatformTimeRanges> buffered() const = 0;
virtual void seekToTime(const MediaTime&) = 0;
+#if USE(GSTREAMER)
virtual void monitorSourceBuffers() = 0;
+#endif
#if !RELEASE_LOG_DISABLED
virtual void setLogIdentifier(const void*) = 0;
Modified: trunk/Source/WebCore/platform/graphics/SourceBufferPrivate.cpp (272695 => 272696)
--- trunk/Source/WebCore/platform/graphics/SourceBufferPrivate.cpp 2021-02-10 23:56:18 UTC (rev 272695)
+++ trunk/Source/WebCore/platform/graphics/SourceBufferPrivate.cpp 2021-02-11 00:07:25 UTC (rev 272696)
@@ -164,6 +164,8 @@
void SourceBufferPrivate::appendCompleted(bool parsingSucceeded, bool isEnded)
{
+ DEBUG_LOG(LOGIDENTIFIER);
+
// Resolve the changes in TrackBuffers' buffered ranges
// into the SourceBuffer's buffered ranges
updateBufferedFromTrackBuffers(isEnded);
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.h (272695 => 272696)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.h 2021-02-10 23:56:18 UTC (rev 272695)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.h 2021-02-11 00:07:25 UTC (rev 272696)
@@ -123,7 +123,6 @@
#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
void sourceBufferKeyNeeded(SourceBufferPrivateAVFObjC*, Uint8Array*);
#endif
- void monitorSourceBuffers();
void removeSourceBuffer(SourceBufferPrivate*);
void setSourceBufferWithSelectedVideo(SourceBufferPrivateAVFObjC*);
Modified: trunk/Source/WebKit/ChangeLog (272695 => 272696)
--- trunk/Source/WebKit/ChangeLog 2021-02-10 23:56:18 UTC (rev 272695)
+++ trunk/Source/WebKit/ChangeLog 2021-02-11 00:07:25 UTC (rev 272696)
@@ -1,3 +1,14 @@
+2021-02-10 Peng Liu <[email protected]>
+
+ Remove MediaSourcePrivateClient::monitorSourceBuffers()
+ https://bugs.webkit.org/show_bug.cgi?id=220945
+
+ Reviewed by Youenn Fablet.
+
+ * GPUProcess/media/RemoteMediaSourceProxy.cpp:
+ (WebKit::RemoteMediaSourceProxy::monitorSourceBuffers): Deleted.
+ * GPUProcess/media/RemoteMediaSourceProxy.h:
+
2021-02-10 Jiewen Tan <[email protected]>
[WebAuthn] Produce ClientDataJSON in the SPI
Modified: trunk/Source/WebKit/GPUProcess/media/RemoteMediaSourceProxy.cpp (272695 => 272696)
--- trunk/Source/WebKit/GPUProcess/media/RemoteMediaSourceProxy.cpp 2021-02-10 23:56:18 UTC (rev 272695)
+++ trunk/Source/WebKit/GPUProcess/media/RemoteMediaSourceProxy.cpp 2021-02-11 00:07:25 UTC (rev 272696)
@@ -77,10 +77,12 @@
m_connectionToWebProcess.connection().send(Messages::MediaSourcePrivateRemote::SeekToTime(time), m_identifier);
}
+#if USE(GSTREAMER)
void RemoteMediaSourceProxy::monitorSourceBuffers()
{
notImplemented();
}
+#endif
#if !RELEASE_LOG_DISABLED
void RemoteMediaSourceProxy::setLogIdentifier(const void*)
Modified: trunk/Source/WebKit/GPUProcess/media/RemoteMediaSourceProxy.h (272695 => 272696)
--- trunk/Source/WebKit/GPUProcess/media/RemoteMediaSourceProxy.h 2021-02-10 23:56:18 UTC (rev 272695)
+++ trunk/Source/WebKit/GPUProcess/media/RemoteMediaSourceProxy.h 2021-02-11 00:07:25 UTC (rev 272696)
@@ -65,7 +65,9 @@
MediaTime duration() const final;
std::unique_ptr<WebCore::PlatformTimeRanges> buffered() const final;
void seekToTime(const MediaTime&) final;
+#if USE(GSTREAMER)
void monitorSourceBuffers() final;
+#endif
#if !RELEASE_LOG_DISABLED
void setLogIdentifier(const void*) final;
