OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2004 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2004 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 27 matching lines...) Expand all Loading... |
38 // Passes down the calls to |store_|. See usage in CreatePeerConnection. | 38 // Passes down the calls to |store_|. See usage in CreatePeerConnection. |
39 class DtlsIdentityStoreWrapper : public DtlsIdentityStoreInterface { | 39 class DtlsIdentityStoreWrapper : public DtlsIdentityStoreInterface { |
40 public: | 40 public: |
41 DtlsIdentityStoreWrapper( | 41 DtlsIdentityStoreWrapper( |
42 const rtc::scoped_refptr<RefCountedDtlsIdentityStore>& store) | 42 const rtc::scoped_refptr<RefCountedDtlsIdentityStore>& store) |
43 : store_(store) { | 43 : store_(store) { |
44 RTC_DCHECK(store_); | 44 RTC_DCHECK(store_); |
45 } | 45 } |
46 | 46 |
47 void RequestIdentity( | 47 void RequestIdentity( |
48 rtc::KeyType key_type, | 48 rtc::KeyParams key_params, |
| 49 rtc::Optional<uint64_t> expires, |
49 const rtc::scoped_refptr<webrtc::DtlsIdentityRequestObserver>& | 50 const rtc::scoped_refptr<webrtc::DtlsIdentityRequestObserver>& |
50 observer) override { | 51 observer) override { |
51 store_->RequestIdentity(key_type, observer); | 52 store_->RequestIdentity(key_params, expires, observer); |
52 } | 53 } |
53 | 54 |
54 private: | 55 private: |
55 rtc::scoped_refptr<RefCountedDtlsIdentityStore> store_; | 56 rtc::scoped_refptr<RefCountedDtlsIdentityStore> store_; |
56 }; | 57 }; |
57 | 58 |
58 } // anonymous namespace | 59 } // anonymous namespace |
59 | 60 |
60 rtc::scoped_refptr<PeerConnectionFactoryInterface> | 61 rtc::scoped_refptr<PeerConnectionFactoryInterface> |
61 CreatePeerConnectionFactory() { | 62 CreatePeerConnectionFactory() { |
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
305 } | 306 } |
306 | 307 |
307 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() { | 308 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() { |
308 ASSERT(worker_thread_ == rtc::Thread::Current()); | 309 ASSERT(worker_thread_ == rtc::Thread::Current()); |
309 return cricket::WebRtcMediaEngineFactory::Create( | 310 return cricket::WebRtcMediaEngineFactory::Create( |
310 default_adm_.get(), video_encoder_factory_.get(), | 311 default_adm_.get(), video_encoder_factory_.get(), |
311 video_decoder_factory_.get()); | 312 video_decoder_factory_.get()); |
312 } | 313 } |
313 | 314 |
314 } // namespace webrtc | 315 } // namespace webrtc |
OLD | NEW |