[Cast] Separate frame size from VideoSenderConfig in H264VideoToolboxEncoder.

media/cast/sender/h264_vt_encoder_unittest.cc

 // Copyright 2014 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 <queue>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "base/test/test_suite.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/media.h"
 #include "media/base/media_switches.h"
 #include "media/cast/sender/h264_vt_encoder.h"
 #include "media/cast/sender/video_frame_factory.h"
 #include "media/cast/test/utility/default_config.h"
 #include "media/cast/test/utility/video_utility.h"
 #include "media/ffmpeg/ffmpeg_common.h"
 #include "media/filters/ffmpeg_glue.h"
 #include "media/filters/ffmpeg_video_decoder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
+const int kVideoWidth = 1280;
+const int kVideoHeight = 720;
+
 class MediaTestSuite : public base::TestSuite {
  public:
   MediaTestSuite(int argc, char** argv) : TestSuite(argc, argv) {}
   ~MediaTestSuite() override {}
 
  protected:
   void Initialize() override;
 };
 
 void MediaTestSuite::Initialize() {
@@ skipping 157 matching lines @@
 
   void SetUp() override {
     clock_ = new base::SimpleTestTickClock();
     clock_->Advance(base::TimeTicks::Now() - base::TimeTicks());
 
     cast_environment_ = new CastEnvironment(
         scoped_ptr<base::TickClock>(clock_).Pass(),
         message_loop_.message_loop_proxy(), message_loop_.message_loop_proxy(),
         message_loop_.message_loop_proxy());
     encoder_.reset(new H264VideoToolboxEncoder(
-        cast_environment_, video_sender_config_,
+        cast_environment_,
+        video_sender_config_,
+        gfx::Size(kVideoWidth, kVideoHeight),
         base::Bind(&SaveInitializationStatus, &cast_initialization_status_)));
     message_loop_.RunUntilIdle();
     EXPECT_EQ(STATUS_VIDEO_INITIALIZED, cast_initialization_status_);
   }
 
   void TearDown() override {
     encoder_.reset();
     message_loop_.RunUntilIdle();
   }
 
   void AdvanceClockAndVideoFrameTimestamp() {
     clock_->Advance(base::TimeDelta::FromMilliseconds(33));
     frame_->set_timestamp(frame_->timestamp() +
                           base::TimeDelta::FromMilliseconds(33));
   }
 
   static void SetUpTestCase() {
     // Reusable test data.
     video_sender_config_ = GetDefaultVideoSenderConfig();
     video_sender_config_.codec = CODEC_VIDEO_H264;
-    gfx::Size size(video_sender_config_.width, video_sender_config_.height);
+    const gfx::Size size(kVideoWidth, kVideoHeight);
     frame_ = media::VideoFrame::CreateFrame(
         VideoFrame::I420, size, gfx::Rect(size), size, base::TimeDelta());
     PopulateVideoFrame(frame_.get(), 123);
   }
 
   static void TearDownTestCase() { frame_ = nullptr; }
 
   static scoped_refptr<media::VideoFrame> frame_;
   static VideoSenderConfig video_sender_config_;
 
@@ skipping 63 matching lines @@
   auto video_frame_factory = encoder_->CreateVideoFrameFactory();
   ASSERT_TRUE(video_frame_factory.get());
   CreateFrameAndMemsetPlane(video_frame_factory.get());
   encoder_.reset();
   message_loop_.RunUntilIdle();
   CreateFrameAndMemsetPlane(video_frame_factory.get());
 }
 
 }  // namespace cast
 }  // namespace media