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

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

Issue 1610243002: Move talk/app/webrtc to webrtc/api (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Updated location for peerconnection_unittests.isolate Created 4 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
OLDNEW
1 /* 1 /*
2 * libjingle 2 * Copyright 2011 The WebRTC project authors. All Rights Reserved.
3 * Copyright 2011 Google Inc.
4 * 3 *
5 * Redistribution and use in source and binary forms, with or without 4 * Use of this source code is governed by a BSD-style license
6 * modification, are permitted provided that the following conditions are met: 5 * that can be found in the LICENSE file in the root of the source
7 * 6 * tree. An additional intellectual property rights grant can be found
8 * 1. Redistributions of source code must retain the above copyright notice, 7 * in the file PATENTS. All contributing project authors may
9 * this list of conditions and the following disclaimer. 8 * be found in the AUTHORS file in the root of the source tree.
10 * 2. Redistributions in binary form must reproduce the above copyright notice,
11 * this list of conditions and the following disclaimer in the documentation
12 * and/or other materials provided with the distribution.
13 * 3. The name of the author may not be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 9 */
27 10
28 #include "talk/app/webrtc/webrtcsdp.h" 11 #include "webrtc/api/webrtcsdp.h"
29 12
13 #include <ctype.h>
30 #include <limits.h> 14 #include <limits.h>
31 #include <stdio.h> 15 #include <stdio.h>
32 #include <algorithm> 16 #include <algorithm>
33 #include <string> 17 #include <string>
34 #include <vector> 18 #include <vector>
35 #include <ctype.h>
36 19
37 #include "talk/app/webrtc/jsepicecandidate.h" 20 #include "webrtc/api/jsepicecandidate.h"
38 #include "talk/app/webrtc/jsepsessiondescription.h" 21 #include "webrtc/api/jsepsessiondescription.h"
39 #include "talk/media/base/codec.h" 22 #include "talk/media/base/codec.h"
40 #include "talk/media/base/constants.h" 23 #include "talk/media/base/constants.h"
41 #include "talk/media/base/cryptoparams.h" 24 #include "talk/media/base/cryptoparams.h"
42 #include "talk/media/base/rtputils.h" 25 #include "talk/media/base/rtputils.h"
43 #include "talk/media/sctp/sctpdataengine.h" 26 #include "talk/media/sctp/sctpdataengine.h"
44 #include "webrtc/p2p/base/candidate.h"
45 #include "webrtc/p2p/base/constants.h"
46 #include "webrtc/p2p/base/port.h"
47 #include "talk/session/media/mediasession.h" 27 #include "talk/session/media/mediasession.h"
48 #include "webrtc/base/arraysize.h" 28 #include "webrtc/base/arraysize.h"
49 #include "webrtc/base/common.h" 29 #include "webrtc/base/common.h"
50 #include "webrtc/base/logging.h" 30 #include "webrtc/base/logging.h"
51 #include "webrtc/base/messagedigest.h" 31 #include "webrtc/base/messagedigest.h"
52 #include "webrtc/base/stringutils.h" 32 #include "webrtc/base/stringutils.h"
33 #include "webrtc/p2p/base/candidate.h"
34 #include "webrtc/p2p/base/constants.h"
35 #include "webrtc/p2p/base/port.h"
53 36
54 using cricket::AudioContentDescription; 37 using cricket::AudioContentDescription;
55 using cricket::Candidate; 38 using cricket::Candidate;
56 using cricket::Candidates; 39 using cricket::Candidates;
57 using cricket::ContentDescription; 40 using cricket::ContentDescription;
58 using cricket::ContentInfo; 41 using cricket::ContentInfo;
59 using cricket::CryptoParams; 42 using cricket::CryptoParams;
60 using cricket::DataContentDescription; 43 using cricket::DataContentDescription;
61 using cricket::ICE_CANDIDATE_COMPONENT_RTP; 44 using cricket::ICE_CANDIDATE_COMPONENT_RTP;
62 using cricket::ICE_CANDIDATE_COMPONENT_RTCP; 45 using cricket::ICE_CANDIDATE_COMPONENT_RTCP;
(...skipping 3014 matching lines...) Expand 10 before | Expand all | Expand 10 after
3077 UpdateCodec<AudioContentDescription, cricket::AudioCodec>( 3060 UpdateCodec<AudioContentDescription, cricket::AudioCodec>(
3078 media_desc, payload_type, feedback_param); 3061 media_desc, payload_type, feedback_param);
3079 } else if (media_type == cricket::MEDIA_TYPE_VIDEO) { 3062 } else if (media_type == cricket::MEDIA_TYPE_VIDEO) {
3080 UpdateCodec<VideoContentDescription, cricket::VideoCodec>( 3063 UpdateCodec<VideoContentDescription, cricket::VideoCodec>(
3081 media_desc, payload_type, feedback_param); 3064 media_desc, payload_type, feedback_param);
3082 } 3065 }
3083 return true; 3066 return true;
3084 } 3067 }
3085 3068
3086 } // namespace webrtc 3069 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698