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

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

Issue 1750593002: Rename constants files in webrtc/{media,p2p} (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Removed cricket naming Created 4 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/mediasession.h ('k') | webrtc/pc/mediasession_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 2004 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2004 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/pc/mediasession.h" 11 #include "webrtc/pc/mediasession.h"
12 12
13 #include <functional> 13 #include <functional>
14 #include <map> 14 #include <map>
15 #include <set> 15 #include <set>
16 #include <utility> 16 #include <utility>
17 17
18 #include "webrtc/base/helpers.h" 18 #include "webrtc/base/helpers.h"
19 #include "webrtc/base/logging.h" 19 #include "webrtc/base/logging.h"
20 #include "webrtc/base/scoped_ptr.h" 20 #include "webrtc/base/scoped_ptr.h"
21 #include "webrtc/base/stringutils.h" 21 #include "webrtc/base/stringutils.h"
22 #include "webrtc/media/base/constants.h"
23 #include "webrtc/media/base/cryptoparams.h" 22 #include "webrtc/media/base/cryptoparams.h"
24 #include "webrtc/p2p/base/constants.h" 23 #include "webrtc/media/base/mediaconstants.h"
24 #include "webrtc/p2p/base/p2pconstants.h"
25 #include "webrtc/pc/channelmanager.h" 25 #include "webrtc/pc/channelmanager.h"
26 #include "webrtc/pc/srtpfilter.h" 26 #include "webrtc/pc/srtpfilter.h"
27 27
28 #ifdef HAVE_SCTP 28 #ifdef HAVE_SCTP
29 #include "webrtc/media/sctp/sctpdataengine.h" 29 #include "webrtc/media/sctp/sctpdataengine.h"
30 #else 30 #else
31 static const uint32_t kMaxSctpSid = 1023; 31 static const uint32_t kMaxSctpSid = 1023;
32 #endif 32 #endif
33 33
34 namespace { 34 namespace {
(...skipping 1948 matching lines...) Expand 10 before | Expand all | Expand 10 after
1983 GetFirstMediaContentDescription(sdesc, MEDIA_TYPE_VIDEO)); 1983 GetFirstMediaContentDescription(sdesc, MEDIA_TYPE_VIDEO));
1984 } 1984 }
1985 1985
1986 const DataContentDescription* GetFirstDataContentDescription( 1986 const DataContentDescription* GetFirstDataContentDescription(
1987 const SessionDescription* sdesc) { 1987 const SessionDescription* sdesc) {
1988 return static_cast<const DataContentDescription*>( 1988 return static_cast<const DataContentDescription*>(
1989 GetFirstMediaContentDescription(sdesc, MEDIA_TYPE_DATA)); 1989 GetFirstMediaContentDescription(sdesc, MEDIA_TYPE_DATA));
1990 } 1990 }
1991 1991
1992 } // namespace cricket 1992 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/pc/mediasession.h ('k') | webrtc/pc/mediasession_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698