commit 0af86d1c43aadadf6ae44799a80739099248de03
author Magnus Jedvert <magjed@webrtc.org> Sat Oct 28 14:26:55 2017
committer Commit Bot <commit-bot@chromium.org> Wed Nov 01 15:21:06 2017
tree be18337617cbbf9158f002c9e3685bcfb7bb70c0
parent 93db859c90956a3c301c1a17bdadc670f154b42f

Reland ObjC API for BWE allocation strategy

Bug: webrtc:8243
Change-Id: Ib1b8349bffe98490ba5f1d12b18e848e89cdb9ce
Reviewed-on: https://webrtc-review.googlesource.com/16640
Reviewed-by: Alex Narest <alexnarest@webrtc.org>
Commit-Queue: Magnus Jedvert <magjed@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20534}

sdk/BUILD.gn

diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
index 890c4f9..787ca8c 100644
--- a/sdk/BUILD.gn
+++ b/sdk/BUILD.gn
@@ -420,6 +420,7 @@
         "objc/Framework/Classes/PeerConnection/RTCMetricsSampleInfo+Private.h",
         "objc/Framework/Classes/PeerConnection/RTCMetricsSampleInfo.mm",
         "objc/Framework/Classes/PeerConnection/RTCPeerConnection+DataChannel.mm",
+        "objc/Framework/Classes/PeerConnection/RTCPeerConnection+Native.h",
         "objc/Framework/Classes/PeerConnection/RTCPeerConnection+Private.h",
         "objc/Framework/Classes/PeerConnection/RTCPeerConnection+Stats.mm",
         "objc/Framework/Classes/PeerConnection/RTCPeerConnection.mm",

sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection+Native.h

diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection+Native.h b/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection+Native.h
new file mode 100644
index 0000000..238f808
--- /dev/null
+++ b/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection+Native.h
@@ -0,0 +1,34 @@
+/*
+ *  Copyright 2017 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.
+ */
+
+#import "WebRTC/RTCPeerConnection.h"
+
+#include <memory>
+
+namespace rtc {
+class BitrateAllocationStrategy;
+}  // namespace rtc
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ * This class extension exposes methods that work directly with injectable C++ components.
+ */
+@interface RTCPeerConnection ()
+
+/** Sets current strategy. If not set default WebRTC allocator will be used. May be changed during
+ *  an active session.
+ */
+- (void)setBitrateAllocationStrategy:
+        (std::unique_ptr<rtc::BitrateAllocationStrategy>)bitrateAllocationStrategy;
+
+@end
+
+NS_ASSUME_NONNULL_END

sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection.mm

diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection.mm
index e443e85..6376ea0 100644
--- a/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection.mm
+++ b/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection.mm
@@ -17,6 +17,7 @@
 #import "RTCLegacyStatsReport+Private.h"
 #import "RTCMediaConstraints+Private.h"
 #import "RTCMediaStream+Private.h"
+#import "RTCPeerConnection+Native.h"
 #import "RTCPeerConnectionFactory+Private.h"
 #import "RTCRtpReceiver+Private.h"
 #import "RTCRtpSender+Private.h"
@@ -385,6 +386,11 @@
   return _peerConnection->SetBitrate(params).ok();
 }
 
+- (void)setBitrateAllocationStrategy:
+        (std::unique_ptr<rtc::BitrateAllocationStrategy>)bitrateAllocationStrategy {
+  _peerConnection->SetBitrateAllocationStrategy(std::move(bitrateAllocationStrategy));
+}
+
 - (BOOL)startRtcEventLogWithFilePath:(NSString *)filePath
                       maxSizeInBytes:(int64_t)maxSizeInBytes {
   RTC_DCHECK(filePath.length);