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

Side by Side Diff: webrtc/api/webrtcsdp.cc

Issue 2254003002: Fixing off-by-one error with max SCTP id. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Removing unneeded parentheses. Created 4 years, 4 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
OLDNEW
1 /* 1 /*
2 * Copyright 2011 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2011 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 1373 matching lines...) Expand 10 before | Expand all | Expand 10 after
1384 1384
1385 void BuildSctpContentAttributes(std::string* message, int sctp_port) { 1385 void BuildSctpContentAttributes(std::string* message, int sctp_port) {
1386 // draft-ietf-mmusic-sctp-sdp-04 1386 // draft-ietf-mmusic-sctp-sdp-04
1387 // a=sctpmap:sctpmap-number protocol [streams] 1387 // a=sctpmap:sctpmap-number protocol [streams]
1388 // TODO(lally): switch this over to mmusic-sctp-sdp-12 (or later), with 1388 // TODO(lally): switch this over to mmusic-sctp-sdp-12 (or later), with
1389 // 'a=sctp-port:' 1389 // 'a=sctp-port:'
1390 std::ostringstream os; 1390 std::ostringstream os;
1391 InitAttrLine(kAttributeSctpmap, &os); 1391 InitAttrLine(kAttributeSctpmap, &os);
1392 os << kSdpDelimiterColon << sctp_port << kSdpDelimiterSpace 1392 os << kSdpDelimiterColon << sctp_port << kSdpDelimiterSpace
1393 << kDefaultSctpmapProtocol << kSdpDelimiterSpace 1393 << kDefaultSctpmapProtocol << kSdpDelimiterSpace
1394 << (cricket::kMaxSctpSid + 1); 1394 << cricket::kMaxSctpStreams;
1395 AddLine(os.str(), message); 1395 AddLine(os.str(), message);
1396 } 1396 }
1397 1397
1398 // If unified_plan_sdp is true, will use "a=msid". 1398 // If unified_plan_sdp is true, will use "a=msid".
1399 void BuildRtpContentAttributes(const MediaContentDescription* media_desc, 1399 void BuildRtpContentAttributes(const MediaContentDescription* media_desc,
1400 const MediaType media_type, 1400 const MediaType media_type,
1401 bool unified_plan_sdp, 1401 bool unified_plan_sdp,
1402 std::string* message) { 1402 std::string* message) {
1403 std::ostringstream os; 1403 std::ostringstream os;
1404 // RFC 5285 1404 // RFC 5285
(...skipping 1772 matching lines...) Expand 10 before | Expand all | Expand 10 after
3177 UpdateCodec<AudioContentDescription, cricket::AudioCodec>( 3177 UpdateCodec<AudioContentDescription, cricket::AudioCodec>(
3178 media_desc, payload_type, feedback_param); 3178 media_desc, payload_type, feedback_param);
3179 } else if (media_type == cricket::MEDIA_TYPE_VIDEO) { 3179 } else if (media_type == cricket::MEDIA_TYPE_VIDEO) {
3180 UpdateCodec<VideoContentDescription, cricket::VideoCodec>( 3180 UpdateCodec<VideoContentDescription, cricket::VideoCodec>(
3181 media_desc, payload_type, feedback_param); 3181 media_desc, payload_type, feedback_param);
3182 } 3182 }
3183 return true; 3183 return true;
3184 } 3184 }
3185 3185
3186 } // namespace webrtc 3186 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698