Allow simultaneous audio and video config change

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/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "media/base/android/media_codec_bridge.h"
@@ skipping 1189 matching lines @@
 
   // Send data after the seek position.
   data = CreateReadFromDemuxerAckForAudio(3);
   data.access_units[0].timestamp = base::TimeDelta::FromMilliseconds(100);
   player_.OnDemuxerDataAvailable(data);
   message_loop_.Run();
   EXPECT_LT(100.0, player_.GetCurrentTime().InMillisecondsF());
   EXPECT_FALSE(IsPrerolling(true));
 }
 
+TEST_F(MediaSourcePlayerTest, SimultaneousAudioVideoConfigChange) {
+  SKIP_TEST_IF_MEDIA_CODEC_BRIDGE_IS_NOT_AVAILABLE();
+
+  // Test that the player allows simultaneous audio and video config change,
+  // such as might occur during OnPrefetchDone() if next access unit for both
+  // audio and video jobs is |kConfigChanged|.
+  Start(CreateAudioVideoDemuxerConfigs());
+  CreateNextTextureAndSetVideoSurface();
+  MediaDecoderJob* first_audio_job = GetMediaDecoderJob(true);
+  MediaDecoderJob* first_video_job = GetMediaDecoderJob(false);
+  EXPECT_TRUE(first_audio_job && first_video_job);
+
+  // Simulate audio |kConfigChanged| prefetched as standalone access unit.
+  player_.OnDemuxerDataAvailable(
+      CreateReadFromDemuxerAckWithConfigChanged(true, 0));
+  EXPECT_EQ(0, demuxer_->num_config_requests());  // No OnPrefetchDone() yet.
+
+  // Simulate video |kConfigChanged| prefetched as standalone access unit.
+  player_.OnDemuxerDataAvailable(
+      CreateReadFromDemuxerAckWithConfigChanged(false, 0));
+  EXPECT_EQ(1, demuxer_->num_config_requests());  // OnPrefetchDone() occurred.
+  EXPECT_EQ(2, demuxer_->num_data_requests());
+
+  // No job re-creation should occur until the requested configs arrive.
+  EXPECT_EQ(first_audio_job, GetMediaDecoderJob(true));
+  EXPECT_EQ(first_video_job, GetMediaDecoderJob(false));
+
+  player_.OnDemuxerConfigsAvailable(CreateAudioVideoDemuxerConfigs());
+  EXPECT_EQ(4, demuxer_->num_data_requests());
+  MediaDecoderJob* second_audio_job = GetMediaDecoderJob(true);
+  MediaDecoderJob* second_video_job = GetMediaDecoderJob(false);
+  EXPECT_NE(first_audio_job, second_audio_job);
+  EXPECT_NE(first_video_job, second_video_job);
+  EXPECT_TRUE(second_audio_job && second_video_job);
+
+  // Confirm no further demuxer configs requested.
+  EXPECT_EQ(1, demuxer_->num_config_requests());
+}
+
 TEST_F(MediaSourcePlayerTest, DemuxerConfigRequestedIfInPrefetchUnit0) {
   SKIP_TEST_IF_MEDIA_CODEC_BRIDGE_IS_NOT_AVAILABLE();
 
   // Test that the player detects need for and requests demuxer configs if
   // the |kConfigChanged| unit is the very first unit in the set of units
   // received in OnDemuxerDataAvailable() ostensibly while
   // |PREFETCH_DONE_EVENT_PENDING|.
   StartConfigChange(true, true, 0);
 }
 
@@ skipping 226 matching lines @@
 
   std::vector<std::string> codec_avc(1, "avc1");
   EXPECT_FALSE(IsTypeSupported(invalid_uuid, "L3", kVideoMp4, codec_avc));
   EXPECT_FALSE(IsTypeSupported(invalid_uuid, "L1", kVideoMp4, codec_avc));
 }
 
 // TODO(xhwang): Are these IsTypeSupported tests device specific?
 // TODO(xhwang): Add more IsTypeSupported tests.
 
 }  // namespace media