Revert of Let ViEEncoder handle resolution changes.

webrtc/api/videocapturertracksource_unittest.cc

 /*
  *  Copyright 2012 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 166 matching lines @@
   constraints.AddMandatory(MediaConstraintsInterface::kMaxHeight, 288);
   constraints.AddMandatory(MediaConstraintsInterface::kMaxFrameRate, 5);
 
   CreateVideoCapturerSource(&constraints);
   EXPECT_EQ_WAIT(MediaSourceInterface::kLive, state_observer_->state(),
                  kMaxWaitMs);
   const cricket::VideoFormat* format = capturer_->GetCaptureFormat();
   ASSERT_TRUE(format != NULL);
   EXPECT_EQ(352, format->width);
   EXPECT_EQ(288, format->height);
-  EXPECT_EQ(5, format->framerate());
+  EXPECT_EQ(30, format->framerate());
 }
 
 // Test that the capture output is 720P if the camera support it and the
 // optional constraint is set to 720P.
 TEST_F(VideoCapturerTrackSourceTest, MandatoryMinVgaOptional720P) {
   FakeConstraints constraints;
   constraints.AddMandatory(MediaConstraintsInterface::kMinWidth, 640);
   constraints.AddMandatory(MediaConstraintsInterface::kMinHeight, 480);
   constraints.AddOptional(MediaConstraintsInterface::kMinWidth, 1280);
   constraints.AddOptional(MediaConstraintsInterface::kMinAspectRatio,
@@ skipping 196 matching lines @@
   constraints.AddMandatory(MediaConstraintsInterface::kNoiseReduction, false);
   constraints.AddOptional(MediaConstraintsInterface::kNoiseReduction, true);
 
   CreateVideoCapturerSource(&constraints);
   EXPECT_EQ_WAIT(MediaSourceInterface::kLive, state_observer_->state(),
                  kMaxWaitMs);
   const cricket::VideoFormat* format = capturer_->GetCaptureFormat();
   ASSERT_TRUE(format != NULL);
   EXPECT_EQ(352, format->width);
   EXPECT_EQ(288, format->height);
-  EXPECT_EQ(5, format->framerate());
+  EXPECT_EQ(30, format->framerate());
 
   EXPECT_EQ(rtc::Optional<bool>(false), source_->needs_denoising());
 }
 
 // Tests that the source starts video with the default resolution for
 // screencast if no constraint is set.
 TEST_F(VideoCapturerTrackSourceTest, ScreencastResolutionNoConstraint) {
   InitScreencast();
   capturer_->TestWithoutCameraFormats();
 
@@ skipping 70 matching lines @@
 
 TEST_F(VideoCapturerTrackSourceTest, OptionalSubOneFpsConstraints) {
   FakeConstraints constraints;
   constraints.AddOptional(MediaConstraintsInterface::kMaxFrameRate, 0.5);
 
   CreateVideoCapturerSource(&constraints);
   EXPECT_EQ_WAIT(MediaSourceInterface::kLive, state_observer_->state(),
                  kMaxWaitMs);
   const cricket::VideoFormat* format = capturer_->GetCaptureFormat();
   ASSERT_TRUE(format != NULL);
-  EXPECT_EQ(1, format->framerate());
+  EXPECT_EQ(30, format->framerate());
 }