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 493 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
504 // 3. If both 1&2 are false, data channel is not allowed (DCT_NONE). | 504 // 3. If both 1&2 are false, data channel is not allowed (DCT_NONE). |
505 cricket::DataChannelType data_channel_type_; | 505 cricket::DataChannelType data_channel_type_; |
506 rtc::scoped_ptr<IceRestartAnswerLatch> ice_restart_latch_; | 506 rtc::scoped_ptr<IceRestartAnswerLatch> ice_restart_latch_; |
507 | 507 |
508 rtc::scoped_ptr<WebRtcSessionDescriptionFactory> | 508 rtc::scoped_ptr<WebRtcSessionDescriptionFactory> |
509 webrtc_session_desc_factory_; | 509 webrtc_session_desc_factory_; |
510 | 510 |
511 // Member variables for caching global options. | 511 // Member variables for caching global options. |
512 cricket::AudioOptions audio_options_; | 512 cricket::AudioOptions audio_options_; |
513 cricket::VideoOptions video_options_; | 513 cricket::VideoOptions video_options_; |
| 514 cricket::MediaChannelOptions channel_options_; |
514 MetricsObserverInterface* metrics_observer_; | 515 MetricsObserverInterface* metrics_observer_; |
515 | 516 |
516 // Declares the bundle policy for the WebRTCSession. | 517 // Declares the bundle policy for the WebRTCSession. |
517 PeerConnectionInterface::BundlePolicy bundle_policy_; | 518 PeerConnectionInterface::BundlePolicy bundle_policy_; |
518 | 519 |
519 // Declares the RTCP mux policy for the WebRTCSession. | 520 // Declares the RTCP mux policy for the WebRTCSession. |
520 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_; | 521 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_; |
521 | 522 |
522 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession); | 523 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession); |
523 }; | 524 }; |
524 } // namespace webrtc | 525 } // namespace webrtc |
525 | 526 |
526 #endif // TALK_APP_WEBRTC_WEBRTCSESSION_H_ | 527 #endif // TALK_APP_WEBRTC_WEBRTCSESSION_H_ |
OLD | NEW |