Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / media / cast / test / encode_decode_test.cc

diff --git a/src/media/cast/test/encode_decode_test.cc b/src/media/cast/test/encode_decode_test.cc
index dfaf4a4..a405242 100644 (file)
--- a/src/media/cast/test/encode_decode_test.cc
+++ b/src/media/cast/test/encode_decode_test.cc
@@ -12,8 +12,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "media/base/video_frame.h"
 #include "media/cast/cast_environment.h"
-#include "media/cast/test/fake_task_runner.h"
-#include "media/cast/test/video_utility.h"
+#include "media/cast/test/fake_single_thread_task_runner.h"
+#include "media/cast/test/utility/video_utility.h"
 #include "media/cast/video_receiver/codecs/vp8/vp8_decoder.h"
 #include "media/cast/video_sender/codecs/vp8/vp8_encoder.h"
 
@@ -29,14 +29,13 @@ static const int kMinQp = 4;
 static const int kMaxFrameRate = 30;
 
 namespace {
-class EncodeDecodeTestFrameCallback :
-    public base::RefCountedThreadSafe<EncodeDecodeTestFrameCallback> {
+class EncodeDecodeTestFrameCallback
+    : public base::RefCountedThreadSafe<EncodeDecodeTestFrameCallback> {
  public:
-  EncodeDecodeTestFrameCallback()
-      : num_called_(0) {
-  gfx::Size size(kWidth, kHeight);
-  original_frame_ = media::VideoFrame::CreateFrame(
-      VideoFrame::I420, size, gfx::Rect(size), size, base::TimeDelta());
+  EncodeDecodeTestFrameCallback() : num_called_(0) {
+    gfx::Size size(kWidth, kHeight);
+    original_frame_ = media::VideoFrame::CreateFrame(
+        VideoFrame::I420, size, gfx::Rect(size), size, base::TimeDelta());
   }
 
   void SetFrameStartValue(int start_value) {
@@ -55,9 +54,7 @@ class EncodeDecodeTestFrameCallback :
     EXPECT_GT(I420PSNR(original_frame_, decoded_frame), 40.0);
   }
 
-  int num_called() const {
-    return num_called_;
-  }
+  int num_called() const { return num_called_; }
 
  protected:
   virtual ~EncodeDecodeTestFrameCallback() {}
@@ -74,20 +71,25 @@ class EncodeDecodeTest : public ::testing::Test {
  protected:
   EncodeDecodeTest()
       : testing_clock_(new base::SimpleTestTickClock()),
-        task_runner_(new test::FakeTaskRunner(testing_clock_)),
+        task_runner_(new test::FakeSingleThreadTaskRunner(testing_clock_)),
         // CastEnvironment will only be used by the vp8 decoder; Enable only the
         // video decoder and main threads.
         cast_environment_(new CastEnvironment(
-            scoped_ptr<base::TickClock>(testing_clock_).Pass(), task_runner_,
-            NULL, NULL, NULL, task_runner_, NULL,
+            scoped_ptr<base::TickClock>(testing_clock_).Pass(),
+            task_runner_,
+            NULL,
+            NULL,
+            NULL,
+            task_runner_,
+            NULL,
             GetDefaultCastReceiverLoggingConfig())),
         test_callback_(new EncodeDecodeTestFrameCallback()) {
     testing_clock_->Advance(
         base::TimeDelta::FromMilliseconds(kStartMillisecond));
     encoder_config_.max_number_of_video_buffers_used = 1;
     encoder_config_.number_of_cores = 1;
-    encoder_config_.width  = kWidth;
-    encoder_config_.height  = kHeight;
+    encoder_config_.width = kWidth;
+    encoder_config_.height = kHeight;
     encoder_config_.start_bitrate = kStartbitrate;
     encoder_config_.min_qp = kMaxQp;
     encoder_config_.min_qp = kMinQp;
@@ -104,8 +106,8 @@ class EncodeDecodeTest : public ::testing::Test {
     // Create test frame.
     int start_value = 10;  // Random value to start from.
     gfx::Size size(encoder_config_.width, encoder_config_.height);
-    video_frame_ =  media::VideoFrame::CreateFrame(VideoFrame::I420,
-        size, gfx::Rect(size), size, base::TimeDelta());
+    video_frame_ = media::VideoFrame::CreateFrame(
+        VideoFrame::I420, size, gfx::Rect(size), size, base::TimeDelta());
     PopulateVideoFrame(video_frame_, start_value);
     test_callback_->SetFrameStartValue(start_value);
   }
@@ -115,7 +117,7 @@ class EncodeDecodeTest : public ::testing::Test {
   scoped_ptr<Vp8Decoder> decoder_;
   scoped_refptr<media::VideoFrame> video_frame_;
   base::SimpleTestTickClock* testing_clock_;  // Owned by CastEnvironment.
-  scoped_refptr<test::FakeTaskRunner> task_runner_;
+  scoped_refptr<test::FakeSingleThreadTaskRunner> task_runner_;
   scoped_refptr<CastEnvironment> cast_environment_;
   scoped_refptr<EncodeDecodeTestFrameCallback> test_callback_;
 };
@@ -127,8 +129,10 @@ TEST_F(EncodeDecodeTest, BasicEncodeDecode) {
   encoder_->Encode(video_frame_, &encoded_frame);
   EXPECT_GT(encoded_frame.data.size(), GG_UINT64_C(0));
   // Decode frame.
-  decoder_->Decode(&encoded_frame, base::TimeTicks(), base::Bind(
-      &EncodeDecodeTestFrameCallback::DecodeComplete, test_callback_));
+  decoder_->Decode(&encoded_frame,
+                   base::TimeTicks(),
+                   base::Bind(&EncodeDecodeTestFrameCallback::DecodeComplete,
+                              test_callback_));
   task_runner_->RunTasks();
 }