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 706 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
717 if (!dtls_enabled_) { | 717 if (!dtls_enabled_) { |
718 // Construct with DTLS disabled. | 718 // Construct with DTLS disabled. |
719 webrtc_session_desc_factory_.reset(new WebRtcSessionDescriptionFactory( | 719 webrtc_session_desc_factory_.reset(new WebRtcSessionDescriptionFactory( |
720 signaling_thread(), channel_manager_, this, id())); | 720 signaling_thread(), channel_manager_, this, id())); |
721 } else { | 721 } else { |
722 // Construct with DTLS enabled. | 722 // Construct with DTLS enabled. |
723 if (!certificate) { | 723 if (!certificate) { |
724 // Use the |dtls_identity_store| to generate a certificate. | 724 // Use the |dtls_identity_store| to generate a certificate. |
725 RTC_DCHECK(dtls_identity_store); | 725 RTC_DCHECK(dtls_identity_store); |
726 webrtc_session_desc_factory_.reset(new WebRtcSessionDescriptionFactory( | 726 webrtc_session_desc_factory_.reset(new WebRtcSessionDescriptionFactory( |
727 signaling_thread(), channel_manager_, dtls_identity_store.Pass(), | 727 signaling_thread(), channel_manager_, std::move(dtls_identity_store), |
728 this, id())); | 728 this, id())); |
729 } else { | 729 } else { |
730 // Use the already generated certificate. | 730 // Use the already generated certificate. |
731 webrtc_session_desc_factory_.reset(new WebRtcSessionDescriptionFactory( | 731 webrtc_session_desc_factory_.reset(new WebRtcSessionDescriptionFactory( |
732 signaling_thread(), channel_manager_, certificate, this, id())); | 732 signaling_thread(), channel_manager_, certificate, this, id())); |
733 } | 733 } |
734 } | 734 } |
735 | 735 |
736 webrtc_session_desc_factory_->SignalCertificateReady.connect( | 736 webrtc_session_desc_factory_->SignalCertificateReady.connect( |
737 this, &WebRtcSession::OnCertificateReady); | 737 this, &WebRtcSession::OnCertificateReady); |
(...skipping 1458 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2196 } | 2196 } |
2197 } | 2197 } |
2198 | 2198 |
2199 void WebRtcSession::OnSentPacket_w(cricket::TransportChannel* channel, | 2199 void WebRtcSession::OnSentPacket_w(cricket::TransportChannel* channel, |
2200 const rtc::SentPacket& sent_packet) { | 2200 const rtc::SentPacket& sent_packet) { |
2201 RTC_DCHECK(worker_thread()->IsCurrent()); | 2201 RTC_DCHECK(worker_thread()->IsCurrent()); |
2202 media_controller_->call_w()->OnSentPacket(sent_packet); | 2202 media_controller_->call_w()->OnSentPacket(sent_packet); |
2203 } | 2203 } |
2204 | 2204 |
2205 } // namespace webrtc | 2205 } // namespace webrtc |
OLD | NEW |