Revert of Add framerate to VideoSinkWants and ability to signal on overuse

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 248 matching lines @@
   EXPECT_EQ(0, renderer_.num_rendered_frames());
   EXPECT_TRUE(capturer_->CaptureFrame());
   EXPECT_EQ(1, renderer_.num_rendered_frames());
   EXPECT_EQ(1280, renderer_.width());
   EXPECT_EQ(720, renderer_.height());
 
   // Request a lower resolution. The output resolution will have a resolution
   // with less than or equal to |wants.max_pixel_count| depending on how the
   // capturer can scale the input frame size.
   rtc::VideoSinkWants wants;
-  wants.max_pixel_count = 1280 * 720 * 3 / 5;
+  wants.max_pixel_count = rtc::Optional<int>(1280 * 720 * 3 / 5);
   capturer_->AddOrUpdateSink(&renderer_, wants);
   EXPECT_TRUE(capturer_->CaptureFrame());
   EXPECT_EQ(2, renderer_.num_rendered_frames());
   EXPECT_EQ(960, renderer_.width());
   EXPECT_EQ(540, renderer_.height());
 
   // Request a lower resolution.
-  wants.max_pixel_count = (renderer_.width() * renderer_.height() * 3) / 5;
+  wants.max_pixel_count =
+      rtc::Optional<int>((renderer_.width() * renderer_.height() * 3) / 5);
   capturer_->AddOrUpdateSink(&renderer_, wants);
   EXPECT_TRUE(capturer_->CaptureFrame());
   EXPECT_EQ(3, renderer_.num_rendered_frames());
   EXPECT_EQ(640, renderer_.width());
   EXPECT_EQ(360, renderer_.height());
 
   // Adding a new renderer should not affect resolution.
   cricket::FakeVideoRenderer renderer2;
   capturer_->AddOrUpdateSink(&renderer2, rtc::VideoSinkWants());
   EXPECT_TRUE(capturer_->CaptureFrame());
   EXPECT_EQ(4, renderer_.num_rendered_frames());
   EXPECT_EQ(640, renderer_.width());
   EXPECT_EQ(360, renderer_.height());
   EXPECT_EQ(1, renderer2.num_rendered_frames());
   EXPECT_EQ(640, renderer2.width());
   EXPECT_EQ(360, renderer2.height());
 
   // Request higher resolution.
-  wants.target_pixel_count.emplace((wants.max_pixel_count * 5) / 3);
-  wants.max_pixel_count = wants.max_pixel_count * 4;
+  wants.target_pixel_count.emplace((*wants.max_pixel_count * 5) / 3);
+  wants.max_pixel_count.emplace(*wants.max_pixel_count * 4);
   capturer_->AddOrUpdateSink(&renderer_, wants);
   EXPECT_TRUE(capturer_->CaptureFrame());
   EXPECT_EQ(5, renderer_.num_rendered_frames());
   EXPECT_EQ(960, renderer_.width());
   EXPECT_EQ(540, renderer_.height());
   EXPECT_EQ(2, renderer2.num_rendered_frames());
   EXPECT_EQ(960, renderer2.width());
   EXPECT_EQ(540, renderer2.height());
 
   // Updating with no wants should not affect resolution.
@@ skipping 469 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);
 }