MediaCodecPlayer implementation (stage 3 - browser seek and surface change)

media/base/android/media_codec_decoder_unittest.cc

Index: media/base/android/media_codec_decoder_unittest.cc
diff --git a/media/base/android/media_codec_decoder_unittest.cc b/media/base/android/media_codec_decoder_unittest.cc
index 39e6661f9373836fd0e454908f483038fda225a1..7ad70c4455682a56930b891e3af60baed440cce1 100644
--- a/media/base/android/media_codec_decoder_unittest.cc
+++ b/media/base/android/media_codec_decoder_unittest.cc
@@ -277,7 +277,7 @@ void MediaCodecDecoderTest::SetVideoSurface() {
   ASSERT_NE(nullptr, decoder_.get());
   MediaCodecVideoDecoder* video_decoder =
       static_cast<MediaCodecVideoDecoder*>(decoder_.get());
-  video_decoder->SetPendingSurface(surface.Pass());
+  video_decoder->SetVideoSurface(surface.Pass());
 }
 
 TEST_F(MediaCodecDecoderTest, AudioPrefetch) {
@@ -332,6 +332,20 @@ TEST_F(MediaCodecDecoderTest, VideoConfigureNoParams) {
 
   CreateVideoDecoder();
 
+  // decoder_->Configure() searches back for the key frame.
+  // We have to prefetch decoder.
+
+  base::TimeDelta duration = base::TimeDelta::FromMilliseconds(500);
+  SetDataFactory(scoped_ptr<VideoFactory>(new VideoFactory(duration)));
+
+  decoder_->Prefetch(base::Bind(&MediaCodecDecoderTest::SetPrefetched,
+                                base::Unretained(this), true));
+
+  EXPECT_TRUE(WaitForCondition(base::Bind(&MediaCodecDecoderTest::is_prefetched,
+                                          base::Unretained(this))));
+
+  SetVideoSurface();
+
   // Cannot configure without config parameters.
   EXPECT_EQ(MediaCodecDecoder::CONFIG_FAILURE, decoder_->Configure());
 }
@@ -389,7 +403,7 @@ TEST_F(MediaCodecDecoderTest, VideoConfigureInvalidSurface) {
 
   MediaCodecVideoDecoder* video_decoder =
       static_cast<MediaCodecVideoDecoder*>(decoder_.get());
-  video_decoder->SetPendingSurface(surface.Pass());
+  video_decoder->SetVideoSurface(surface.Pass());
 
   EXPECT_EQ(MediaCodecDecoder::CONFIG_FAILURE, decoder_->Configure());
 }