| 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 240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 251 void OnDtlsSetupFailure(cricket::BaseChannel*, bool rtcp); | 251 void OnDtlsSetupFailure(cricket::BaseChannel*, bool rtcp); |
| 252 | 252 |
| 253 // For unit test. | 253 // For unit test. |
| 254 bool waiting_for_identity() const; | 254 bool waiting_for_identity() const; |
| 255 | 255 |
| 256 void set_metrics_observer( | 256 void set_metrics_observer( |
| 257 webrtc::MetricsObserverInterface* metrics_observer) { | 257 webrtc::MetricsObserverInterface* metrics_observer) { |
| 258 metrics_observer_ = metrics_observer; | 258 metrics_observer_ = metrics_observer; |
| 259 } | 259 } |
| 260 | 260 |
| 261 protected: | |
| 262 // Don't fire a new description. The only thing it's used for is to | |
| 263 // push new media descriptions to the BaseChannels. But in | |
| 264 // WebRtcSession, we just push to the BaseChannels directly, so we | |
| 265 // don't need this (and it would cause the descriptions to be pushed | |
| 266 // down twice). | |
| 267 // TODO(pthatcher): Remove this method and signal completely from | |
| 268 // BaseSession once all the subclasses of BaseSession push to | |
| 269 // BaseChannels directly rather than relying on the signal, or once | |
| 270 // BaseChannel no longer listens to the event and requires | |
| 271 // descriptions to be pushed down. | |
| 272 virtual void SignalNewDescription() override {} | |
| 273 | |
| 274 private: | 261 private: |
| 275 // Indicates the type of SessionDescription in a call to SetLocalDescription | 262 // Indicates the type of SessionDescription in a call to SetLocalDescription |
| 276 // and SetRemoteDescription. | 263 // and SetRemoteDescription. |
| 277 enum Action { | 264 enum Action { |
| 278 kOffer, | 265 kOffer, |
| 279 kPrAnswer, | 266 kPrAnswer, |
| 280 kAnswer, | 267 kAnswer, |
| 281 }; | 268 }; |
| 282 | 269 |
| 283 // Invokes ConnectChannels() on transport proxies, which initiates ice | 270 // Invokes ConnectChannels() on transport proxies, which initiates ice |
| (...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 422 PeerConnectionInterface::BundlePolicy bundle_policy_; | 409 PeerConnectionInterface::BundlePolicy bundle_policy_; |
| 423 | 410 |
| 424 // Declares the RTCP mux policy for the WebRTCSession. | 411 // Declares the RTCP mux policy for the WebRTCSession. |
| 425 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_; | 412 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_; |
| 426 | 413 |
| 427 DISALLOW_COPY_AND_ASSIGN(WebRtcSession); | 414 DISALLOW_COPY_AND_ASSIGN(WebRtcSession); |
| 428 }; | 415 }; |
| 429 } // namespace webrtc | 416 } // namespace webrtc |
| 430 | 417 |
| 431 #endif // TALK_APP_WEBRTC_WEBRTCSESSION_H_ | 418 #endif // TALK_APP_WEBRTC_WEBRTCSESSION_H_ |
| OLD | NEW |