Log Message
Merged r237450 - [MSE][WTF][Media] Invalid MediaTime should be falsy https://bugs.webkit.org/show_bug.cgi?id=190893
Reviewed by Jer Noble. Source/WTF: This patch modifies the definition of MediaTime so that invalid times are evaluated to false in the context of a boolean _expression_. * wtf/MediaTime.cpp: (WTF::MediaTime::operator! const): (WTF::MediaTime::operator bool const): Tools: This patch adds additional API tests for the conversions from MediaTime to boolean. * TestWebKitAPI/Tests/WTF/MediaTime.cpp: (TestWebKitAPI::TEST): LayoutTests: A test is added that replicates a bug fixed by this patch. * media/media-source/media-source-timestampoffset-then-zero-expected.txt: Added. * media/media-source/media-source-timestampoffset-then-zero.html: Added.
Modified Paths
- releases/WebKitGTK/webkit-2.22/LayoutTests/ChangeLog
- releases/WebKitGTK/webkit-2.22/Source/WTF/ChangeLog
- releases/WebKitGTK/webkit-2.22/Source/WTF/wtf/MediaTime.cpp
- releases/WebKitGTK/webkit-2.22/Tools/ChangeLog
- releases/WebKitGTK/webkit-2.22/Tools/TestWebKitAPI/Tests/WTF/MediaTime.cpp
Added Paths
Diff
Modified: releases/WebKitGTK/webkit-2.22/LayoutTests/ChangeLog (237518 => 237519)
--- releases/WebKitGTK/webkit-2.22/LayoutTests/ChangeLog 2018-10-28 13:44:03 UTC (rev 237518)
+++ releases/WebKitGTK/webkit-2.22/LayoutTests/ChangeLog 2018-10-28 13:44:13 UTC (rev 237519)
@@ -1,3 +1,15 @@
+2018-10-26 Alicia Boya García <[email protected]>
+
+ [MSE][WTF][Media] Invalid MediaTime should be falsy
+ https://bugs.webkit.org/show_bug.cgi?id=190893
+
+ Reviewed by Jer Noble.
+
+ A test is added that replicates a bug fixed by this patch.
+
+ * media/media-source/media-source-timestampoffset-then-zero-expected.txt: Added.
+ * media/media-source/media-source-timestampoffset-then-zero.html: Added.
+
2018-10-11 Jiewen Tan <[email protected]>
Only report resource timing to parent frame for the first iframe load
Added: releases/WebKitGTK/webkit-2.22/LayoutTests/media/media-source/media-source-timestampoffset-then-zero-expected.txt (0 => 237519)
--- releases/WebKitGTK/webkit-2.22/LayoutTests/media/media-source/media-source-timestampoffset-then-zero-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.22/LayoutTests/media/media-source/media-source-timestampoffset-then-zero-expected.txt 2018-10-28 13:44:13 UTC (rev 237519)
@@ -0,0 +1,59 @@
+
+EXPECTED (source.readyState == 'closed') OK
+EVENT(sourceopen)
+RUN(sourceBuffer = source.addSourceBuffer("video/mock; codecs=mock"))
+RUN(sourceBuffer.timestampOffset = 5)
+RUN(sourceBuffer.appendBuffer(makeSimpleAudio(0, 20, 0)))
+EVENT(updateend)
+After first append:
+{PTS({5000/1000 = 5.000000}), DTS({5000/1000 = 5.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(0)}
+{PTS({6000/1000 = 6.000000}), DTS({6000/1000 = 6.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(0)}
+{PTS({7000/1000 = 7.000000}), DTS({7000/1000 = 7.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(0)}
+{PTS({8000/1000 = 8.000000}), DTS({8000/1000 = 8.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(0)}
+{PTS({9000/1000 = 9.000000}), DTS({9000/1000 = 9.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(0)}
+{PTS({10000/1000 = 10.000000}), DTS({10000/1000 = 10.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(0)}
+{PTS({11000/1000 = 11.000000}), DTS({11000/1000 = 11.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(0)}
+{PTS({12000/1000 = 12.000000}), DTS({12000/1000 = 12.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(0)}
+{PTS({13000/1000 = 13.000000}), DTS({13000/1000 = 13.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(0)}
+{PTS({14000/1000 = 14.000000}), DTS({14000/1000 = 14.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(0)}
+{PTS({15000/1000 = 15.000000}), DTS({15000/1000 = 15.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(0)}
+{PTS({16000/1000 = 16.000000}), DTS({16000/1000 = 16.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(0)}
+{PTS({17000/1000 = 17.000000}), DTS({17000/1000 = 17.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(0)}
+{PTS({18000/1000 = 18.000000}), DTS({18000/1000 = 18.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(0)}
+{PTS({19000/1000 = 19.000000}), DTS({19000/1000 = 19.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(0)}
+{PTS({20000/1000 = 20.000000}), DTS({20000/1000 = 20.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(0)}
+{PTS({21000/1000 = 21.000000}), DTS({21000/1000 = 21.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(0)}
+{PTS({22000/1000 = 22.000000}), DTS({22000/1000 = 22.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(0)}
+{PTS({23000/1000 = 23.000000}), DTS({23000/1000 = 23.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(0)}
+{PTS({24000/1000 = 24.000000}), DTS({24000/1000 = 24.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(0)}
+RUN(sourceBuffer.timestampOffset = 0)
+RUN(sourceBuffer.appendBuffer(makeSimpleAudio(0, 20, 1)))
+EVENT(updateend)
+After second append:
+{PTS({0/1000 = 0.000000}), DTS({0/1000 = 0.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(1)}
+{PTS({1000/1000 = 1.000000}), DTS({1000/1000 = 1.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(1)}
+{PTS({2000/1000 = 2.000000}), DTS({2000/1000 = 2.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(1)}
+{PTS({3000/1000 = 3.000000}), DTS({3000/1000 = 3.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(1)}
+{PTS({4000/1000 = 4.000000}), DTS({4000/1000 = 4.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(1)}
+{PTS({5000/1000 = 5.000000}), DTS({5000/1000 = 5.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(1)}
+{PTS({6000/1000 = 6.000000}), DTS({6000/1000 = 6.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(1)}
+{PTS({7000/1000 = 7.000000}), DTS({7000/1000 = 7.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(1)}
+{PTS({8000/1000 = 8.000000}), DTS({8000/1000 = 8.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(1)}
+{PTS({9000/1000 = 9.000000}), DTS({9000/1000 = 9.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(1)}
+{PTS({10000/1000 = 10.000000}), DTS({10000/1000 = 10.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(1)}
+{PTS({11000/1000 = 11.000000}), DTS({11000/1000 = 11.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(1)}
+{PTS({12000/1000 = 12.000000}), DTS({12000/1000 = 12.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(1)}
+{PTS({13000/1000 = 13.000000}), DTS({13000/1000 = 13.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(1)}
+{PTS({14000/1000 = 14.000000}), DTS({14000/1000 = 14.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(1)}
+{PTS({15000/1000 = 15.000000}), DTS({15000/1000 = 15.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(1)}
+{PTS({16000/1000 = 16.000000}), DTS({16000/1000 = 16.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(1)}
+{PTS({17000/1000 = 17.000000}), DTS({17000/1000 = 17.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(1)}
+{PTS({18000/1000 = 18.000000}), DTS({18000/1000 = 18.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(1)}
+{PTS({19000/1000 = 19.000000}), DTS({19000/1000 = 19.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(1)}
+{PTS({20000/1000 = 20.000000}), DTS({20000/1000 = 20.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(0)}
+{PTS({21000/1000 = 21.000000}), DTS({21000/1000 = 21.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(0)}
+{PTS({22000/1000 = 22.000000}), DTS({22000/1000 = 22.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(0)}
+{PTS({23000/1000 = 23.000000}), DTS({23000/1000 = 23.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(0)}
+{PTS({24000/1000 = 24.000000}), DTS({24000/1000 = 24.000000}), duration({1000/1000 = 1.000000}), flags(1), generation(0)}
+END OF TEST
+
Added: releases/WebKitGTK/webkit-2.22/LayoutTests/media/media-source/media-source-timestampoffset-then-zero.html (0 => 237519)
--- releases/WebKitGTK/webkit-2.22/LayoutTests/media/media-source/media-source-timestampoffset-then-zero.html (rev 0)
+++ releases/WebKitGTK/webkit-2.22/LayoutTests/media/media-source/media-source-timestampoffset-then-zero.html 2018-10-28 13:44:13 UTC (rev 237519)
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <title>media-source-timestampoffset-then-zero</title>
+ <script src=""
+ <script src=""
+ <script>
+ var source;
+ var sourceBuffer;
+ var bufferedSamples;
+
+ if (window.internals)
+ internals.initializeMockMediaSource();
+
+ function makeSimpleAudio(start, end, generation) {
+ const init = makeAInit(2, [makeATrack(1, 'mock', TRACK_KIND.VIDEO)]);
+
+ const samples = [];
+ for (let time = start; time < end; time++)
+ samples.push(makeASample(time, time, 1, 1, SAMPLE_FLAG.SYNC, generation));
+
+ return concatenateSamples([init].concat(samples));
+ }
+
+ window.addEventListener('load', async () => {
+ findMediaElement();
+ source = new MediaSource();
+ testExpected('source.readyState', 'closed');
+ const sourceOpened = waitFor(source, 'sourceopen');
+
+ const videoSource = document.createElement('source');
+ videoSource.type = 'audio/mock; codecs=mock';
+ videoSource.src = ""
+ video.appendChild(videoSource);
+
+ await sourceOpened;
+ run('sourceBuffer = source.addSourceBuffer("video/mock; codecs=mock")');
+
+ run('sourceBuffer.timestampOffset = 5');
+ run('sourceBuffer.appendBuffer(makeSimpleAudio(0, 20, 0))');
+ await waitFor(sourceBuffer, 'updateend');
+
+ bufferedSamples = internals.bufferedSamplesForTrackID(sourceBuffer, 1);
+ consoleWrite("After first append:");
+ bufferedSamples.forEach(consoleWrite);
+
+ run('sourceBuffer.timestampOffset = 0');
+ run('sourceBuffer.appendBuffer(makeSimpleAudio(0, 20, 1))');
+ await waitFor(sourceBuffer, 'updateend');
+
+ bufferedSamples = internals.bufferedSamplesForTrackID(sourceBuffer, 1);
+ consoleWrite("After second append:");
+ bufferedSamples.forEach(consoleWrite);
+
+ endTest();
+ });
+ </script>
+</head>
+<body>
+ <video controls></video>
+</body>
+</html>
Modified: releases/WebKitGTK/webkit-2.22/Source/WTF/ChangeLog (237518 => 237519)
--- releases/WebKitGTK/webkit-2.22/Source/WTF/ChangeLog 2018-10-28 13:44:03 UTC (rev 237518)
+++ releases/WebKitGTK/webkit-2.22/Source/WTF/ChangeLog 2018-10-28 13:44:13 UTC (rev 237519)
@@ -1,3 +1,17 @@
+2018-10-26 Alicia Boya García <[email protected]>
+
+ [MSE][WTF][Media] Invalid MediaTime should be falsy
+ https://bugs.webkit.org/show_bug.cgi?id=190893
+
+ Reviewed by Jer Noble.
+
+ This patch modifies the definition of MediaTime so that invalid times
+ are evaluated to false in the context of a boolean _expression_.
+
+ * wtf/MediaTime.cpp:
+ (WTF::MediaTime::operator! const):
+ (WTF::MediaTime::operator bool const):
+
2018-10-18 Alicia Boya García <[email protected]>
[Media] Use nanoseconds as MaximumTimeScale
Modified: releases/WebKitGTK/webkit-2.22/Source/WTF/wtf/MediaTime.cpp (237518 => 237519)
--- releases/WebKitGTK/webkit-2.22/Source/WTF/wtf/MediaTime.cpp 2018-10-28 13:44:03 UTC (rev 237518)
+++ releases/WebKitGTK/webkit-2.22/Source/WTF/wtf/MediaTime.cpp 2018-10-28 13:44:13 UTC (rev 237519)
@@ -328,13 +328,15 @@
bool MediaTime::operator!() const
{
return (m_timeFlags == Valid && !m_timeValue)
- || (m_timeFlags == (Valid | DoubleValue) && !m_timeValueAsDouble);
+ || (m_timeFlags == (Valid | DoubleValue) && !m_timeValueAsDouble)
+ || isInvalid();
}
MediaTime::operator bool() const
{
return !(m_timeFlags == Valid && !m_timeValue)
- && !(m_timeFlags == (Valid | DoubleValue) && !m_timeValueAsDouble);
+ && !(m_timeFlags == (Valid | DoubleValue) && !m_timeValueAsDouble)
+ && !isInvalid();
}
MediaTime::ComparisonFlags MediaTime::compare(const MediaTime& rhs) const
Modified: releases/WebKitGTK/webkit-2.22/Tools/ChangeLog (237518 => 237519)
--- releases/WebKitGTK/webkit-2.22/Tools/ChangeLog 2018-10-28 13:44:03 UTC (rev 237518)
+++ releases/WebKitGTK/webkit-2.22/Tools/ChangeLog 2018-10-28 13:44:13 UTC (rev 237519)
@@ -1,3 +1,16 @@
+2018-10-26 Alicia Boya García <[email protected]>
+
+ [MSE][WTF][Media] Invalid MediaTime should be falsy
+ https://bugs.webkit.org/show_bug.cgi?id=190893
+
+ Reviewed by Jer Noble.
+
+ This patch adds additional API tests for the conversions from
+ MediaTime to boolean.
+
+ * TestWebKitAPI/Tests/WTF/MediaTime.cpp:
+ (TestWebKitAPI::TEST):
+
2018-10-18 Alicia Boya García <[email protected]>
[Media] Use nanoseconds as MaximumTimeScale
Modified: releases/WebKitGTK/webkit-2.22/Tools/TestWebKitAPI/Tests/WTF/MediaTime.cpp (237518 => 237519)
--- releases/WebKitGTK/webkit-2.22/Tools/TestWebKitAPI/Tests/WTF/MediaTime.cpp 2018-10-28 13:44:03 UTC (rev 237518)
+++ releases/WebKitGTK/webkit-2.22/Tools/TestWebKitAPI/Tests/WTF/MediaTime.cpp 2018-10-28 13:44:13 UTC (rev 237519)
@@ -93,6 +93,10 @@
EXPECT_EQ(MediaTime(-8, 10) >= MediaTime(-1, 1), true);
EXPECT_TRUE((bool)MediaTime(1, 1));
EXPECT_TRUE(!MediaTime(0, 1));
+ EXPECT_TRUE(!MediaTime::invalidTime());
+ EXPECT_TRUE(!MediaTime::createWithDouble(0.0, 1));
+ EXPECT_FALSE(!MediaTime(1, 1));
+ EXPECT_FALSE((bool)MediaTime::invalidTime());
// Addition Operators
EXPECT_EQ(MediaTime::positiveInfiniteTime() + MediaTime::positiveInfiniteTime(), MediaTime::positiveInfiniteTime());
_______________________________________________ webkit-changes mailing list [email protected] https://lists.webkit.org/mailman/listinfo/webkit-changes
