OLD | NEW |
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 16 matching lines...) Expand all Loading... |
27 | 27 |
28 class MediaStreamObserver; | 28 class MediaStreamObserver; |
29 class RemoteMediaStreamFactory; | 29 class RemoteMediaStreamFactory; |
30 | 30 |
31 // Populates |session_options| from |rtc_options|, and returns true if options | 31 // Populates |session_options| from |rtc_options|, and returns true if options |
32 // are valid. | 32 // are valid. |
33 // |session_options|->transport_options map entries must exist in order for | 33 // |session_options|->transport_options map entries must exist in order for |
34 // them to be populated from |rtc_options|. | 34 // them to be populated from |rtc_options|. |
35 bool ExtractMediaSessionOptions( | 35 bool ExtractMediaSessionOptions( |
36 const PeerConnectionInterface::RTCOfferAnswerOptions& rtc_options, | 36 const PeerConnectionInterface::RTCOfferAnswerOptions& rtc_options, |
| 37 bool is_offer, |
37 cricket::MediaSessionOptions* session_options); | 38 cricket::MediaSessionOptions* session_options); |
38 | 39 |
39 // Populates |session_options| from |constraints|, and returns true if all | 40 // Populates |session_options| from |constraints|, and returns true if all |
40 // mandatory constraints are satisfied. | 41 // mandatory constraints are satisfied. |
41 // Assumes that |session_options|->transport_options map entries exist. | 42 // Assumes that |session_options|->transport_options map entries exist. |
42 // Will also set defaults if corresponding constraints are not present: | 43 // Will also set defaults if corresponding constraints are not present: |
43 // recv_audio=true, recv_video=true, bundle_enabled=true. | 44 // recv_audio=true, recv_video=true, bundle_enabled=true. |
44 // Other fields will be left with existing values. | 45 // Other fields will be left with existing values. |
45 // | 46 // |
46 // Deprecated. Will be removed once callers that use constraints are gone. | 47 // Deprecated. Will be removed once callers that use constraints are gone. |
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
396 // because its destruction fires signals (such as VoiceChannelDestroyed) | 397 // because its destruction fires signals (such as VoiceChannelDestroyed) |
397 // which will trigger some final actions in PeerConnection... | 398 // which will trigger some final actions in PeerConnection... |
398 rtc::scoped_ptr<WebRtcSession> session_; | 399 rtc::scoped_ptr<WebRtcSession> session_; |
399 // ... But stats_ depends on session_ so it should be destroyed even earlier. | 400 // ... But stats_ depends on session_ so it should be destroyed even earlier. |
400 rtc::scoped_ptr<StatsCollector> stats_; | 401 rtc::scoped_ptr<StatsCollector> stats_; |
401 }; | 402 }; |
402 | 403 |
403 } // namespace webrtc | 404 } // namespace webrtc |
404 | 405 |
405 #endif // WEBRTC_API_PEERCONNECTION_H_ | 406 #endif // WEBRTC_API_PEERCONNECTION_H_ |
OLD | NEW |