mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 05:40:42 +01:00
cfba4ffe31
This reverts commit7ded733518. Reason for revert: Found more code calling NetworkMonitorFactory::SetFactory... Original change's description: > Reland "Pass NetworkMonitorFactory through PeerConnectionFactory." > > This is a reland of003c9be817> > Original change's description: > > Pass NetworkMonitorFactory through PeerConnectionFactory. > > > > Previously the instance was set through a static method, which was > > really only done because it was difficult to add new > > PeerConnectionFactory construction arguments at the time. > > > > Now that we have PeerConnectionFactoryDependencies it's easy to clean > > this up. > > > > I'm doing this because I plan to add a NetworkMonitor implementation > > for iOS, and don't want to inherit this ugliness. > > > > Bug: webrtc:9883 > > Change-Id: Id94dc061ab1c7186b81af8547393a6e336ff04c2 > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/180241 > > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > > Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> > > Commit-Queue: Taylor <deadbeef@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#31815} > > TBR=hta@webrtc.org, sakal@webrtc.org > > Bug: webrtc:9883 > Change-Id: Ibf69a22e8f94226908636c7d50ff9eda65bd4129 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/180720 > Reviewed-by: Taylor <deadbeef@webrtc.org> > Commit-Queue: Taylor <deadbeef@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#31822} TBR=deadbeef@webrtc.org,sakal@webrtc.org,hta@webrtc.org Change-Id: Iae51b94072cec9abc021eed4e51d1fbeee998adc No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:9883 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/180721 Reviewed-by: Taylor <deadbeef@webrtc.org> Commit-Queue: Taylor <deadbeef@webrtc.org> Cr-Commit-Position: refs/heads/master@{#31823}
33 lines
1.1 KiB
C++
33 lines
1.1 KiB
C++
/*
|
|
* Copyright 2018 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.
|
|
*/
|
|
#include "sdk/android/native_api/peerconnection/peer_connection_factory.h"
|
|
|
|
#include <jni.h>
|
|
|
|
#include <memory>
|
|
#include <utility>
|
|
|
|
#include "sdk/android/src/jni/pc/peer_connection_factory.h"
|
|
|
|
namespace webrtc {
|
|
|
|
jobject NativeToJavaPeerConnectionFactory(
|
|
JNIEnv* jni,
|
|
rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface> pcf,
|
|
std::unique_ptr<rtc::Thread> network_thread,
|
|
std::unique_ptr<rtc::Thread> worker_thread,
|
|
std::unique_ptr<rtc::Thread> signaling_thread,
|
|
rtc::NetworkMonitorFactory* network_monitor_factory) {
|
|
return webrtc::jni::NativeToJavaPeerConnectionFactory(
|
|
jni, pcf, std::move(network_thread), std::move(worker_thread),
|
|
std::move(signaling_thread), network_monitor_factory);
|
|
}
|
|
|
|
} // namespace webrtc
|