From 11b68463e3f49c38665a32bc84c42434a78dc291 Mon Sep 17 00:00:00 2001
From: Seth Hampson <shampson@webrtc.org>
Date: Wed, 10 Jan 2018 10:36:11 -0800
Subject: [PATCH] Removed overloaded function GetSimulcastConfig from
 simulcast.cc.

GetSimulcastConfig had to be overloaded in order to not break downstream
client tests when the API was changed. Now that the downstream client
has been updated to use the new API, we can remove the overloaded
function.

Bug: webrtc:8630
Change-Id: I5d5d494e0579e60858d6efbb4715761394874b38
Reviewed-on: https://webrtc-review.googlesource.com/38882
Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org>
Commit-Queue: Seth Hampson <shampson@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21590}
---
 media/engine/simulcast.cc | 13 -------------
 media/engine/simulcast.h  | 10 ----------
 2 files changed, 23 deletions(-)

diff --git a/media/engine/simulcast.cc b/media/engine/simulcast.cc
index aa042468ad..6d68453f7b 100644
--- a/media/engine/simulcast.cc
+++ b/media/engine/simulcast.cc
@@ -141,19 +141,6 @@ int GetTotalMaxBitrateBps(const std::vector<webrtc::VideoStream>& streams) {
   return total_max_bitrate_bps;
 }
 
-// TODO(shampson): This is a fix to not break downstream tests. Remove this
-// after updating downstream tests.
-std::vector<webrtc::VideoStream> GetSimulcastConfig(size_t max_streams,
-                                                    int width,
-                                                    int height,
-                                                    int max_bitrate_bps,
-                                                    int max_qp,
-                                                    int max_framerate,
-                                                    bool is_screencast) {
-  return GetSimulcastConfig(max_streams, width, height, max_bitrate_bps, 1.0,
-                            max_qp, max_framerate, is_screencast);
-}
-
 std::vector<webrtc::VideoStream> GetSimulcastConfig(size_t max_streams,
                                                     int width,
                                                     int height,
diff --git a/media/engine/simulcast.h b/media/engine/simulcast.h
index b0da3018a7..31fdcae80b 100644
--- a/media/engine/simulcast.h
+++ b/media/engine/simulcast.h
@@ -46,16 +46,6 @@ int GetTotalMaxBitrateBps(const std::vector<webrtc::VideoStream>& streams);
 // Get the ssrcs of the SIM group from the stream params.
 void GetSimulcastSsrcs(const StreamParams& sp, std::vector<uint32_t>* ssrcs);
 
-// TODO(shampson): This is a fix to not break downstream tests. Remove this
-// after updating downstream tests.
-std::vector<webrtc::VideoStream> GetSimulcastConfig(size_t max_streams,
-                                                    int width,
-                                                    int height,
-                                                    int max_bitrate_bps,
-                                                    int max_qp,
-                                                    int max_framerate,
-                                                    bool is_screencast = false);
-
 // Get simulcast settings.
 // TODO(sprang): Remove default parameter when it's not longer referenced.
 std::vector<webrtc::VideoStream> GetSimulcastConfig(size_t max_streams,