Initialize media timeline correctly for positive start times.

media/filters/ffmpeg_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 <algorithm>
 #include <deque>
 #include <string>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
@@ skipping 429 matching lines @@
   for (int i = 0; i < 2; ++i) {
     video->Read(NewReadCB(FROM_HERE, 5636, video_start_time.InMicroseconds()));
     message_loop_.Run();
     audio->Read(NewReadCB(FROM_HERE, 165, audio_start_time.InMicroseconds()));
     message_loop_.Run();
 
     // Verify that the start time is equal to the lowest timestamp (ie the
     // audio).
     EXPECT_EQ(audio_start_time, demuxer_->start_time());
 
-    // Verify that the timeline offset has been adjusted by the start time.
-    EXPECT_EQ(kTimelineOffsetMs + audio_start_time.InMilliseconds(),
-              demuxer_->GetTimelineOffset().ToJavaTime());
+    // Verify that the timeline offset has not been adjusted by the start time.
+    EXPECT_EQ(kTimelineOffsetMs, demuxer_->GetTimelineOffset().ToJavaTime());
 
     // Seek back to the beginning and repeat the test.
     WaitableMessageLoopEvent event;
     demuxer_->Seek(base::TimeDelta(), event.GetPipelineStatusCB());
     event.RunAndWaitForStatus(PIPELINE_OK);
   }
 }
 
 TEST_F(FFmpegDemuxerTest, Read_AudioNoStartTime) {
   // FFmpeg does not set timestamps when demuxing wave files.  Ensure that the
@@ skipping 79 matching lines @@
   for (int i = 0; i < 2; ++i) {
     audio->Read(NewReadCBWithCheckedDiscard(
         FROM_HERE, 1, 0, base::TimeDelta::FromMicroseconds(2902)));
     message_loop_.Run();
 
     audio->Read(NewReadCB(FROM_HERE, 1, 2902));
     message_loop_.Run();
     EXPECT_EQ(base::TimeDelta::FromMicroseconds(-2902),
               demuxer_->start_time());
 
+    // Though the internal start time may be below zero, the exposed media time
+    // must always be greater than zero.
+    EXPECT_EQ(base::TimeDelta(), demuxer_->GetStartTime());
+
     video->Read(NewReadCB(FROM_HERE, 9997, 0));
     message_loop_.Run();
 
     video->Read(NewReadCB(FROM_HERE, 16, 33241));
     message_loop_.Run();
 
     video->Read(NewReadCB(FROM_HERE, 631, 66482));
     message_loop_.Run();
 
     // Seek back to the beginning and repeat the test.
@@ skipping 377 matching lines @@
   InitializeDemuxer();
 
   DemuxerStream* stream = demuxer_->GetStream(DemuxerStream::VIDEO);
   ASSERT_TRUE(stream);
   ASSERT_EQ(VIDEO_ROTATION_270, stream->video_rotation());
 }
 
 #endif
 
 }  // namespace media