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

media/base/android/media_codec_decoder_unittest.cc

 // Copyright 2015 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 "base/bind.h"
 #include "base/logging.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/timer/timer.h"
 #include "media/base/android/media_codec_audio_decoder.h"
 #include "media/base/android/media_codec_bridge.h"
@@ skipping 259 matching lines @@
   task_runner_->PostDelayedTask(FROM_HERE, base::Bind(data_available_cb_, data),
                                 delay);
 }
 
 void MediaCodecDecoderTest::SetVideoSurface() {
   surface_texture_ = gfx::SurfaceTexture::Create(0);
   gfx::ScopedJavaSurface surface(surface_texture_.get());
   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) {
   CreateAudioDecoder();
 
   base::TimeDelta duration = base::TimeDelta::FromMilliseconds(500);
   SetDataFactory(scoped_ptr<TestDataFactory>(new AudioFactory(duration)));
 
   decoder_->Prefetch(base::Bind(&MediaCodecDecoderTest::SetPrefetched,
                                 base::Unretained(this), true));
@@ skipping 14 matching lines @@
   EXPECT_TRUE(WaitForCondition(base::Bind(&MediaCodecDecoderTest::is_prefetched,
                                           base::Unretained(this))));
 }
 
 TEST_F(MediaCodecDecoderTest, AudioConfigureNoParams) {
   SKIP_TEST_IF_MEDIA_CODEC_BRIDGE_IS_NOT_AVAILABLE();
 
   CreateAudioDecoder();
 
   // Cannot configure without config parameters.
-  EXPECT_EQ(MediaCodecDecoder::CONFIG_FAILURE, decoder_->Configure());
+  EXPECT_EQ(MediaCodecDecoder::kConfigFailure, decoder_->Configure());
 }
 
 TEST_F(MediaCodecDecoderTest, AudioConfigureValidParams) {
   SKIP_TEST_IF_MEDIA_CODEC_BRIDGE_IS_NOT_AVAILABLE();
 
   CreateAudioDecoder();
 
   base::TimeDelta duration = base::TimeDelta::FromMilliseconds(500);
   scoped_ptr<AudioFactory> factory(new AudioFactory(duration));
   decoder_->SetDemuxerConfigs(factory->GetConfigs());
 
-  EXPECT_EQ(MediaCodecDecoder::CONFIG_OK, decoder_->Configure());
+  EXPECT_EQ(MediaCodecDecoder::kConfigOk, decoder_->Configure());
 }
 
 TEST_F(MediaCodecDecoderTest, VideoConfigureNoParams) {
   SKIP_TEST_IF_MEDIA_CODEC_BRIDGE_IS_NOT_AVAILABLE();
 
   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());
+  EXPECT_EQ(MediaCodecDecoder::kConfigFailure, decoder_->Configure());
 }
 
 TEST_F(MediaCodecDecoderTest, VideoConfigureNoSurface) {
   SKIP_TEST_IF_MEDIA_CODEC_BRIDGE_IS_NOT_AVAILABLE();
 
   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))));
 
   decoder_->SetDemuxerConfigs(GetConfigs());
 
   // Surface is not set, Configure() should fail.
 
-  EXPECT_EQ(MediaCodecDecoder::CONFIG_FAILURE, decoder_->Configure());
+  EXPECT_EQ(MediaCodecDecoder::kConfigFailure, decoder_->Configure());
 }
 
 TEST_F(MediaCodecDecoderTest, VideoConfigureInvalidSurface) {
   SKIP_TEST_IF_MEDIA_CODEC_BRIDGE_IS_NOT_AVAILABLE();
 
   CreateVideoDecoder();
 
   // decoder_->Configure() searches back for the key frame.
   // We have to prefetch decoder.
 
@@ skipping 11 matching lines @@
   // Prepare the surface.
   scoped_refptr<gfx::SurfaceTexture> surface_texture(
       gfx::SurfaceTexture::Create(0));
   gfx::ScopedJavaSurface surface(surface_texture.get());
 
   // Release the surface texture.
   surface_texture = NULL;
 
   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());
+  EXPECT_EQ(MediaCodecDecoder::kConfigFailure, decoder_->Configure());
 }
 
 TEST_F(MediaCodecDecoderTest, VideoConfigureValidParams) {
   SKIP_TEST_IF_MEDIA_CODEC_BRIDGE_IS_NOT_AVAILABLE();
 
   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))));
 
   decoder_->SetDemuxerConfigs(GetConfigs());
 
   SetVideoSurface();
 
   // Now we can expect Configure() to succeed.
 
