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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
46 | 46 |
47 typedef std::vector<PortAllocatorFactoryInterface::StunConfiguration> | 47 typedef std::vector<PortAllocatorFactoryInterface::StunConfiguration> |
48 StunConfigurations; | 48 StunConfigurations; |
49 typedef std::vector<PortAllocatorFactoryInterface::TurnConfiguration> | 49 typedef std::vector<PortAllocatorFactoryInterface::TurnConfiguration> |
50 TurnConfigurations; | 50 TurnConfigurations; |
51 | 51 |
52 // Populates |session_options| from |rtc_options|, and returns true if options | 52 // Populates |session_options| from |rtc_options|, and returns true if options |
53 // are valid. | 53 // are valid. |
54 // Send streams should already be added to |session_options| before this method | 54 // Send streams should already be added to |session_options| before this method |
55 // is called, as this affects the values of recv_audio and recv_video. | 55 // is called, as this affects the values of recv_audio and recv_video. |
56 // |currently_receiving_audio| and |currently_receiving_video| are used to | |
57 // determine recv_audio and recv_video if the "offer_to_receive_#####" options | |
58 // are undefined. | |
56 bool ConvertRtcOptionsForOffer( | 59 bool ConvertRtcOptionsForOffer( |
57 const PeerConnectionInterface::RTCOfferAnswerOptions& rtc_options, | 60 const PeerConnectionInterface::RTCOfferAnswerOptions& rtc_options, |
58 cricket::MediaSessionOptions* session_options); | 61 cricket::MediaSessionOptions* session_options, |
62 bool currently_receiving_audio, | |
63 bool currently_receiving_video); | |
pthatcher1
2015/10/15 06:02:03
A few thoughts:
1. The out pointer should still
Taylor Brandstetter
2015/10/15 18:23:36
Actually, I decided on a different approach that k
| |
59 | 64 |
60 // Populates |session_options| from |constraints|, and returns true if all | 65 // Populates |session_options| from |constraints|, and returns true if all |
61 // mandatory constraints are satisfied. | 66 // mandatory constraints are satisfied. |
62 bool ParseConstraintsForAnswer(const MediaConstraintsInterface* constraints, | 67 bool ParseConstraintsForAnswer(const MediaConstraintsInterface* constraints, |
63 cricket::MediaSessionOptions* session_options); | 68 cricket::MediaSessionOptions* session_options); |
64 | 69 |
65 // Parses the URLs for each server in |servers| to build |stun_config| and | 70 // Parses the URLs for each server in |servers| to build |stun_config| and |
66 // |turn_config|. | 71 // |turn_config|. |
67 bool ParseIceServers(const PeerConnectionInterface::IceServers& servers, | 72 bool ParseIceServers(const PeerConnectionInterface::IceServers& servers, |
68 StunConfigurations* stun_config, | 73 StunConfigurations* stun_config, |
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
389 // because its destruction fires signals (such as VoiceChannelDestroyed) | 394 // because its destruction fires signals (such as VoiceChannelDestroyed) |
390 // which will trigger some final actions in PeerConnection... | 395 // which will trigger some final actions in PeerConnection... |
391 rtc::scoped_ptr<WebRtcSession> session_; | 396 rtc::scoped_ptr<WebRtcSession> session_; |
392 // ... But stats_ depends on session_ so it should be destroyed even earlier. | 397 // ... But stats_ depends on session_ so it should be destroyed even earlier. |
393 rtc::scoped_ptr<StatsCollector> stats_; | 398 rtc::scoped_ptr<StatsCollector> stats_; |
394 }; | 399 }; |
395 | 400 |
396 } // namespace webrtc | 401 } // namespace webrtc |
397 | 402 |
398 #endif // TALK_APP_WEBRTC_PEERCONNECTION_H_ | 403 #endif // TALK_APP_WEBRTC_PEERCONNECTION_H_ |
OLD | NEW |