Attachment 358385 Details for Bug 193156 – Patch

[patch] Patch

bug-193156-20190105123555.patch (text/plain), 5.62 KB, created by Eric Carlson on 2019-01-04 15:35:56 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Carlson

Created: 2019-01-04 15:35:56 PST

Size: 5.62 KB

patch

obsolete

>Subversion Revision: 239461
>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index 36a3eae2a209273ab1e71cd3aa7a8aeb32e0ea66..d2063bbeccf69fae5055b36531a6c1812a1ae7ec 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,18 @@
>+2019-01-04  Eric Carlson  <eric.carlson@apple.com>
>+
>+        A MediaTime timescale must never be zero
>+        https://bugs.webkit.org/show_bug.cgi?id=193156
>+        <rdar://problem/32504501>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * wtf/MediaTime.cpp:
>+        (WTF::greatestCommonDivisor): ASSERT if either parameter or return value is zero.
>+        (WTF::MediaTime::MediaTime): Use default timescale if passed zero.
>+        (WTF::MediaTime::createWithFloat): Ditto.
>+        (WTF::MediaTime::createWithDouble): Ditto.
>+        (WTF::MediaTime::setTimeScale): Ditto.
>+
> 2018-12-20  Chris Dumez  <cdumez@apple.com>
> 
>         Use Optional::valueOr() instead of Optional::value_or()
>diff --git a/Source/WTF/wtf/MediaTime.cpp b/Source/WTF/wtf/MediaTime.cpp
>index 94712ea3c7d2a256a4c0f66fa0d528c83449fbee..eae6fba45d05e20f86bab1321653fe86fb0c8a3c 100644
>--- a/Source/WTF/wtf/MediaTime.cpp
>+++ b/Source/WTF/wtf/MediaTime.cpp
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (C) 2012 Apple Inc. All rights reserved.
>+ * Copyright (C) 2012-2019 Apple Inc. All rights reserved.
>  *
>  * Redistribution and use in source and binary forms, with or without
>  * modification, are permitted provided that the following conditions
>@@ -31,6 +31,7 @@
> 
> #include <algorithm>
> #include <cstdlib>
>+#include <wtf/Assertions.h>
> #include <wtf/CheckedArithmetic.h>
> #include <wtf/JSONValues.h>
> #include <wtf/MathExtras.h>
>@@ -41,6 +42,9 @@ namespace WTF {
> 
> static uint32_t greatestCommonDivisor(uint32_t a, uint32_t b)
> {
>+    ASSERT(a);
>+    ASSERT(b);
>+
>     // Euclid's Algorithm
>     uint32_t temp = 0;
>     while (b) {
>@@ -48,6 +52,8 @@ static uint32_t greatestCommonDivisor(uint32_t a, uint32_t b)
>         b = a % b;
>         a = temp;
>     }
>+
>+    ASSERT(a);
>     return a;
> }
> 
>@@ -72,7 +78,7 @@ MediaTime::MediaTime()
> 
> MediaTime::MediaTime(int64_t value, uint32_t scale, uint8_t flags)
>     : m_timeValue(value)
>-    , m_timeScale(scale)
>+    , m_timeScale(scale ? scale : DefaultTimeScale)
>     , m_timeFlags(flags)
> {
> }
>@@ -109,6 +115,9 @@ MediaTime MediaTime::createWithFloat(float floatTime, uint32_t timeScale)
>     if (floatTime < std::numeric_limits<int64_t>::min())
>         return negativeInfiniteTime();
> 
>+    if (!timeScale)
>+        timeScale = DefaultTimeScale;
>+
>     while (floatTime * timeScale > std::numeric_limits<int64_t>::max())
>         timeScale /= 2;
>     return MediaTime(static_cast<int64_t>(floatTime * timeScale), timeScale, Valid);
>@@ -137,6 +146,9 @@ MediaTime MediaTime::createWithDouble(double doubleTime, uint32_t timeScale)
>     if (doubleTime < std::numeric_limits<int64_t>::min())
>         return negativeInfiniteTime();
> 
>+    if (!timeScale)
>+        timeScale = DefaultTimeScale;
>+
>     while (doubleTime * timeScale > std::numeric_limits<int64_t>::max())
>         timeScale /= 2;
>     return MediaTime(static_cast<int64_t>(std::round(doubleTime * timeScale)), timeScale, Valid);
>@@ -479,6 +491,9 @@ MediaTime MediaTime::toTimeScale(uint32_t timeScale, RoundingFlags flags) const
> 
> void MediaTime::setTimeScale(uint32_t timeScale, RoundingFlags flags)
> {
>+    if (!timeScale)
>+        timeScale = DefaultTimeScale;
>+
>     if (hasDoubleValue()) {
>         *this = MediaTime::createWithDouble(m_timeValueAsDouble, timeScale);
>         return;
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 2b84345254b15ef3f8898761303091a3678d9e33..b49a5cd94cdd4c57c6c40c420aecb9680637ecca 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-01-04  Eric Carlson  <eric.carlson@apple.com>
>+
>+        A MediaTime timescale must never be zero
>+        https://bugs.webkit.org/show_bug.cgi?id=193156
>+        <rdar://problem/32504501>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * TestWebKitAPI/Tests/WTF/MediaTime.cpp:
>+        (TestWebKitAPI::TEST): Add tests for zero timescale.
>+
> 2018-12-20  Chris Dumez  <cdumez@apple.com>
> 
>         Use Optional::valueOr() instead of Optional::value_or()
>diff --git a/Tools/TestWebKitAPI/Tests/WTF/MediaTime.cpp b/Tools/TestWebKitAPI/Tests/WTF/MediaTime.cpp
>index 703ab125f3668a461568770dbc5e04761b8e49a2..9e7c4210637ea8fc2b2ca8a72cd5791679455dff 100644
>--- a/Tools/TestWebKitAPI/Tests/WTF/MediaTime.cpp
>+++ b/Tools/TestWebKitAPI/Tests/WTF/MediaTime.cpp
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (C) 2012 Apple Inc. All rights reserved.
>+ * Copyright (C) 2012-2019 Apple Inc. All rights reserved.
>  *
>  * Redistribution and use in source and binary forms, with or without
>  * modification, are permitted provided that the following conditions
>@@ -309,6 +309,14 @@ TEST(WTF, MediaTime)
>     EXPECT_EQ(MediaTime(bigInt - 2, MediaTime::MaximumTimeScale).toTimeScale(MediaTime::MaximumTimeScale - 1).hasBeenRounded(), true);
>     EXPECT_EQ(MediaTime(bigInt, 1).toTimeScale(MediaTime::MaximumTimeScale), MediaTime::positiveInfiniteTime());
>     EXPECT_EQ(MediaTime(-bigInt, 1).toTimeScale(MediaTime::MaximumTimeScale), MediaTime::negativeInfiniteTime());
>+
>+    // Non-zero timescale
>+    EXPECT_EQ(MediaTime(102, 0).timeValue(), MediaTime(102, 100).timeValue());
>+    EXPECT_EQ(MediaTime(102, 0).toTimeScale(0).timeValue(), 102);
>+    EXPECT_EQ(MediaTime::createWithDouble(99, 0).timeScale(), MediaTime::createWithDouble(99).timeScale());
>+    EXPECT_EQ(MediaTime::createWithDouble(99, 0).toTimeScale(0).toDouble(), 99);
>+    EXPECT_EQ(MediaTime::createWithFloat(909, 0).timeScale(), MediaTime::createWithFloat(909).timeScale());
>+    EXPECT_EQ(MediaTime::createWithFloat(909, 0).toTimeScale(0).toFloat(), 909.0f);
> }
> 
> }

Actions: View | Formatted Diff | Diff

Attachments on bug 193156: 358385 | 358398 | 358406 | 358407 | 358417 | 358420 | 358442 | 358510