-  EXPECT_EQ(MediaCodecDecoder::CONFIG_OK, decoder_->Configure());
+  EXPECT_EQ(MediaCodecDecoder::kConfigOk, decoder_->Configure());
 }
 
 TEST_F(MediaCodecDecoderTest, AudioStartWithoutConfigure) {
   SKIP_TEST_IF_MEDIA_CODEC_BRIDGE_IS_NOT_AVAILABLE();
 
   CreateAudioDecoder();
 
   // Decoder has to be prefetched and configured before the start.
 
   // Wrong state: not prefetched
@@ skipping 26 matching lines @@
 
   // Prefetch to avoid starvation at the beginning of playback.
   decoder_->Prefetch(base::Bind(&MediaCodecDecoderTest::SetPrefetched,
                                 base::Unretained(this), true));
 
   EXPECT_TRUE(WaitForCondition(base::Bind(&MediaCodecDecoderTest::is_prefetched,
                                           base::Unretained(this))));
 
   decoder_->SetDemuxerConfigs(GetConfigs());
 
-  EXPECT_EQ(MediaCodecDecoder::CONFIG_OK, decoder_->Configure());
+  EXPECT_EQ(MediaCodecDecoder::kConfigOk, decoder_->Configure());
 
   EXPECT_TRUE(decoder_->Start(base::TimeDelta::FromMilliseconds(0)));
 
   EXPECT_TRUE(WaitForCondition(
       base::Bind(&MediaCodecDecoderTest::is_stopped, base::Unretained(this)),
       timeout));
 
   EXPECT_TRUE(decoder_->IsStopped());
   EXPECT_TRUE(decoder_->IsCompleted());
 
@@ skipping 18 matching lines @@
   decoder_->Prefetch(base::Bind(&MediaCodecDecoderTest::SetPrefetched,
                                 base::Unretained(this), true));
 
   EXPECT_TRUE(WaitForCondition(base::Bind(&MediaCodecDecoderTest::is_prefetched,
                                           base::Unretained(this))));
 
   decoder_->SetDemuxerConfigs(GetConfigs());
 
   SetVideoSurface();
 
-  EXPECT_EQ(MediaCodecDecoder::CONFIG_OK, decoder_->Configure());
+  EXPECT_EQ(MediaCodecDecoder::kConfigOk, decoder_->Configure());
 
   EXPECT_TRUE(decoder_->Start(base::TimeDelta::FromMilliseconds(0)));
 
   EXPECT_TRUE(WaitForCondition(
       base::Bind(&MediaCodecDecoderTest::is_stopped, base::Unretained(this)),
       timeout));
 
   EXPECT_TRUE(decoder_->IsStopped());
   EXPECT_TRUE(decoder_->IsCompleted());
 
@@ skipping 16 matching lines @@
   decoder_->Prefetch(base::Bind(&MediaCodecDecoderTest::SetPrefetched,
                                 base::Unretained(this), true));
 
   EXPECT_TRUE(WaitForCondition(base::Bind(&MediaCodecDecoderTest::is_prefetched,
                                           base::Unretained(this))));
 
   decoder_->SetDemuxerConfigs(GetConfigs());
 
   SetVideoSurface();
 
-  EXPECT_EQ(MediaCodecDecoder::CONFIG_OK, decoder_->Configure());
+  EXPECT_EQ(MediaCodecDecoder::kConfigOk, decoder_->Configure());
 
   SetStopRequestAtTime(stop_request_time);
 
   // Start from the beginning.
   EXPECT_TRUE(decoder_->Start(base::TimeDelta::FromMilliseconds(0)));
 
   EXPECT_TRUE(WaitForCondition(
       base::Bind(&MediaCodecDecoderTest::is_stopped, base::Unretained(this)),
       timeout));
 
@@ skipping 47 matching lines @@
   // Prefetch.
   decoder_->Prefetch(base::Bind(&MediaCodecDecoderTest::SetPrefetched,
                                 base::Unretained(this), true));
 
   EXPECT_TRUE(WaitForCondition(base::Bind(&MediaCodecDecoderTest::is_prefetched,
                                           base::Unretained(this))));
 
   // Configure.
   decoder_->SetDemuxerConfigs(GetConfigs());
 
-  EXPECT_EQ(MediaCodecDecoder::CONFIG_OK, decoder_->Configure());
+  EXPECT_EQ(MediaCodecDecoder::kConfigOk, decoder_->Configure());
 
   // Start.
   EXPECT_TRUE(decoder_->Start(base::TimeDelta::FromMilliseconds(0)));
 
   // Wait for starvation.
   EXPECT_TRUE(WaitForCondition(
       base::Bind(&MediaCodecDecoderTest::is_starved, base::Unretained(this)),
       timeout));
 
   EXPECT_FALSE(decoder_->IsStopped());
   EXPECT_FALSE(decoder_->IsCompleted());
 
   EXPECT_GT(pts_stat_.num_values(), 0);
 
   // After starvation we should be able to stop decoder.
   decoder_->RequestToStop();
 
   EXPECT_TRUE(WaitForCondition(
       base::Bind(&MediaCodecDecoderTest::is_stopped, base::Unretained(this))));
 
   EXPECT_TRUE(decoder_->IsStopped());
   EXPECT_FALSE(decoder_->IsCompleted());
 }
 
 }  // namespace media