mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-16 07:10:38 +01:00

This reverts commit00733015fa
. Reason for revert: The reason for a downstream test failure on the original commit and a workaround has been found. Solution is to keep a PeerConnectionFactory constructor implementation as the same as before. Original change's description: > Revert "Enables PeerConnectionFactory using external fec controller" > > This reverts commit4f07bdb255
. > > Reason for revert: Speculatively reverting, because downstream test is now hitting "PeerConnectionFactory.initialize was not called before creating a PeerConnectionFactory" error, even though it did call initialize. I don't see how any change in this CL could cause that, but it's the only CL on the blamelist, and it does modify PeerConnectionFactory.java > > Original change's description: > > Enables PeerConnectionFactory using external fec controller > > > > Bug: webrtc:8799 > > Change-Id: Ieb2cf6163b9a83844ab9ed4822b4a7f1db4c24b8 > > Reviewed-on: https://webrtc-review.googlesource.com/43961 > > Commit-Queue: Ying Wang <yinwa@webrtc.org> > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> > > Reviewed-by: Niels Moller <nisse@webrtc.org> > > Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#22038} > > TBR=sakal@webrtc.org,kwiberg@webrtc.org,nisse@webrtc.org,stefan@webrtc.org,yinwa@webrtc.org > > Change-Id: I95868c35d6f9973e0ebf563814cd71d0fcbd433d > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:8799 > Reviewed-on: https://webrtc-review.googlesource.com/54080 > Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org> > Commit-Queue: Taylor Brandstetter <deadbeef@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22040} TBR=deadbeef@webrtc.org,sakal@webrtc.org,kwiberg@webrtc.org,nisse@webrtc.org,stefan@webrtc.org,yinwa@webrtc.org Bug: webrtc:8799 Change-Id: If9f3292bfcc739782967530c49f006d0abbc38a8 Reviewed-on: https://webrtc-review.googlesource.com/55400 Commit-Queue: Ying Wang <yinwa@webrtc.org> Reviewed-by: Ying Wang <yinwa@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22100}
144 lines
5.6 KiB
C++
144 lines
5.6 KiB
C++
/*
|
|
* Copyright 2011 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.
|
|
*/
|
|
|
|
#ifndef PC_PEERCONNECTIONFACTORY_H_
|
|
#define PC_PEERCONNECTIONFACTORY_H_
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
|
|
#include "api/mediastreaminterface.h"
|
|
#include "api/peerconnectioninterface.h"
|
|
#include "media/sctp/sctptransportinternal.h"
|
|
#include "pc/channelmanager.h"
|
|
#include "rtc_base/rtccertificategenerator.h"
|
|
#include "rtc_base/scoped_ref_ptr.h"
|
|
#include "rtc_base/thread.h"
|
|
|
|
namespace rtc {
|
|
class BasicNetworkManager;
|
|
class BasicPacketSocketFactory;
|
|
}
|
|
|
|
namespace webrtc {
|
|
|
|
class RtcEventLog;
|
|
|
|
class PeerConnectionFactory : public PeerConnectionFactoryInterface {
|
|
public:
|
|
// Use the overloads of CreateVideoSource that take raw VideoCapturer
|
|
// pointers from PeerConnectionFactoryInterface.
|
|
// TODO(deadbeef): Remove this using statement once those overloads are
|
|
// removed.
|
|
using PeerConnectionFactoryInterface::CreateVideoSource;
|
|
|
|
void SetOptions(const Options& options) override;
|
|
|
|
// Deprecated, use version without constraints.
|
|
rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection(
|
|
const PeerConnectionInterface::RTCConfiguration& configuration,
|
|
const MediaConstraintsInterface* constraints,
|
|
std::unique_ptr<cricket::PortAllocator> allocator,
|
|
std::unique_ptr<rtc::RTCCertificateGeneratorInterface> cert_generator,
|
|
PeerConnectionObserver* observer) override;
|
|
|
|
rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection(
|
|
const PeerConnectionInterface::RTCConfiguration& configuration,
|
|
std::unique_ptr<cricket::PortAllocator> allocator,
|
|
std::unique_ptr<rtc::RTCCertificateGeneratorInterface> cert_generator,
|
|
PeerConnectionObserver* observer) override;
|
|
|
|
bool Initialize();
|
|
|
|
rtc::scoped_refptr<MediaStreamInterface>
|
|
CreateLocalMediaStream(const std::string& label) override;
|
|
|
|
rtc::scoped_refptr<AudioSourceInterface> CreateAudioSource(
|
|
const cricket::AudioOptions& options) override;
|
|
// Deprecated, use version without constraints.
|
|
rtc::scoped_refptr<AudioSourceInterface> CreateAudioSource(
|
|
const MediaConstraintsInterface* constraints) override;
|
|
|
|
rtc::scoped_refptr<VideoTrackSourceInterface> CreateVideoSource(
|
|
std::unique_ptr<cricket::VideoCapturer> capturer) override;
|
|
// This version supports filtering on width, height and frame rate.
|
|
// For the "constraints=null" case, use the version without constraints.
|
|
// TODO(hta): Design a version without MediaConstraintsInterface.
|
|
// https://bugs.chromium.org/p/webrtc/issues/detail?id=5617
|
|
rtc::scoped_refptr<VideoTrackSourceInterface> CreateVideoSource(
|
|
std::unique_ptr<cricket::VideoCapturer> capturer,
|
|
const MediaConstraintsInterface* constraints) override;
|
|
|
|
rtc::scoped_refptr<VideoTrackInterface> CreateVideoTrack(
|
|
const std::string& id,
|
|
VideoTrackSourceInterface* video_source) override;
|
|
|
|
rtc::scoped_refptr<AudioTrackInterface>
|
|
CreateAudioTrack(const std::string& id,
|
|
AudioSourceInterface* audio_source) override;
|
|
|
|
bool StartAecDump(rtc::PlatformFile file, int64_t max_size_bytes) override;
|
|
void StopAecDump() override;
|
|
|
|
virtual cricket::TransportController* CreateTransportController(
|
|
cricket::PortAllocator* port_allocator,
|
|
bool redetermine_role_on_ice_restart,
|
|
RtcEventLog* event_log = nullptr);
|
|
|
|
virtual std::unique_ptr<cricket::SctpTransportInternalFactory>
|
|
CreateSctpTransportInternalFactory();
|
|
|
|
virtual cricket::ChannelManager* channel_manager();
|
|
virtual rtc::Thread* signaling_thread();
|
|
virtual rtc::Thread* worker_thread();
|
|
virtual rtc::Thread* network_thread();
|
|
const Options& options() const { return options_; }
|
|
|
|
protected:
|
|
PeerConnectionFactory(
|
|
rtc::Thread* network_thread,
|
|
rtc::Thread* worker_thread,
|
|
rtc::Thread* signaling_thread,
|
|
std::unique_ptr<cricket::MediaEngineInterface> media_engine,
|
|
std::unique_ptr<webrtc::CallFactoryInterface> call_factory,
|
|
std::unique_ptr<RtcEventLogFactoryInterface> event_log_factory);
|
|
PeerConnectionFactory(
|
|
rtc::Thread* network_thread,
|
|
rtc::Thread* worker_thread,
|
|
rtc::Thread* signaling_thread,
|
|
std::unique_ptr<cricket::MediaEngineInterface> media_engine,
|
|
std::unique_ptr<webrtc::CallFactoryInterface> call_factory,
|
|
std::unique_ptr<RtcEventLogFactoryInterface> event_log_factory,
|
|
std::unique_ptr<FecControllerFactoryInterface> fec_controller_factory);
|
|
virtual ~PeerConnectionFactory();
|
|
|
|
private:
|
|
std::unique_ptr<RtcEventLog> CreateRtcEventLog_w();
|
|
std::unique_ptr<Call> CreateCall_w(RtcEventLog* event_log);
|
|
|
|
bool wraps_current_thread_;
|
|
rtc::Thread* network_thread_;
|
|
rtc::Thread* worker_thread_;
|
|
rtc::Thread* signaling_thread_;
|
|
std::unique_ptr<rtc::Thread> owned_network_thread_;
|
|
std::unique_ptr<rtc::Thread> owned_worker_thread_;
|
|
Options options_;
|
|
std::unique_ptr<cricket::ChannelManager> channel_manager_;
|
|
std::unique_ptr<rtc::BasicNetworkManager> default_network_manager_;
|
|
std::unique_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_;
|
|
std::unique_ptr<cricket::MediaEngineInterface> media_engine_;
|
|
std::unique_ptr<webrtc::CallFactoryInterface> call_factory_;
|
|
std::unique_ptr<RtcEventLogFactoryInterface> event_log_factory_;
|
|
std::unique_ptr<FecControllerFactoryInterface> fec_controller_factory_;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // PC_PEERCONNECTIONFACTORY_H_
|