OLD | NEW |
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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
65 // 7. Once a candidate have been found PeerConnection will call the observer | 65 // 7. Once a candidate have been found PeerConnection will call the observer |
66 // function OnIceCandidate. Send these candidates to the remote peer. | 66 // function OnIceCandidate. Send these candidates to the remote peer. |
67 | 67 |
68 #ifndef TALK_APP_WEBRTC_PEERCONNECTIONINTERFACE_H_ | 68 #ifndef TALK_APP_WEBRTC_PEERCONNECTIONINTERFACE_H_ |
69 #define TALK_APP_WEBRTC_PEERCONNECTIONINTERFACE_H_ | 69 #define TALK_APP_WEBRTC_PEERCONNECTIONINTERFACE_H_ |
70 | 70 |
71 #include <string> | 71 #include <string> |
72 #include <vector> | 72 #include <vector> |
73 | 73 |
74 #include "talk/app/webrtc/datachannelinterface.h" | 74 #include "talk/app/webrtc/datachannelinterface.h" |
| 75 #include "talk/app/webrtc/dtlscertificate.h" |
75 #include "talk/app/webrtc/dtlsidentitystore.h" | 76 #include "talk/app/webrtc/dtlsidentitystore.h" |
76 #include "talk/app/webrtc/dtmfsenderinterface.h" | 77 #include "talk/app/webrtc/dtmfsenderinterface.h" |
77 #include "talk/app/webrtc/jsep.h" | 78 #include "talk/app/webrtc/jsep.h" |
78 #include "talk/app/webrtc/mediastreaminterface.h" | 79 #include "talk/app/webrtc/mediastreaminterface.h" |
79 #include "talk/app/webrtc/statstypes.h" | 80 #include "talk/app/webrtc/statstypes.h" |
80 #include "talk/app/webrtc/umametrics.h" | 81 #include "talk/app/webrtc/umametrics.h" |
81 #include "webrtc/base/fileutils.h" | 82 #include "webrtc/base/fileutils.h" |
82 #include "webrtc/base/network.h" | 83 #include "webrtc/base/network.h" |
83 #include "webrtc/base/sslstreamadapter.h" | 84 #include "webrtc/base/sslstreamadapter.h" |
84 #include "webrtc/base/socketaddress.h" | 85 #include "webrtc/base/socketaddress.h" |
(...skipping 464 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
549 | 550 |
550 // This method takes the ownership of |dtls_identity_service|. | 551 // This method takes the ownership of |dtls_identity_service|. |
551 virtual rtc::scoped_refptr<PeerConnectionInterface> | 552 virtual rtc::scoped_refptr<PeerConnectionInterface> |
552 CreatePeerConnection( | 553 CreatePeerConnection( |
553 const PeerConnectionInterface::RTCConfiguration& configuration, | 554 const PeerConnectionInterface::RTCConfiguration& configuration, |
554 const MediaConstraintsInterface* constraints, | 555 const MediaConstraintsInterface* constraints, |
555 PortAllocatorFactoryInterface* allocator_factory, | 556 PortAllocatorFactoryInterface* allocator_factory, |
556 DTLSIdentityServiceInterface* dtls_identity_service, | 557 DTLSIdentityServiceInterface* dtls_identity_service, |
557 PeerConnectionObserver* observer) = 0; | 558 PeerConnectionObserver* observer) = 0; |
558 | 559 |
| 560 virtual rtc::scoped_refptr<PeerConnectionInterface> |
| 561 CreatePeerConnection( |
| 562 const PeerConnectionInterface::RTCConfiguration& configuration, |
| 563 const MediaConstraintsInterface* constraints, |
| 564 PortAllocatorFactoryInterface* allocator_factory, |
| 565 rtc::scoped_refptr<DtlsCertificate> certificate, |
| 566 PeerConnectionObserver* observer) = 0; |
| 567 |
559 // TODO(mallinath) : Remove below versions after clients are updated | 568 // TODO(mallinath) : Remove below versions after clients are updated |
560 // to above method. | 569 // to above method. |
561 // In latest W3C WebRTC draft, PC constructor will take RTCConfiguration, | 570 // In latest W3C WebRTC draft, PC constructor will take RTCConfiguration, |
562 // and not IceServers. RTCConfiguration is made up of ice servers and | 571 // and not IceServers. RTCConfiguration is made up of ice servers and |
563 // ice transport type. | 572 // ice transport type. |
564 // http://dev.w3.org/2011/webrtc/editor/webrtc.html | 573 // http://dev.w3.org/2011/webrtc/editor/webrtc.html |
565 inline rtc::scoped_refptr<PeerConnectionInterface> | 574 inline rtc::scoped_refptr<PeerConnectionInterface> |
566 CreatePeerConnection( | 575 CreatePeerConnection( |
567 const PeerConnectionInterface::IceServers& servers, | 576 const PeerConnectionInterface::IceServers& servers, |
568 const MediaConstraintsInterface* constraints, | 577 const MediaConstraintsInterface* constraints, |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
626 CreatePeerConnectionFactory( | 635 CreatePeerConnectionFactory( |
627 rtc::Thread* worker_thread, | 636 rtc::Thread* worker_thread, |
628 rtc::Thread* signaling_thread, | 637 rtc::Thread* signaling_thread, |
629 AudioDeviceModule* default_adm, | 638 AudioDeviceModule* default_adm, |
630 cricket::WebRtcVideoEncoderFactory* encoder_factory, | 639 cricket::WebRtcVideoEncoderFactory* encoder_factory, |
631 cricket::WebRtcVideoDecoderFactory* decoder_factory); | 640 cricket::WebRtcVideoDecoderFactory* decoder_factory); |
632 | 641 |
633 } // namespace webrtc | 642 } // namespace webrtc |
634 | 643 |
635 #endif // TALK_APP_WEBRTC_PEERCONNECTIONINTERFACE_H_ | 644 #endif // TALK_APP_WEBRTC_PEERCONNECTIONINTERFACE_H_ |
OLD | NEW |