Changeset 206032 in webkit

Timestamp:

Sep 16, 2016 11:04:54 AM (8 years ago)

Author:

jer.noble@apple.com

Message:

[media-source] fix imported/w3c/web-platform-tests/media-source/mediasource-duration.html
​https://bugs.webkit.org/show_bug.cgi?id=161999

Reviewed by Eric Carlson.

LayoutTests/imported/w3c:

Expected results had a stray newline.

• web-platform-tests/media-source/mediasource-duration-expected.txt:

Source/WTF:

The mediasource-duration.html test tries to set the duration of a MediaSource to a double value
(5.0), then some work happens and the duration is set to a media time (12533/2500, or 5.0132).
The test then tries to set that value as the duration, converted from a media time to a double,
and asserts that no duration change event is fired. But because the floating point value and the
media time value are ever so slightly different, this round-tripping fails.

Fix this bug in MediaTime by, when one side or the other of a comparison is a floating point
MediaTime, convert both sides to doubles and run the comparison against those values. This preserves
the transitive equality of doubles <-> MediaTimes.

• wtf/MediaTime.cpp:

(WTF::MediaTime::compare):

Tools:

• TestWebKitAPI/Tests/WTF/MediaTime.cpp:

(TestWebKitAPI::TEST):

LayoutTests:

• platform/mac/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/media-source/mediasource-duration-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• Source/WTF/ChangeLog (modified) (1 diff)
• Source/WTF/wtf/MediaTime.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WTF/MediaTime.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-09-14  Jer Noble  <jer.noble@apple.com>
+
+        [media-source] fix imported/w3c/web-platform-tests/media-source/mediasource-duration.html
+        https://bugs.webkit.org/show_bug.cgi?id=161999
+
+        Reviewed by Eric Carlson.
+
+        * platform/mac/TestExpectations:
+
 2016-09-16  Jer Noble  <jer.noble@apple.com>
 

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2016-09-14  Jer Noble  <jer.noble@apple.com>
+
+        [media-source] fix imported/w3c/web-platform-tests/media-source/mediasource-duration.html
+        https://bugs.webkit.org/show_bug.cgi?id=161999
+
+        Reviewed by Eric Carlson.
+
+        Expected results had a stray newline.
+
+        * web-platform-tests/media-source/mediasource-duration-expected.txt:
+
 2016-09-16  Chris Dumez  <cdumez@apple.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/media-source/mediasource-duration-expected.txt

@@ -5 +5 @@
 PASS Test setting same duration multiple times does not fire duplicate durationchange 
 PASS Test setting the duration to less than the highest starting presentation timestamp will throw 
+

trunk/LayoutTests/platform/mac/TestExpectations

@@ -1050 +1050 @@
 [ Yosemite+ ] imported/w3c/web-platform-tests/media-source/mediasource-closed.html [ Pass ]
 [ Yosemite+ ] imported/w3c/web-platform-tests/media-source/mediasource-config-change-mp4-v-bitrate.html [ Pass ]
+[ Yosemite+ ] imported/w3c/web-platform-tests/media-source/mediasource-duration.html [ Pass ]
 [ Yosemite+ ] imported/w3c/web-platform-tests/media-source/mediasource-endofstream-invaliderror.html [ Pass ]
 [ Yosemite+ ] imported/w3c/web-platform-tests/media-source/mediasource-multiple-attach.html [ Pass ]

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2016-09-14  Jer Noble  <jer.noble@apple.com>
+
+        [media-source] fix imported/w3c/web-platform-tests/media-source/mediasource-duration.html
+        https://bugs.webkit.org/show_bug.cgi?id=161999
+
+        Reviewed by Eric Carlson.
+
+        The mediasource-duration.html test tries to set the duration of a MediaSource to a double value
+        (5.0), then some work happens and the duration is set to a media time (12533/2500, or 5.0132).
+        The test then tries to set that value as the duration, converted from a media time to a double,
+        and asserts that no duration change event is fired.  But because the floating point value and the
+        media time value are ever so slightly different, this round-tripping fails.
+
+        Fix this bug in MediaTime by, when one side or the other of a comparison is a floating point
+        MediaTime, convert both sides to doubles and run the comparison against those values. This preserves
+        the transitive equality of doubles <-> MediaTimes.
+
+        * wtf/MediaTime.cpp:
+        (WTF::MediaTime::compare):
+
 2016-09-16  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WTF/wtf/MediaTime.cpp

@@ -408 +408 @@
     }
 
+    if (hasDoubleValue() || rhs.hasDoubleValue()) {
+        double a = toDouble();
+        double b = rhs.toDouble();
+        if (a > b)
+            return GreaterThan;
+        if (a < b)
+            return LessThan;
+        return EqualTo;
+    }
+
     MediaTime a = *this;
     MediaTime b = rhs;
-
-    if (a.hasDoubleValue())
-        a.setTimeScale(DefaultTimeScale);
-
-    if (b.hasDoubleValue())
-        b.setTimeScale(DefaultTimeScale);
 
     int64_t rhsWhole = b.m_timeValue / b.m_timeScale;

trunk/Tools/ChangeLog

@@ +1 @@
+2016-09-14  Jer Noble  <jer.noble@apple.com>
+
+        [media-source] fix imported/w3c/web-platform-tests/media-source/mediasource-duration.html
+        https://bugs.webkit.org/show_bug.cgi?id=161999
+
+        Reviewed by Eric Carlson.
+
+        * TestWebKitAPI/Tests/WTF/MediaTime.cpp:
+        (TestWebKitAPI::TEST):
+
 2016-09-16  Anders Carlsson  <andersca@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WTF/MediaTime.cpp

@@ -186 +186 @@
     EXPECT_EQ(10.0123456789f, MediaTime::createWithFloat(10.0123456789f).toFloat());
     EXPECT_EQ(10.0123456789, MediaTime::createWithDouble(10.0123456789).toDouble());
+    EXPECT_EQ(MediaTime(1, 3), MediaTime::createWithDouble(MediaTime(1, 3).toDouble()));
 
     // Floating Point Math