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

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

Issue 1691463002: Move talk/session/media -> webrtc/pc (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Last rebase Created 4 years, 10 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/videotrack_unittest.cc ('k') | webrtc/api/webrtcsdp_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 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
11 #include "webrtc/api/webrtcsdp.h" 11 #include "webrtc/api/webrtcsdp.h"
12 12
13 #include <ctype.h> 13 #include <ctype.h>
14 #include <limits.h> 14 #include <limits.h>
15 #include <stdio.h> 15 #include <stdio.h>
16 #include <algorithm> 16 #include <algorithm>
17 #include <string> 17 #include <string>
18 #include <vector> 18 #include <vector>
19 19
20 #include "talk/session/media/mediasession.h"
21 #include "webrtc/api/jsepicecandidate.h" 20 #include "webrtc/api/jsepicecandidate.h"
22 #include "webrtc/api/jsepsessiondescription.h" 21 #include "webrtc/api/jsepsessiondescription.h"
23 #include "webrtc/base/arraysize.h" 22 #include "webrtc/base/arraysize.h"
24 #include "webrtc/base/common.h" 23 #include "webrtc/base/common.h"
25 #include "webrtc/base/logging.h" 24 #include "webrtc/base/logging.h"
26 #include "webrtc/base/messagedigest.h" 25 #include "webrtc/base/messagedigest.h"
27 #include "webrtc/base/stringutils.h" 26 #include "webrtc/base/stringutils.h"
28 #include "webrtc/media/base/codec.h" 27 #include "webrtc/media/base/codec.h"
29 #include "webrtc/media/base/constants.h" 28 #include "webrtc/media/base/constants.h"
30 #include "webrtc/media/base/cryptoparams.h" 29 #include "webrtc/media/base/cryptoparams.h"
31 #include "webrtc/media/base/rtputils.h" 30 #include "webrtc/media/base/rtputils.h"
32 #include "webrtc/media/sctp/sctpdataengine.h" 31 #include "webrtc/media/sctp/sctpdataengine.h"
33 #include "webrtc/p2p/base/candidate.h" 32 #include "webrtc/p2p/base/candidate.h"
34 #include "webrtc/p2p/base/constants.h" 33 #include "webrtc/p2p/base/constants.h"
35 #include "webrtc/p2p/base/port.h" 34 #include "webrtc/p2p/base/port.h"
35 #include "webrtc/pc/mediasession.h"
36 36
37 using cricket::AudioContentDescription; 37 using cricket::AudioContentDescription;
38 using cricket::Candidate; 38 using cricket::Candidate;
39 using cricket::Candidates; 39 using cricket::Candidates;
40 using cricket::ContentDescription; 40 using cricket::ContentDescription;
41 using cricket::ContentInfo; 41 using cricket::ContentInfo;
42 using cricket::CryptoParams; 42 using cricket::CryptoParams;
43 using cricket::DataContentDescription; 43 using cricket::DataContentDescription;
44 using cricket::ICE_CANDIDATE_COMPONENT_RTP; 44 using cricket::ICE_CANDIDATE_COMPONENT_RTP;
45 using cricket::ICE_CANDIDATE_COMPONENT_RTCP; 45 using cricket::ICE_CANDIDATE_COMPONENT_RTCP;
(...skipping 3011 matching lines...) Expand 10 before | Expand all | Expand 10 after
3057 UpdateCodec<AudioContentDescription, cricket::AudioCodec>( 3057 UpdateCodec<AudioContentDescription, cricket::AudioCodec>(
3058 media_desc, payload_type, feedback_param); 3058 media_desc, payload_type, feedback_param);
3059 } else if (media_type == cricket::MEDIA_TYPE_VIDEO) { 3059 } else if (media_type == cricket::MEDIA_TYPE_VIDEO) {
3060 UpdateCodec<VideoContentDescription, cricket::VideoCodec>( 3060 UpdateCodec<VideoContentDescription, cricket::VideoCodec>(
3061 media_desc, payload_type, feedback_param); 3061 media_desc, payload_type, feedback_param);
3062 } 3062 }
3063 return true; 3063 return true;
3064 } 3064 }
3065 3065
3066 } // namespace webrtc 3066 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/api/videotrack_unittest.cc ('k') | webrtc/api/webrtcsdp_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698