From d361249940b0384040dd6e8f06f8f67b9d158291 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Spr=C3=A5ng?= Date: Thu, 25 Apr 2019 12:00:36 +0200 Subject: [PATCH] Remove use of deprecated SetRates on ios MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:10481 Change-Id: Idcf712c8b9c5fd23e09d9bab5b4caad2d7c4d819 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/134103 Reviewed-by: Daniela Jovanoska Petrenko Commit-Queue: Erik SprÃ¥ng Cr-Commit-Position: refs/heads/master@{#27770} --- sdk/objc/native/src/objc_video_encoder_factory.mm | 6 ++++-- .../unittests/objc_video_encoder_factory_tests.mm | 12 ------------ 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/sdk/objc/native/src/objc_video_encoder_factory.mm b/sdk/objc/native/src/objc_video_encoder_factory.mm index 9f11bea686..7de9875eac 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 @@ class ObjCVideoEncoder : public VideoEncoder { frameTypes:rtcFrameTypes]; } - int32_t SetRates(uint32_t bitrate, uint32_t framerate) override { - return [encoder_ setBitrate:bitrate framerate:framerate]; + void SetRates(const RateControlParameters ¶meters) override { + const uint32_t bitrate = parameters.bitrate.get_sum_kbps(); + const uint32_t framerate = static_cast(parameters.framerate_fps + 0.5); + [encoder_ setBitrate:bitrate framerate:framerate]; } VideoEncoder::EncoderInfo GetEncoderInfo() const override { diff --git a/sdk/objc/unittests/objc_video_encoder_factory_tests.mm b/sdk/objc/unittests/objc_video_encoder_factory_tests.mm index cef7495bb6..567622c657 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 @@ TEST(ObjCVideoEncoderFactoryTest, ReleaseEncodeReturnsErrorOnFail) { EXPECT_EQ(encoder->Release(), WEBRTC_VIDEO_CODEC_ERROR); } - -TEST(ObjCVideoEncoderFactoryTest, SetRatesReturnsOKOnSuccess) { - std::unique_ptr encoder = GetObjCEncoder(CreateOKEncoderFactory()); - - EXPECT_EQ(encoder->SetRates(0, 0), WEBRTC_VIDEO_CODEC_OK); -} - -TEST(ObjCVideoEncoderFactoryTest, SetRatesReturnsErrorOnFail) { - std::unique_ptr encoder = GetObjCEncoder(CreateErrorEncoderFactory()); - - EXPECT_EQ(encoder->SetRates(0, 0), WEBRTC_VIDEO_CODEC_ERROR); -}