Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(667)

Side by Side Diff: webrtc/api/peerconnectioninterface.h

Issue 2020623002: Turning FakeDtlsIdentityStore into FakeRTCCertificateGenerator. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase with master Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 585 matching lines...) Expand 10 before | Expand all | Expand 10 after
596 }; 596 };
597 597
598 virtual void SetOptions(const Options& options) = 0; 598 virtual void SetOptions(const Options& options) = 0;
599 599
600 virtual rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection( 600 virtual rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection(
601 const PeerConnectionInterface::RTCConfiguration& configuration, 601 const PeerConnectionInterface::RTCConfiguration& configuration,
602 const MediaConstraintsInterface* constraints, 602 const MediaConstraintsInterface* constraints,
603 std::unique_ptr<cricket::PortAllocator> allocator, 603 std::unique_ptr<cricket::PortAllocator> allocator,
604 std::unique_ptr<rtc::RTCCertificateGeneratorInterface> cert_generator, 604 std::unique_ptr<rtc::RTCCertificateGeneratorInterface> cert_generator,
605 PeerConnectionObserver* observer) = 0; 605 PeerConnectionObserver* observer) = 0;
606 // TODO(hbos): To be removed in favor of the |cert_generator| version as soon
607 // as unittests stop using this version. See bugs.webrtc.org/5707,
608 // bugs.webrtc.org/5708.
609 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnectionWithStore(
610 const PeerConnectionInterface::RTCConfiguration& configuration,
611 const MediaConstraintsInterface* constraints,
612 std::unique_ptr<cricket::PortAllocator> allocator,
613 std::unique_ptr<DtlsIdentityStoreInterface> dtls_identity_store,
614 PeerConnectionObserver* observer) {
615 return CreatePeerConnection(
616 configuration,
617 constraints,
618 std::move(allocator),
619 std::unique_ptr<rtc::RTCCertificateGeneratorInterface>(
620 dtls_identity_store ? new RTCCertificateGeneratorStoreWrapper(
621 std::move(dtls_identity_store)) : nullptr),
622 observer);
623 }
624 606
625 virtual rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection( 607 virtual rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection(
626 const PeerConnectionInterface::RTCConfiguration& configuration, 608 const PeerConnectionInterface::RTCConfiguration& configuration,
627 std::unique_ptr<cricket::PortAllocator> allocator, 609 std::unique_ptr<cricket::PortAllocator> allocator,
628 std::unique_ptr<rtc::RTCCertificateGeneratorInterface> cert_generator, 610 std::unique_ptr<rtc::RTCCertificateGeneratorInterface> cert_generator,
629 PeerConnectionObserver* observer) = 0; 611 PeerConnectionObserver* observer) = 0;
630 // TODO(hbos): To be removed in favor of the |cert_generator| version as soon
631 // as unittests stop using this version. See bugs.webrtc.org/5707,
632 // bugs.webrtc.org/5708.
633 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnectionWithStore(
634 const PeerConnectionInterface::RTCConfiguration& configuration,
635 std::unique_ptr<cricket::PortAllocator> allocator,
636 std::unique_ptr<DtlsIdentityStoreInterface> dtls_identity_store,
637 PeerConnectionObserver* observer) {
638 return CreatePeerConnection(
639 configuration,
640 std::move(allocator),
641 std::unique_ptr<rtc::RTCCertificateGeneratorInterface>(
642 dtls_identity_store ? new RTCCertificateGeneratorStoreWrapper(
643 std::move(dtls_identity_store)) : nullptr),
644 observer);
645 }
646 612
647 virtual rtc::scoped_refptr<MediaStreamInterface> 613 virtual rtc::scoped_refptr<MediaStreamInterface>
648 CreateLocalMediaStream(const std::string& label) = 0; 614 CreateLocalMediaStream(const std::string& label) = 0;
649 615
650 // Creates a AudioSourceInterface. 616 // Creates a AudioSourceInterface.
651 // |constraints| decides audio processing settings but can be NULL. 617 // |constraints| decides audio processing settings but can be NULL.
652 virtual rtc::scoped_refptr<AudioSourceInterface> CreateAudioSource( 618 virtual rtc::scoped_refptr<AudioSourceInterface> CreateAudioSource(
653 const cricket::AudioOptions& options) = 0; 619 const cricket::AudioOptions& options) = 0;
654 // Deprecated - use version above. 620 // Deprecated - use version above.
655 virtual rtc::scoped_refptr<AudioSourceInterface> CreateAudioSource( 621 virtual rtc::scoped_refptr<AudioSourceInterface> CreateAudioSource(
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
756 cricket::WebRtcVideoEncoderFactory* encoder_factory, 722 cricket::WebRtcVideoEncoderFactory* encoder_factory,
757 cricket::WebRtcVideoDecoderFactory* decoder_factory) { 723 cricket::WebRtcVideoDecoderFactory* decoder_factory) {
758 return CreatePeerConnectionFactory( 724 return CreatePeerConnectionFactory(
759 worker_and_network_thread, worker_and_network_thread, signaling_thread, 725 worker_and_network_thread, worker_and_network_thread, signaling_thread,
760 default_adm, encoder_factory, decoder_factory); 726 default_adm, encoder_factory, decoder_factory);
761 } 727 }
762 728
763 } // namespace webrtc 729 } // namespace webrtc
764 730
765 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_ 731 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_
OLDNEW
« no previous file with comments | « webrtc/api/peerconnectionfactory_unittest.cc ('k') | webrtc/api/peerconnectioninterface_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698