Index: webkit/media/webmediaplayer_util.cc |
diff --git a/webkit/media/webmediaplayer_util.cc b/webkit/media/webmediaplayer_util.cc |
index e2d5ef8d62dcb5d2f275c3ed09c6584d56b5b11f..17e603ee7f4553dc3a36cfed13e82b1273b4c72b 100644 |
--- a/webkit/media/webmediaplayer_util.cc |
+++ b/webkit/media/webmediaplayer_util.cc |
@@ -8,19 +8,10 @@ |
namespace webkit_media { |
-base::TimeDelta ConvertSecondsToTimestamp(float seconds) { |
- float microseconds = seconds * base::Time::kMicrosecondsPerSecond; |
- float integer = ceilf(microseconds); |
- float difference = integer - microseconds; |
- |
- // Round down if difference is large enough. |
- if ((microseconds > 0 && difference > 0.5f) || |
- (microseconds <= 0 && difference >= 0.5f)) { |
- integer -= 1.0f; |
- } |
- |
- // Now we can safely cast to int64 microseconds. |
- return base::TimeDelta::FromMicroseconds(static_cast<int64>(integer)); |
+base::TimeDelta ConvertSecondsToTimestamp(double seconds) { |
+ double microseconds = seconds * base::Time::kMicrosecondsPerSecond; |
+ return base::TimeDelta::FromMicroseconds( |
+ microseconds > 0 ? microseconds + 0.5 : ceil(microseconds - 0.5)); |
} |
} // namespace webkit_media |