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 586 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
597 bool WebRtcSession::Initialize( | 597 bool WebRtcSession::Initialize( |
598 const PeerConnectionFactoryInterface::Options& options, | 598 const PeerConnectionFactoryInterface::Options& options, |
599 const MediaConstraintsInterface* constraints, | 599 const MediaConstraintsInterface* constraints, |
600 rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store, | 600 rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store, |
601 const PeerConnectionInterface::RTCConfiguration& rtc_configuration) { | 601 const PeerConnectionInterface::RTCConfiguration& rtc_configuration) { |
602 bundle_policy_ = rtc_configuration.bundle_policy; | 602 bundle_policy_ = rtc_configuration.bundle_policy; |
603 rtcp_mux_policy_ = rtc_configuration.rtcp_mux_policy; | 603 rtcp_mux_policy_ = rtc_configuration.rtcp_mux_policy; |
604 video_options_.disable_prerenderer_smoothing = | 604 video_options_.disable_prerenderer_smoothing = |
605 rtc::Optional<bool>(rtc_configuration.disable_prerenderer_smoothing); | 605 rtc::Optional<bool>(rtc_configuration.disable_prerenderer_smoothing); |
606 transport_controller_->SetSslMaxProtocolVersion(options.ssl_max_version); | 606 transport_controller_->SetSslMaxProtocolVersion(options.ssl_max_version); |
| 607 transport_controller_->SetEnableGcmCiphers(options.enable_gcm_ciphers); |
607 | 608 |
608 // Obtain a certificate from RTCConfiguration if any were provided (optional). | 609 // Obtain a certificate from RTCConfiguration if any were provided (optional). |
609 rtc::scoped_refptr<rtc::RTCCertificate> certificate; | 610 rtc::scoped_refptr<rtc::RTCCertificate> certificate; |
610 if (!rtc_configuration.certificates.empty()) { | 611 if (!rtc_configuration.certificates.empty()) { |
611 // TODO(hbos,torbjorng): Decide on certificate-selection strategy instead of | 612 // TODO(hbos,torbjorng): Decide on certificate-selection strategy instead of |
612 // just picking the first one. The decision should be made based on the DTLS | 613 // just picking the first one. The decision should be made based on the DTLS |
613 // handshake. The DTLS negotiations need to know about all certificates. | 614 // handshake. The DTLS negotiations need to know about all certificates. |
614 certificate = rtc_configuration.certificates[0]; | 615 certificate = rtc_configuration.certificates[0]; |
615 } | 616 } |
616 | 617 |
(...skipping 1579 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2196 } | 2197 } |
2197 } | 2198 } |
2198 | 2199 |
2199 void WebRtcSession::OnSentPacket_w(cricket::TransportChannel* channel, | 2200 void WebRtcSession::OnSentPacket_w(cricket::TransportChannel* channel, |
2200 const rtc::SentPacket& sent_packet) { | 2201 const rtc::SentPacket& sent_packet) { |
2201 RTC_DCHECK(worker_thread()->IsCurrent()); | 2202 RTC_DCHECK(worker_thread()->IsCurrent()); |
2202 media_controller_->call_w()->OnSentPacket(sent_packet); | 2203 media_controller_->call_w()->OnSentPacket(sent_packet); |
2203 } | 2204 } |
2204 | 2205 |
2205 } // namespace webrtc | 2206 } // namespace webrtc |
OLD | NEW |