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

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

Issue 2969623003: Update includes for webrtc/{base => rtc_base} rename (2/3) (Closed)
Patch Set: Rebased onto 224e65939af87443addfc5bb500fbf434728bd1c and restored sorting in clock.cc Created 3 years, 5 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/mediamonitor.cc ('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 <algorithm> // For std::find_if, std::sort. 13 #include <algorithm> // For std::find_if, std::sort.
14 #include <functional> 14 #include <functional>
15 #include <map> 15 #include <map>
16 #include <memory> 16 #include <memory>
17 #include <set> 17 #include <set>
18 #include <unordered_map> 18 #include <unordered_map>
19 #include <utility> 19 #include <utility>
20 20
21 #include "webrtc/base/base64.h"
22 #include "webrtc/base/checks.h"
23 #include "webrtc/base/helpers.h"
24 #include "webrtc/base/logging.h"
25 #include "webrtc/base/optional.h"
26 #include "webrtc/base/stringutils.h"
27 #include "webrtc/common_types.h" 21 #include "webrtc/common_types.h"
28 #include "webrtc/media/base/cryptoparams.h" 22 #include "webrtc/media/base/cryptoparams.h"
29 #include "webrtc/media/base/h264_profile_level_id.h" 23 #include "webrtc/media/base/h264_profile_level_id.h"
30 #include "webrtc/media/base/mediaconstants.h" 24 #include "webrtc/media/base/mediaconstants.h"
31 #include "webrtc/p2p/base/p2pconstants.h" 25 #include "webrtc/p2p/base/p2pconstants.h"
32 #include "webrtc/pc/channelmanager.h" 26 #include "webrtc/pc/channelmanager.h"
33 #include "webrtc/pc/srtpfilter.h" 27 #include "webrtc/pc/srtpfilter.h"
28 #include "webrtc/rtc_base/base64.h"
29 #include "webrtc/rtc_base/checks.h"
30 #include "webrtc/rtc_base/helpers.h"
31 #include "webrtc/rtc_base/logging.h"
32 #include "webrtc/rtc_base/optional.h"
33 #include "webrtc/rtc_base/stringutils.h"
34 34
35 namespace { 35 namespace {
36 const char kInline[] = "inline:"; 36 const char kInline[] = "inline:";
37 37
38 void GetSupportedSdesCryptoSuiteNames(void (*func)(const rtc::CryptoOptions&, 38 void GetSupportedSdesCryptoSuiteNames(void (*func)(const rtc::CryptoOptions&,
39 std::vector<int>*), 39 std::vector<int>*),
40 const rtc::CryptoOptions& crypto_options, 40 const rtc::CryptoOptions& crypto_options,
41 std::vector<std::string>* names) { 41 std::vector<std::string>* names) {
42 std::vector<int> crypto_suites; 42 std::vector<int> crypto_suites;
43 func(crypto_options, &crypto_suites); 43 func(crypto_options, &crypto_suites);
(...skipping 2232 matching lines...) Expand 10 before | Expand all | Expand 10 after
2276 GetFirstMediaContentDescription(sdesc, MEDIA_TYPE_VIDEO)); 2276 GetFirstMediaContentDescription(sdesc, MEDIA_TYPE_VIDEO));
2277 } 2277 }
2278 2278
2279 DataContentDescription* GetFirstDataContentDescription( 2279 DataContentDescription* GetFirstDataContentDescription(
2280 SessionDescription* sdesc) { 2280 SessionDescription* sdesc) {
2281 return static_cast<DataContentDescription*>( 2281 return static_cast<DataContentDescription*>(
2282 GetFirstMediaContentDescription(sdesc, MEDIA_TYPE_DATA)); 2282 GetFirstMediaContentDescription(sdesc, MEDIA_TYPE_DATA));
2283 } 2283 }
2284 2284
2285 } // namespace cricket 2285 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/pc/mediamonitor.cc ('k') | webrtc/pc/mediasession_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698