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

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

Issue 2614813003: Revert of Separating SCTP code from BaseChannel/MediaChannel. (Closed)
Patch Set: Also reverting https://codereview.webrtc.org/2612963002 Created 3 years, 11 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/api/test/mock_webrtcsession.h ('k') | webrtc/api/webrtcsession.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 * 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 15 matching lines...) Expand all
26 #include "webrtc/base/common.h" 26 #include "webrtc/base/common.h"
27 #include "webrtc/base/logging.h" 27 #include "webrtc/base/logging.h"
28 #include "webrtc/base/messagedigest.h" 28 #include "webrtc/base/messagedigest.h"
29 #include "webrtc/base/stringutils.h" 29 #include "webrtc/base/stringutils.h"
30 // for RtpExtension 30 // for RtpExtension
31 #include "webrtc/config.h" 31 #include "webrtc/config.h"
32 #include "webrtc/media/base/codec.h" 32 #include "webrtc/media/base/codec.h"
33 #include "webrtc/media/base/cryptoparams.h" 33 #include "webrtc/media/base/cryptoparams.h"
34 #include "webrtc/media/base/mediaconstants.h" 34 #include "webrtc/media/base/mediaconstants.h"
35 #include "webrtc/media/base/rtputils.h" 35 #include "webrtc/media/base/rtputils.h"
36 #include "webrtc/media/sctp/sctptransportinternal.h" 36 #include "webrtc/media/sctp/sctpdataengine.h"
37 #include "webrtc/p2p/base/candidate.h" 37 #include "webrtc/p2p/base/candidate.h"
38 #include "webrtc/p2p/base/p2pconstants.h" 38 #include "webrtc/p2p/base/p2pconstants.h"
39 #include "webrtc/p2p/base/port.h" 39 #include "webrtc/p2p/base/port.h"
40 #include "webrtc/pc/mediasession.h" 40 #include "webrtc/pc/mediasession.h"
41 41
42 using cricket::AudioContentDescription; 42 using cricket::AudioContentDescription;
43 using cricket::Candidate; 43 using cricket::Candidate;
44 using cricket::Candidates; 44 using cricket::Candidates;
45 using cricket::ContentDescription; 45 using cricket::ContentDescription;
46 using cricket::ContentInfo; 46 using cricket::ContentInfo;
(...skipping 3177 matching lines...) Expand 10 before | Expand all | Expand 10 after
3224 UpdateCodec<AudioContentDescription, cricket::AudioCodec>( 3224 UpdateCodec<AudioContentDescription, cricket::AudioCodec>(
3225 media_desc, payload_type, feedback_param); 3225 media_desc, payload_type, feedback_param);
3226 } else if (media_type == cricket::MEDIA_TYPE_VIDEO) { 3226 } else if (media_type == cricket::MEDIA_TYPE_VIDEO) {
3227 UpdateCodec<VideoContentDescription, cricket::VideoCodec>( 3227 UpdateCodec<VideoContentDescription, cricket::VideoCodec>(
3228 media_desc, payload_type, feedback_param); 3228 media_desc, payload_type, feedback_param);
3229 } 3229 }
3230 return true; 3230 return true;
3231 } 3231 }
3232 3232
3233 } // namespace webrtc 3233 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/api/test/mock_webrtcsession.h ('k') | webrtc/api/webrtcsession.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698