| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2013 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 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 // |certificate|. | 90 // |certificate|. |
| 91 WebRtcSessionDescriptionFactory( | 91 WebRtcSessionDescriptionFactory( |
| 92 rtc::Thread* signaling_thread, | 92 rtc::Thread* signaling_thread, |
| 93 cricket::ChannelManager* channel_manager, | 93 cricket::ChannelManager* channel_manager, |
| 94 const rtc::scoped_refptr<rtc::RTCCertificate>& certificate, | 94 const rtc::scoped_refptr<rtc::RTCCertificate>& certificate, |
| 95 WebRtcSession* session, | 95 WebRtcSession* session, |
| 96 const std::string& session_id); | 96 const std::string& session_id); |
| 97 virtual ~WebRtcSessionDescriptionFactory(); | 97 virtual ~WebRtcSessionDescriptionFactory(); |
| 98 | 98 |
| 99 static void CopyCandidatesFromSessionDescription( | 99 static void CopyCandidatesFromSessionDescription( |
| 100 const SessionDescriptionInterface* source_desc, | 100 const SessionDescriptionInterface* source_desc, |
| 101 SessionDescriptionInterface* dest_desc); | 101 const std::string& content_name, |
| 102 SessionDescriptionInterface* dest_desc); |
| 102 | 103 |
| 103 void CreateOffer( | 104 void CreateOffer( |
| 104 CreateSessionDescriptionObserver* observer, | 105 CreateSessionDescriptionObserver* observer, |
| 105 const PeerConnectionInterface::RTCOfferAnswerOptions& options, | 106 const PeerConnectionInterface::RTCOfferAnswerOptions& options, |
| 106 const cricket::MediaSessionOptions& session_options); | 107 const cricket::MediaSessionOptions& session_options); |
| 107 void CreateAnswer(CreateSessionDescriptionObserver* observer, | 108 void CreateAnswer(CreateSessionDescriptionObserver* observer, |
| 108 const MediaConstraintsInterface* constraints, | 109 const MediaConstraintsInterface* constraints, |
| 109 const cricket::MediaSessionOptions& session_options); | 110 const cricket::MediaSessionOptions& session_options); |
| 110 | 111 |
| 111 void SetSdesPolicy(cricket::SecurePolicy secure_policy); | 112 void SetSdesPolicy(cricket::SecurePolicy secure_policy); |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 167 // TODO(jiayl): remove the dependency on session once bug 2264 is fixed. | 168 // TODO(jiayl): remove the dependency on session once bug 2264 is fixed. |
| 168 WebRtcSession* const session_; | 169 WebRtcSession* const session_; |
| 169 const std::string session_id_; | 170 const std::string session_id_; |
| 170 CertificateRequestState certificate_request_state_; | 171 CertificateRequestState certificate_request_state_; |
| 171 | 172 |
| 172 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSessionDescriptionFactory); | 173 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSessionDescriptionFactory); |
| 173 }; | 174 }; |
| 174 } // namespace webrtc | 175 } // namespace webrtc |
| 175 | 176 |
| 176 #endif // WEBRTC_API_WEBRTCSESSIONDESCRIPTIONFACTORY_H_ | 177 #endif // WEBRTC_API_WEBRTCSESSIONDESCRIPTIONFACTORY_H_ |
| OLD | NEW |