| Index: webrtc/api/peerconnectionfactory.h
|
| diff --git a/webrtc/api/peerconnectionfactory.h b/webrtc/api/peerconnectionfactory.h
|
| index 3ba4124096e4300f79593460f70d67b8af48eb03..1bc40ed84a475b7c9ae22bb22000c37bddefebf2 100644
|
| --- a/webrtc/api/peerconnectionfactory.h
|
| +++ b/webrtc/api/peerconnectionfactory.h
|
| @@ -38,6 +38,7 @@ class PeerConnectionFactory : public PeerConnectionFactoryInterface {
|
| options_ = options;
|
| }
|
|
|
| + // Deprecated, use version without constraints.
|
| rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection(
|
| const PeerConnectionInterface::RTCConfiguration& configuration,
|
| const MediaConstraintsInterface* constraints,
|
| @@ -45,14 +46,29 @@ class PeerConnectionFactory : public PeerConnectionFactoryInterface {
|
| rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store,
|
| PeerConnectionObserver* observer) override;
|
|
|
| + virtual rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection(
|
| + const PeerConnectionInterface::RTCConfiguration& configuration,
|
| + rtc::scoped_ptr<cricket::PortAllocator> allocator,
|
| + rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store,
|
| + PeerConnectionObserver* observer) override;
|
| +
|
| bool Initialize();
|
|
|
| rtc::scoped_refptr<MediaStreamInterface>
|
| CreateLocalMediaStream(const std::string& label) override;
|
|
|
| + virtual rtc::scoped_refptr<AudioSourceInterface> CreateAudioSource(
|
| + const cricket::AudioOptions& options) override;
|
| + // Deprecated, use version without constraints.
|
| rtc::scoped_refptr<AudioSourceInterface> CreateAudioSource(
|
| const MediaConstraintsInterface* constraints) override;
|
|
|
| + virtual rtc::scoped_refptr<VideoSourceInterface> CreateVideoSource(
|
| + 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<VideoSourceInterface> CreateVideoSource(
|
| cricket::VideoCapturer* capturer,
|
| const MediaConstraintsInterface* constraints) override;
|
|
|