Revert of Delete VideoFrameFactory, CapturedFrame, and related code.

webrtc/media/base/videocapturer_unittest.cc

 /*
  *  Copyright (c) 2008 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 73 matching lines @@
 }
 
 TEST_F(VideoCapturerTest, ScreencastScaledOddWidth) {
   InitScreencast();
 
   int kWidth = 1281;
   int kHeight = 720;
 
   std::vector<cricket::VideoFormat> formats;
   formats.push_back(cricket::VideoFormat(kWidth, kHeight,
-                                         cricket::VideoFormat::FpsToInterval(5),
-                                         cricket::FOURCC_I420));
+      cricket::VideoFormat::FpsToInterval(5), cricket::FOURCC_ARGB));
   capturer_->ResetSupportedFormats(formats);
 
-  EXPECT_EQ(cricket::CS_RUNNING,
-            capturer_->Start(cricket::VideoFormat(
-                kWidth, kHeight, cricket::VideoFormat::FpsToInterval(30),
-                cricket::FOURCC_ANY)));
+  EXPECT_EQ(cricket::CS_RUNNING, capturer_->Start(cricket::VideoFormat(
+      kWidth,
+      kHeight,
+      cricket::VideoFormat::FpsToInterval(30),
+      cricket::FOURCC_ARGB)));
   EXPECT_TRUE(capturer_->IsRunning());
   EXPECT_EQ(0, renderer_.num_rendered_frames());
   EXPECT_TRUE(capturer_->CaptureFrame());
   EXPECT_EQ(1, renderer_.num_rendered_frames());
   EXPECT_EQ(kWidth, renderer_.width());
   EXPECT_EQ(kHeight, renderer_.height());
 }
 
 TEST_F(VideoCapturerTest, TestRotationAppliedBySource) {
   int kWidth = 800;
@@ skipping 126 matching lines @@
   wants.rotation_applied = true;
   capturer_->AddOrUpdateSink(&renderer2, wants);
 
   EXPECT_TRUE(capturer_->CaptureFrame());
   EXPECT_EQ(++frame_count, renderer_.num_rendered_frames());
   EXPECT_EQ(1, renderer2.num_rendered_frames());
   EXPECT_EQ(webrtc::kVideoRotation_0, renderer_.rotation());
   EXPECT_EQ(webrtc::kVideoRotation_0, renderer2.rotation());
 }
 
-// TODO(nisse): This test doesn't quite fit here. It tests two things:
-// Aggregation of VideoSinkWants, which is the responsibility of
-// VideoBroadcaster, and translation of VideoSinkWants to actual
-// resolution, which is the responsibility of the VideoAdapter.
 TEST_F(VideoCapturerTest, SinkWantsMaxPixelAndMaxPixelCountStepUp) {
   EXPECT_EQ(cricket::CS_RUNNING,
             capturer_->Start(cricket::VideoFormat(
                 1280, 720, cricket::VideoFormat::FpsToInterval(30),
                 cricket::FOURCC_I420)));
   EXPECT_TRUE(capturer_->IsRunning());
 
   EXPECT_EQ(0, renderer_.num_rendered_frames());
   EXPECT_TRUE(capturer_->CaptureFrame());
   EXPECT_EQ(1, renderer_.num_rendered_frames());
@@ skipping 516 matching lines @@
   capturer_->set_enable_camera_list(true);
   capturer_->ConstrainSupportedFormats(vga_format);
   EXPECT_EQ(2u, capturer_->GetSupportedFormats()->size());
   // To make sure it's not just the camera list being broken, add in VGA and
   // try again. This time, only the VGA format should be there.
   supported_formats.push_back(vga_format);
   capturer_->ResetSupportedFormats(supported_formats);
   ASSERT_EQ(1u, capturer_->GetSupportedFormats()->size());
   EXPECT_EQ(vga_format.height, capturer_->GetSupportedFormats()->at(0).height);
 }