Make ChunkDemuxer::SetTimestampOffset take a TimeDelta instead of double

media/filters/chunk_demuxer_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/mock_callback.h"
 #include "media/base/mock_demuxer_host.h"
@@ skipping 59 matching lines @@
 
 MATCHER_P(HasTimestamp, timestamp_in_ms, "") {
   return arg && !arg->IsEndOfStream() &&
       arg->GetTimestamp().InMilliseconds() == timestamp_in_ms;
 }
 
 MATCHER(IsEndOfStream, "") {
   return arg && arg->IsEndOfStream();
 }
 
+// Note: This matcher is needed because of a precision error in 32-bit linux.
+// If 32-bit linux is compiled with -march=pentium4 -msse2 -mfpmath=sse, the
+// precision error goes away. These flags are turned on in Chromium but off in
+// Chrome so that people with older CPUs can run Chrome.
+MATCHER_P(ApproximatelyEquals, timestamp, "") {
+  base::TimeDelta delta = base::TimeDelta::FromMicroseconds(
+      std::abs(timestamp.InMicroseconds() - arg.InMicroseconds()));
+
+  // 5 microseconds is chosen arbitrarily.
+  return delta < base::TimeDelta::FromMicroseconds(5);
+}
+
 static void OnReadDone(const base::TimeDelta& expected_time,
                        bool* called,
                        DemuxerStream::Status status,
                        const scoped_refptr<DecoderBuffer>& buffer) {
   EXPECT_EQ(status, DemuxerStream::kOk);
   EXPECT_EQ(expected_time, buffer->GetTimestamp());
   *called = true;
 }
 
 static void OnReadDone_AbortExpected(
@@ skipping 2220 matching lines @@
   ASSERT_TRUE(AppendData(third_cluster->data(), third_cluster->size()));
 
   // See that the range has increased appropriately.
   CheckExpectedRanges(kSourceId, "{ [201191,201270) }");
 }
 
 TEST_F(ChunkDemuxerTest, TestDurationChangeTimestampOffset) {
   ASSERT_TRUE(InitDemuxer(true, true, false));
 
   ASSERT_TRUE(demuxer_->SetTimestampOffset(kSourceId,
                                            kDefaultDuration().InSecondsF()));

[Ami GONE FROM CHROMIUM, 2012/08/14 00:05:18]

Per offline convo: IWBN if ChunkDemuxer dealt only in TimeDeltas, and WMPI hid
the |double seconds| specified in the Media Source API.  As a side-effect, this
test would stop dividing, and hopefully be independent of the vagaries of 80-bit
register math on x86.

   scoped_ptr<Cluster> cluster = GenerateCluster(0, 4);
 
-  EXPECT_CALL(host_, SetDuration(
-      kDefaultDuration() + base::TimeDelta::FromMilliseconds(
-          kAudioBlockDuration * 2)));
+  base::TimeDelta expected_duration = kDefaultDuration() +
+      base::TimeDelta::FromMilliseconds(kAudioBlockDuration * 2);
+
+  EXPECT_CALL(host_, SetDuration(ApproximatelyEquals(expected_duration)));
   ASSERT_TRUE(AppendData(cluster->data(), cluster->size()));
 }
 
 TEST_F(ChunkDemuxerTest, TestEndOfStreamTruncateDuration) {
   ASSERT_TRUE(InitDemuxer(true, true, false));
 
   scoped_ptr<Cluster> cluster_a(kDefaultFirstCluster());
   ASSERT_TRUE(AppendData(cluster_a->data(), cluster_a->size()));
 
   EXPECT_CALL(host_, SetDuration(
       base::TimeDelta::FromMilliseconds(kDefaultFirstClusterEndTimestamp)));
   demuxer_->EndOfStream(PIPELINE_OK);
 }
 
 }  // namespace media