Clear any pending surface change prior to checking media crypto in MSP::ConfigureVideoDecoderJob()

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 149 matching lines @@
   // |is_audio|. Caller must guard against NPE if the player's job is NULL.
   bool IsPrerolling(bool is_audio) {
     return GetMediaDecoderJob(is_audio)->prerolling();
   }
 
   // Get the preroll timestamp from the MediaSourcePlayer.
   base::TimeDelta GetPrerollTimestamp() {
     return player_.preroll_timestamp_;
   }
 
+  // Inspect internal pending_event_ state of |player_|. This is for infrequent
+  // use by tests, only where required.
+  bool IsPendingSurfaceChange() {
+    return player_.IsEventPending(player_.SURFACE_CHANGE_EVENT_PENDING);
+  }
+
   DemuxerConfigs CreateAudioDemuxerConfigs() {
     DemuxerConfigs configs;
     configs.audio_codec = kCodecVorbis;
     configs.audio_channels = 2;
     configs.audio_sampling_rate = 44100;
     configs.is_audio_encrypted = false;
     configs.duration_ms = kDefaultDurationInMs;
     scoped_refptr<DecoderBuffer> buffer = ReadTestDataFile("vorbis-extradata");
     configs.audio_extra_data = std::vector<uint8>(
         buffer->data(),
@@ skipping 1192 matching lines @@
   player_.OnDemuxerConfigsAvailable(CreateVideoDemuxerConfigs());
   MediaDecoderJob* second_job = GetMediaDecoderJob(false);
   EXPECT_NE(first_job, second_job);
   EXPECT_TRUE(second_job);
 
   EXPECT_EQ(3, demuxer_->num_data_requests());
   EXPECT_EQ(1, demuxer_->num_config_requests());
   EXPECT_EQ(0, demuxer_->num_seek_requests());
 }
 
+// TODO(xhwang): Once we add tests to cover DrmBridge, update this test to

[wolenetz, 2013/10/31 20:34:25]

From chat with qinmin@, MSP should be able to create the job with just media
crypto injected; no drm bridge should be necessary. I'll add to this test in the
next patch set.

[wolenetz, 2013/10/31 21:19:17]

Actually, MSP::GetMediaCrypto() requires previous MSP::SetDrmBridge(). And the
suggested expansion of this test requires MSP::GetMediaCrypto() to return
non-null media crypto usable on the test device to create the job. Hence the
existing TODO. I've modified the TODO to also reference a bug that suggests
routes to inject a media crypto for test usage, outside the scope of this CL.

+// also verify that the job is successfully created if SetDrmBridge(), Start()
+// and eventually OnMediaCrypto() occur. This would increase test coverage of
+// http://crbug.com/313470 and allow us to remove inspection of internal player
+// pending event state.
+TEST_F(MediaSourcePlayerTest, SurfaceChangeClearedEvenIfMediaCryptoAbsent) {
+  SKIP_TEST_IF_MEDIA_CODEC_BRIDGE_IS_NOT_AVAILABLE();
+
+  // Test that |SURFACE_CHANGE_EVENT_PENDING| is not pending after
+  // SetVideoSurface() for a player configured for encrypted video, when the
+  // player has not yet received media crypto.
+  DemuxerConfigs configs = CreateVideoDemuxerConfigs();
+  configs.is_video_encrypted = true;
+
+  player_.OnDemuxerConfigsAvailable(configs);
+  CreateNextTextureAndSetVideoSurface();
+  EXPECT_FALSE(IsPendingSurfaceChange());
+  EXPECT_FALSE(GetMediaDecoderJob(false));
+}
+
 // TODO(xhwang): Enable this test when the test devices are updated.
 TEST_F(MediaSourcePlayerTest, DISABLED_IsTypeSupported_Widevine) {
   if (!MediaCodecBridge::IsAvailable() || !MediaDrmBridge::IsAvailable()) {
     LOG(INFO) << "Could not run test - not supported on device.";
     return;
   }
 
   uint8 kWidevineUUID[] = { 0xED, 0xEF, 0x8B, 0xA9, 0x79, 0xD6, 0x4A, 0xCE,
                             0xA3, 0xC8, 0x27, 0xDC, 0xD5, 0x1D, 0x21, 0xED };
 
@@ skipping 54 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