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

Side by Side Diff: webrtc/media/sctp/sctpdataengine.cc

Issue 1845673002: Removing `preference` field from `cricket::Codec`. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fixing sort order (got reversed when optimizations were made) Created 4 years, 8 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 | « webrtc/media/engine/webrtcvoiceengine_unittest.cc ('k') | webrtc/pc/channel_unittest.cc » ('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 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 // Set the number of default outgoing streams. This is the number we'll 276 // Set the number of default outgoing streams. This is the number we'll
277 // send in the SCTP INIT message. The 'appropriate default' in the 277 // send in the SCTP INIT message. The 'appropriate default' in the
278 // second paragraph of 278 // second paragraph of
279 // http://tools.ietf.org/html/draft-ietf-rtcweb-data-channel-05#section-6.2 279 // http://tools.ietf.org/html/draft-ietf-rtcweb-data-channel-05#section-6.2
280 // is cricket::kMaxSctpSid. 280 // is cricket::kMaxSctpSid.
281 usrsctp_sysctl_set_sctp_nr_outgoing_streams_default( 281 usrsctp_sysctl_set_sctp_nr_outgoing_streams_default(
282 cricket::kMaxSctpSid); 282 cricket::kMaxSctpSid);
283 } 283 }
284 usrsctp_engines_count++; 284 usrsctp_engines_count++;
285 285
286 cricket::DataCodec codec(kGoogleSctpDataCodecId, kGoogleSctpDataCodecName, 0); 286 cricket::DataCodec codec(kGoogleSctpDataCodecId, kGoogleSctpDataCodecName);
287 codec.SetParam(kCodecParamPort, kSctpDefaultPort); 287 codec.SetParam(kCodecParamPort, kSctpDefaultPort);
288 codecs_.push_back(codec); 288 codecs_.push_back(codec);
289 } 289 }
290 290
291 SctpDataEngine::~SctpDataEngine() { 291 SctpDataEngine::~SctpDataEngine() {
292 usrsctp_engines_count--; 292 usrsctp_engines_count--;
293 LOG(LS_VERBOSE) << "usrsctp_engines_count:" << usrsctp_engines_count; 293 LOG(LS_VERBOSE) << "usrsctp_engines_count:" << usrsctp_engines_count;
294 294
295 if (usrsctp_engines_count == 0) { 295 if (usrsctp_engines_count == 0) {
296 // usrsctp_finish() may fail if it's called too soon after the channels are 296 // usrsctp_finish() may fail if it's called too soon after the channels are
(...skipping 736 matching lines...) Expand 10 before | Expand all | Expand 10 after
1033 } 1033 }
1034 case MSG_SCTPOUTBOUNDPACKET: { 1034 case MSG_SCTPOUTBOUNDPACKET: {
1035 std::unique_ptr<OutboundPacketMessage> pdata( 1035 std::unique_ptr<OutboundPacketMessage> pdata(
1036 static_cast<OutboundPacketMessage*>(msg->pdata)); 1036 static_cast<OutboundPacketMessage*>(msg->pdata));
1037 OnPacketFromSctpToNetwork(pdata->data().get()); 1037 OnPacketFromSctpToNetwork(pdata->data().get());
1038 break; 1038 break;
1039 } 1039 }
1040 } 1040 }
1041 } 1041 }
1042 } // namespace cricket 1042 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/media/engine/webrtcvoiceengine_unittest.cc ('k') | webrtc/pc/channel_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698