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

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

Issue 2675173003: Adding "adapter" ORTC objects on top of ChannelManager/BaseChannel/etc. (Closed)
Patch Set: Add memcheck suppression for end-to-end tests. Created 3 years, 9 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/pc/rtpsenderreceiver_unittest.cc ('k') | no next file » | 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 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 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 // draft-ietf-mmusic-trickle-ice-01 197 // draft-ietf-mmusic-trickle-ice-01
198 // When no candidates have been gathered, set the connection 198 // When no candidates have been gathered, set the connection
199 // address to IP6 ::. 199 // address to IP6 ::.
200 // TODO(perkj): FF can not parse IP6 ::. See http://crbug/430333 200 // TODO(perkj): FF can not parse IP6 ::. See http://crbug/430333
201 // Use IPV4 per default. 201 // Use IPV4 per default.
202 static const char kDummyAddress[] = "0.0.0.0"; 202 static const char kDummyAddress[] = "0.0.0.0";
203 static const char kDummyPort[] = "9"; 203 static const char kDummyPort[] = "9";
204 // RFC 3556 204 // RFC 3556
205 static const char kApplicationSpecificMaximum[] = "AS"; 205 static const char kApplicationSpecificMaximum[] = "AS";
206 206
207 static const int kDefaultVideoClockrate = 90000;
208
209 static const char kDefaultSctpmapProtocol[] = "webrtc-datachannel"; 207 static const char kDefaultSctpmapProtocol[] = "webrtc-datachannel";
210 208
211 // RTP payload type is in the 0-127 range. Use -1 to indicate "all" payload 209 // RTP payload type is in the 0-127 range. Use -1 to indicate "all" payload
212 // types. 210 // types.
213 const int kWildcardPayloadType = -1; 211 const int kWildcardPayloadType = -1;
214 212
215 struct SsrcInfo { 213 struct SsrcInfo {
216 uint32_t ssrc_id; 214 uint32_t ssrc_id;
217 std::string cname; 215 std::string cname;
218 std::string stream_id; 216 std::string stream_id;
(...skipping 1511 matching lines...) Expand 10 before | Expand all | Expand 10 after
1730 const VideoContentDescription* video_desc = 1728 const VideoContentDescription* video_desc =
1731 static_cast<const VideoContentDescription*>(media_desc); 1729 static_cast<const VideoContentDescription*>(media_desc);
1732 for (std::vector<cricket::VideoCodec>::const_iterator it = 1730 for (std::vector<cricket::VideoCodec>::const_iterator it =
1733 video_desc->codecs().begin(); 1731 video_desc->codecs().begin();
1734 it != video_desc->codecs().end(); ++it) { 1732 it != video_desc->codecs().end(); ++it) {
1735 // RFC 4566 1733 // RFC 4566
1736 // a=rtpmap:<payload type> <encoding name>/<clock rate> 1734 // a=rtpmap:<payload type> <encoding name>/<clock rate>
1737 // [/<encodingparameters>] 1735 // [/<encodingparameters>]
1738 if (it->id != kWildcardPayloadType) { 1736 if (it->id != kWildcardPayloadType) {
1739 InitAttrLine(kAttributeRtpmap, &os); 1737 InitAttrLine(kAttributeRtpmap, &os);
1740 os << kSdpDelimiterColon << it->id << " " << it->name 1738 os << kSdpDelimiterColon << it->id << " " << it->name << "/"
1741 << "/" << kDefaultVideoClockrate; 1739 << cricket::kVideoCodecClockrate;
1742 AddLine(os.str(), message); 1740 AddLine(os.str(), message);
1743 } 1741 }
1744 AddRtcpFbLines(*it, message); 1742 AddRtcpFbLines(*it, message);
1745 AddFmtpLine(*it, message); 1743 AddFmtpLine(*it, message);
1746 } 1744 }
1747 } else if (media_type == cricket::MEDIA_TYPE_AUDIO) { 1745 } else if (media_type == cricket::MEDIA_TYPE_AUDIO) {
1748 const AudioContentDescription* audio_desc = 1746 const AudioContentDescription* audio_desc =
1749 static_cast<const AudioContentDescription*>(media_desc); 1747 static_cast<const AudioContentDescription*>(media_desc);
1750 std::vector<int> ptimes; 1748 std::vector<int> ptimes;
1751 std::vector<int> maxptimes; 1749 std::vector<int> maxptimes;
(...skipping 1484 matching lines...) Expand 10 before | Expand all | Expand 10 after
3236 UpdateCodec<AudioContentDescription, cricket::AudioCodec>( 3234 UpdateCodec<AudioContentDescription, cricket::AudioCodec>(
3237 media_desc, payload_type, feedback_param); 3235 media_desc, payload_type, feedback_param);
3238 } else if (media_type == cricket::MEDIA_TYPE_VIDEO) { 3236 } else if (media_type == cricket::MEDIA_TYPE_VIDEO) {
3239 UpdateCodec<VideoContentDescription, cricket::VideoCodec>( 3237 UpdateCodec<VideoContentDescription, cricket::VideoCodec>(
3240 media_desc, payload_type, feedback_param); 3238 media_desc, payload_type, feedback_param);
3241 } 3239 }
3242 return true; 3240 return true;
3243 } 3241 }
3244 3242
3245 } // namespace webrtc 3243 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/pc/rtpsenderreceiver_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698