commit d361249940b0384040dd6e8f06f8f67b9d158291
author Erik Språng <sprang@webrtc.org> Thu Apr 25 10:00:36 2019
committer Commit Bot <commit-bot@chromium.org> Thu Apr 25 13:28:22 2019
tree 7c76cea1ed03e98dfa9b855a90f806094e55f9d4
parent 8683467fde79cef176b04a96ce4cec9c4072a211

Remove use of deprecated SetRates on ios

Bug: webrtc:10481
Change-Id: Idcf712c8b9c5fd23e09d9bab5b4caad2d7c4d819
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/134103
Reviewed-by: Daniela Jovanoska Petrenko <denicija@webrtc.org>
Commit-Queue: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27770}

sdk/objc/native/src/objc_video_encoder_factory.mm

diff --git a/sdk/objc/native/src/objc_video_encoder_factory.mm b/sdk/objc/native/src/objc_video_encoder_factory.mm
index 9f11bea..7de9875 100644
--- a/sdk/objc/native/src/objc_video_encoder_factory.mm
+++ b/sdk/objc/native/src/objc_video_encoder_factory.mm
@@ -85,8 +85,10 @@
                  frameTypes:rtcFrameTypes];
   }
 
-  int32_t SetRates(uint32_t bitrate, uint32_t framerate) override {
-    return [encoder_ setBitrate:bitrate framerate:framerate];
+  void SetRates(const RateControlParameters &parameters) override {
+    const uint32_t bitrate = parameters.bitrate.get_sum_kbps();
+    const uint32_t framerate = static_cast<uint32_t>(parameters.framerate_fps + 0.5);
+    [encoder_ setBitrate:bitrate framerate:framerate];
   }
 
   VideoEncoder::EncoderInfo GetEncoderInfo() const override {

sdk/objc/unittests/objc_video_encoder_factory_tests.mm

diff --git a/sdk/objc/unittests/objc_video_encoder_factory_tests.mm b/sdk/objc/unittests/objc_video_encoder_factory_tests.mm
index cef7495..567622c 100644
--- a/sdk/objc/unittests/objc_video_encoder_factory_tests.mm
+++ b/sdk/objc/unittests/objc_video_encoder_factory_tests.mm
@@ -118,15 +118,3 @@
 
   EXPECT_EQ(encoder->Release(), WEBRTC_VIDEO_CODEC_ERROR);
 }
-
-TEST(ObjCVideoEncoderFactoryTest, SetRatesReturnsOKOnSuccess) {
-  std::unique_ptr<webrtc::VideoEncoder> encoder = GetObjCEncoder(CreateOKEncoderFactory());
-
-  EXPECT_EQ(encoder->SetRates(0, 0), WEBRTC_VIDEO_CODEC_OK);
-}
-
-TEST(ObjCVideoEncoderFactoryTest, SetRatesReturnsErrorOnFail) {
-  std::unique_ptr<webrtc::VideoEncoder> encoder = GetObjCEncoder(CreateErrorEncoderFactory());
-
-  EXPECT_EQ(encoder->SetRates(0, 0), WEBRTC_VIDEO_CODEC_ERROR);
-}