Fix seeking when the start time is non-zero.

media/base/pipeline_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 <vector>
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "base/test/simple_test_tick_clock.h"
@@ skipping 735 matching lines @@
 
   const base::TimeDelta kDuration = base::TimeDelta::FromSeconds(100);
   InitializeDemuxer(&streams, kDuration);
   InitializeVideoRenderer(video_stream());
 
   InitializePipeline(PIPELINE_OK);
   EXPECT_FALSE(metadata_.has_audio);
   EXPECT_TRUE(metadata_.has_video);
 
   EXPECT_EQ(base::TimeDelta(), pipeline_->GetMediaTime());
+  const base::TimeDelta kSeekPoint = kDuration / 2;
+  ExpectSeek(kSeekPoint);
+  DoSeek(kSeekPoint);
 }
 
 TEST_F(PipelineTest, StartTimeIsNonZero) {
   const base::TimeDelta kStartTime = base::TimeDelta::FromSeconds(4);
   const base::TimeDelta kDuration = base::TimeDelta::FromSeconds(100);
 
   EXPECT_CALL(*demuxer_, GetStartTime())
       .WillRepeatedly(Return(kStartTime));
 
   CreateVideoStream();
   MockDemuxerStreamVector streams;
   streams.push_back(video_stream());
 
   InitializeDemuxer(&streams, kDuration);
   InitializeVideoRenderer(video_stream());
 
   InitializePipeline(PIPELINE_OK);
   EXPECT_FALSE(metadata_.has_audio);
   EXPECT_TRUE(metadata_.has_video);
 
   EXPECT_EQ(kStartTime, pipeline_->GetMediaTime());
+  const base::TimeDelta kSeekPoint = kDuration / 2;
+  ExpectSeek(kSeekPoint + kStartTime);
+  DoSeek(kSeekPoint);
+}
+
+TEST_F(PipelineTest, StartTimeIsNegative) {
+  const base::TimeDelta kStartTime = base::TimeDelta::FromSeconds(-4);
+  const base::TimeDelta kDuration = base::TimeDelta::FromSeconds(100);
+
+  EXPECT_CALL(*demuxer_, GetStartTime())
+      .WillRepeatedly(Return(kStartTime));
+
+  CreateVideoStream();
+  MockDemuxerStreamVector streams;
+  streams.push_back(video_stream());
+
+  InitializeDemuxer(&streams, kDuration);
+  InitializeVideoRenderer(video_stream());
+
+  InitializePipeline(PIPELINE_OK);
+  EXPECT_FALSE(metadata_.has_audio);
+  EXPECT_TRUE(metadata_.has_video);
+
+  // The media time should be clamped to zero.
+  EXPECT_EQ(base::TimeDelta(), pipeline_->GetMediaTime());
+  const base::TimeDelta kSeekPoint = kDuration / 2;
+  ExpectSeek(kSeekPoint + kStartTime);
+  DoSeek(kSeekPoint);
 }
 
 static void RunTimeCB(const AudioRenderer::TimeCB& time_cb,
                        int time_in_ms,
                        int max_time_in_ms) {
   time_cb.Run(base::TimeDelta::FromMilliseconds(time_in_ms),
               base::TimeDelta::FromMilliseconds(max_time_in_ms));
 }
 
 TEST_F(PipelineTest, AudioTimeUpdateDuringSeek) {
@@ skipping 361 matching lines @@
 INSTANTIATE_TEARDOWN_TEST(Error, InitAudioRenderer);
 INSTANTIATE_TEARDOWN_TEST(Error, InitVideoRenderer);
 INSTANTIATE_TEARDOWN_TEST(Error, Flushing);
 INSTANTIATE_TEARDOWN_TEST(Error, Seeking);
 INSTANTIATE_TEARDOWN_TEST(Error, Prerolling);
 INSTANTIATE_TEARDOWN_TEST(Error, Playing);
 
 INSTANTIATE_TEARDOWN_TEST(ErrorAndStop, Playing);
 
 }  // namespace media