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

webrtc/media/base/videobroadcaster.cc

Index: webrtc/media/base/videobroadcaster.cc
diff --git a/webrtc/media/base/videobroadcaster.cc b/webrtc/media/base/videobroadcaster.cc
index c5b1484110c1775b976afd39f4596cd5aec71bb5..5d0edeb6dfe4f9dc3129ba19231716f8caea03f5 100644
--- a/webrtc/media/base/videobroadcaster.cc
+++ b/webrtc/media/base/videobroadcaster.cc
@@ -84,7 +84,9 @@
       wants.rotation_applied = true;
     }
     // wants.max_pixel_count == MIN(sink.wants.max_pixel_count)
-    if (sink.wants.max_pixel_count < wants.max_pixel_count) {
+    if (sink.wants.max_pixel_count &&
+        (!wants.max_pixel_count ||
+         (*sink.wants.max_pixel_count < *wants.max_pixel_count))) {
       wants.max_pixel_count = sink.wants.max_pixel_count;
     }
     // Select the minimum requested target_pixel_count, if any, of all sinks so
@@ -96,15 +98,11 @@
          (*sink.wants.target_pixel_count < *wants.target_pixel_count))) {
       wants.target_pixel_count = sink.wants.target_pixel_count;
     }
-    // Select the minimum for the requested max framerates.
-    if (sink.wants.max_framerate_fps < wants.max_framerate_fps) {
-      wants.max_framerate_fps = sink.wants.max_framerate_fps;
-    }
   }
 
-  if (wants.target_pixel_count &&
-      *wants.target_pixel_count >= wants.max_pixel_count) {
-    wants.target_pixel_count.emplace(wants.max_pixel_count);
+  if (wants.max_pixel_count && wants.target_pixel_count &&
+      *wants.target_pixel_count >= *wants.max_pixel_count) {
+    wants.target_pixel_count = wants.max_pixel_count;
   }
   current_wants_ = wants;
 }