Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(396)

Side by Side Diff: talk/app/webrtc/webrtcsessiondescriptionfactory.cc

Issue 1353713002: Remove GICE (again). (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Undo .gclient Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « talk/app/webrtc/webrtcsession_unittest.cc ('k') | talk/session/media/mediasession.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2013 Google Inc. 3 * Copyright 2013 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 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 // as the session id and session version. To simplify, it should be fine 146 // as the session id and session version. To simplify, it should be fine
147 // to just use a random number as session id and start version from 147 // to just use a random number as session id and start version from
148 // |kInitSessionVersion|. 148 // |kInitSessionVersion|.
149 session_version_(kInitSessionVersion), 149 session_version_(kInitSessionVersion),
150 dtls_identity_store_(dtls_identity_store.Pass()), 150 dtls_identity_store_(dtls_identity_store.Pass()),
151 identity_request_observer_(identity_request_observer), 151 identity_request_observer_(identity_request_observer),
152 session_(session), 152 session_(session),
153 session_id_(session_id), 153 session_id_(session_id),
154 data_channel_type_(dct), 154 data_channel_type_(dct),
155 certificate_request_state_(CERTIFICATE_NOT_NEEDED) { 155 certificate_request_state_(CERTIFICATE_NOT_NEEDED) {
156 transport_desc_factory_.set_protocol(cricket::ICEPROTO_RFC5245);
157 session_desc_factory_.set_add_legacy_streams(false); 156 session_desc_factory_.set_add_legacy_streams(false);
158 // SRTP-SDES is disabled if DTLS is on. 157 // SRTP-SDES is disabled if DTLS is on.
159 SetSdesPolicy(dtls_enabled ? cricket::SEC_DISABLED : cricket::SEC_REQUIRED); 158 SetSdesPolicy(dtls_enabled ? cricket::SEC_DISABLED : cricket::SEC_REQUIRED);
160 } 159 }
161 160
162 WebRtcSessionDescriptionFactory::WebRtcSessionDescriptionFactory( 161 WebRtcSessionDescriptionFactory::WebRtcSessionDescriptionFactory(
163 rtc::Thread* signaling_thread, 162 rtc::Thread* signaling_thread,
164 cricket::ChannelManager* channel_manager, 163 cricket::ChannelManager* channel_manager,
165 MediaStreamSignaling* mediastream_signaling, 164 MediaStreamSignaling* mediastream_signaling,
166 WebRtcSession* session, 165 WebRtcSession* session,
(...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after
530 if (create_session_description_requests_.front().type == 529 if (create_session_description_requests_.front().type ==
531 CreateSessionDescriptionRequest::kOffer) { 530 CreateSessionDescriptionRequest::kOffer) {
532 InternalCreateOffer(create_session_description_requests_.front()); 531 InternalCreateOffer(create_session_description_requests_.front());
533 } else { 532 } else {
534 InternalCreateAnswer(create_session_description_requests_.front()); 533 InternalCreateAnswer(create_session_description_requests_.front());
535 } 534 }
536 create_session_description_requests_.pop(); 535 create_session_description_requests_.pop();
537 } 536 }
538 } 537 }
539 } // namespace webrtc 538 } // namespace webrtc
OLDNEW
« no previous file with comments | « talk/app/webrtc/webrtcsession_unittest.cc ('k') | talk/session/media/mediasession.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698