Preroll decoders when video starts playing

media/base/android/media_source_player_unittest.cc

 // Copyright 2013 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 <string>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
@@ skipping 337 matching lines @@
     for (int i = 0; i < 10; ++i) {
       manager_.ResetTimestampUpdated();
       player_.OnDemuxerDataAvailable(
           CreateReadFromDemuxerAckForAudio(i > 3 ? 3 : i));
       WaitForAudioDecodeDone();
       base::TimeDelta new_current_time = player_.GetCurrentTime();
       EXPECT_LE(current_time.InMilliseconds(),
                 new_current_time.InMilliseconds());
       current_time = new_current_time;
       if (manager_.timestamp_updated()) {
-        EXPECT_LT(start_timestamp.InMillisecondsF(),
+        // TODO(qinmin): the current time is from the decoder thread and it does
+        // not take the delay from posting the task into consideration.
+        // http://crbug.com/421616.
+        EXPECT_LE(start_timestamp.InMillisecondsF(),
                   new_current_time.InMillisecondsF());
         return;
       }
     }
     EXPECT_TRUE(false);
   }
 
   AccessUnit CreateAccessUnitWithData(bool is_audio, int audio_packet_id) {
     AccessUnit unit;
 
@@ skipping 802 matching lines @@
 }
 
 TEST_F(MediaSourcePlayerTest, StartTimeTicksResetAfterDecoderUnderruns) {
   SKIP_TEST_IF_MEDIA_CODEC_BRIDGE_IS_NOT_AVAILABLE();
 
   // Test start time ticks will reset after decoder job underruns.
   StartAudioDecoderJob();
 
   DecodeAudioDataUntilOutputBecomesAvailable();
 
-  // The decoder job should finish and a new request will be sent.
+  // The decoder job should finish prerolling and start prefetching.
+  player_.OnDemuxerDataAvailable(CreateReadFromDemuxerAckForAudio(3));
   base::TimeTicks previous = StartTimeTicks();
-  player_.OnDemuxerDataAvailable(CreateReadFromDemuxerAckForAudio(3));
 
   // Let the decoder starve.
   TriggerPlayerStarvation();
   WaitForAudioDecodeDone();
   EXPECT_TRUE(StartTimeTicks() == previous);
 
   // Send new data to the decoder so it can finish prefetching. This should
   // reset the start time ticks.
   player_.OnDemuxerDataAvailable(CreateReadFromDemuxerAckForAudio(3));
   EXPECT_TRUE(StartTimeTicks() != previous);
@@ skipping 537 matching lines @@
   // audio and video jobs is |kConfigChanged|.
   CreateNextTextureAndSetVideoSurface();
   Start(CreateAudioVideoDemuxerConfigs());
   player_.OnDemuxerDataAvailable(CreateReadFromDemuxerAckForAudio(0));
   player_.OnDemuxerDataAvailable(CreateReadFromDemuxerAckForVideo());
   EXPECT_TRUE(GetMediaCodecBridge(true));
   EXPECT_TRUE(GetMediaCodecBridge(false));
   EnableAdaptiveVideoPlayback(false);
   WaitForAudioVideoDecodeDone();
 
+  EXPECT_TRUE(IsPrerolling(true));
+  EXPECT_TRUE(IsPrerolling(false));
+  PrerollDecoderToTime(true, base::TimeDelta(), base::TimeDelta(), true);
+  PrerollDecoderToTime(false, base::TimeDelta(), base::TimeDelta(), false);
+  int expected_num_data_requests = demuxer_->num_data_requests();
+
   // Simulate audio |kConfigChanged| prefetched as standalone access unit.
   DemuxerConfigs audio_configs = CreateAudioDemuxerConfigs(kCodecVorbis, true);
   player_.OnDemuxerDataAvailable(
       CreateReadFromDemuxerAckWithConfigChanged(true, 0, audio_configs));
 
   // Simulate video |kConfigChanged| prefetched as standalone access unit.
   player_.OnDemuxerDataAvailable(
       CreateReadFromDemuxerAckWithConfigChanged(
           false, 0, CreateVideoDemuxerConfigs(true)));
-  EXPECT_EQ(6, demuxer_->num_data_requests());
+  EXPECT_EQ(expected_num_data_requests + 2, demuxer_->num_data_requests());
   EXPECT_TRUE(IsDrainingDecoder(true));
   EXPECT_TRUE(IsDrainingDecoder(false));
 
   // Waiting for decoder to finish draining.
   while (IsDrainingDecoder(true) || IsDrainingDecoder(false))
     message_loop_.RunUntilIdle();
 }
 
 TEST_F(MediaSourcePlayerTest,
        SimultaneousAudioVideoConfigChangeWithAdaptivePlayback) {
@@ skipping 499 matching lines @@
 
   DemuxerConfigs configs = CreateAudioDemuxerConfigs(kCodecVorbis, true);
   DemuxerData data = CreateReadFromDemuxerAckWithConfigChanged(
       true, 0, configs);
   player_.OnDemuxerDataAvailable(data);
   WaitForAudioDecodeDone();
   DecodeAudioDataUntilOutputBecomesAvailable();
 }
 
 }  // namespace media