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

Side by Side Diff: talk/app/webrtc/peerconnectioninterface.h

Issue 1268363002: DtlsIdentityStoreInterface added. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 4 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 * libjingle 2 * libjingle
3 * Copyright 2012 Google Inc. 3 * Copyright 2012 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 } 88 }
89 89
90 namespace cricket { 90 namespace cricket {
91 class PortAllocator; 91 class PortAllocator;
92 class WebRtcVideoDecoderFactory; 92 class WebRtcVideoDecoderFactory;
93 class WebRtcVideoEncoderFactory; 93 class WebRtcVideoEncoderFactory;
94 } 94 }
95 95
96 namespace webrtc { 96 namespace webrtc {
97 class AudioDeviceModule; 97 class AudioDeviceModule;
98 class DtlsIdentityStoreInterface;
98 class MediaConstraintsInterface; 99 class MediaConstraintsInterface;
99 100
100 // MediaStream container interface. 101 // MediaStream container interface.
101 class StreamCollectionInterface : public rtc::RefCountInterface { 102 class StreamCollectionInterface : public rtc::RefCountInterface {
102 public: 103 public:
103 // TODO(ronghuawu): Update the function names to c++ style, e.g. find -> Find. 104 // TODO(ronghuawu): Update the function names to c++ style, e.g. find -> Find.
104 virtual size_t count() = 0; 105 virtual size_t count() = 0;
105 virtual MediaStreamInterface* at(size_t index) = 0; 106 virtual MediaStreamInterface* at(size_t index) = 0;
106 virtual MediaStreamInterface* find(const std::string& label) = 0; 107 virtual MediaStreamInterface* find(const std::string& label) = 0;
107 virtual MediaStreamTrackInterface* FindAudioTrack( 108 virtual MediaStreamTrackInterface* FindAudioTrack(
(...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after
541 int network_ignore_mask; 542 int network_ignore_mask;
542 543
543 // Sets the maximum supported protocol version. The highest version 544 // Sets the maximum supported protocol version. The highest version
544 // supported by both ends will be used for the connection, i.e. if one 545 // supported by both ends will be used for the connection, i.e. if one
545 // party supports DTLS 1.0 and the other DTLS 1.2, DTLS 1.0 will be used. 546 // party supports DTLS 1.0 and the other DTLS 1.2, DTLS 1.0 will be used.
546 rtc::SSLProtocolVersion ssl_max_version; 547 rtc::SSLProtocolVersion ssl_max_version;
547 }; 548 };
548 549
549 virtual void SetOptions(const Options& options) = 0; 550 virtual void SetOptions(const Options& options) = 0;
550 551
552 // TODO(hbos): Temporary CreatePeerConnection function while we transition
553 // from DTLSIdentityServiceInterface to DtlsIdentityStoreInterface.
554 rtc::scoped_refptr<PeerConnectionInterface>
555 CreatePeerConnection(
556 const PeerConnectionInterface::RTCConfiguration& configuration,
557 const MediaConstraintsInterface* constraints,
558 PortAllocatorFactoryInterface* allocator_factory,
559 DTLSIdentityServiceInterface* dtls_identity_service,
560 rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store,
561 PeerConnectionObserver* observer) {
562 return CreatePeerConnection(configuration, constraints, allocator_factory,
563 dtls_identity_service, observer);
564 }
565
551 // This method takes the ownership of |dtls_identity_service|. 566 // This method takes the ownership of |dtls_identity_service|.
552 virtual rtc::scoped_refptr<PeerConnectionInterface> 567 virtual rtc::scoped_refptr<PeerConnectionInterface>
553 CreatePeerConnection( 568 CreatePeerConnection(
554 const PeerConnectionInterface::RTCConfiguration& configuration, 569 const PeerConnectionInterface::RTCConfiguration& configuration,
555 const MediaConstraintsInterface* constraints, 570 const MediaConstraintsInterface* constraints,
556 PortAllocatorFactoryInterface* allocator_factory, 571 PortAllocatorFactoryInterface* allocator_factory,
557 DTLSIdentityServiceInterface* dtls_identity_service, 572 DTLSIdentityServiceInterface* dtls_identity_service,
558 PeerConnectionObserver* observer) = 0; 573 PeerConnectionObserver* observer) = 0;
559 574
560 // TODO(mallinath) : Remove below versions after clients are updated 575 // TODO(mallinath) : Remove below versions after clients are updated
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
627 CreatePeerConnectionFactory( 642 CreatePeerConnectionFactory(
628 rtc::Thread* worker_thread, 643 rtc::Thread* worker_thread,
629 rtc::Thread* signaling_thread, 644 rtc::Thread* signaling_thread,
630 AudioDeviceModule* default_adm, 645 AudioDeviceModule* default_adm,
631 cricket::WebRtcVideoEncoderFactory* encoder_factory, 646 cricket::WebRtcVideoEncoderFactory* encoder_factory,
632 cricket::WebRtcVideoDecoderFactory* decoder_factory); 647 cricket::WebRtcVideoDecoderFactory* decoder_factory);
633 648
634 } // namespace webrtc 649 } // namespace webrtc
635 650
636 #endif // TALK_APP_WEBRTC_PEERCONNECTIONINTERFACE_H_ 651 #endif // TALK_APP_WEBRTC_PEERCONNECTIONINTERFACE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698