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

Side by Side Diff: webrtc/media/base/streamparams.h

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/media/base/rtputils_unittest.cc ('k') | webrtc/media/base/streamparams_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 (c) 2011 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 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 #ifndef WEBRTC_MEDIA_BASE_STREAMPARAMS_H_ 26 #ifndef WEBRTC_MEDIA_BASE_STREAMPARAMS_H_
27 #define WEBRTC_MEDIA_BASE_STREAMPARAMS_H_ 27 #define WEBRTC_MEDIA_BASE_STREAMPARAMS_H_
28 28
29 #include <stdint.h> 29 #include <stdint.h>
30 30
31 #include <algorithm> 31 #include <algorithm>
32 #include <set> 32 #include <set>
33 #include <string> 33 #include <string>
34 #include <vector> 34 #include <vector>
35 35
36 #include "webrtc/base/constructormagic.h" 36 #include "webrtc/rtc_base/constructormagic.h"
37 37
38 namespace cricket { 38 namespace cricket {
39 39
40 extern const char kFecSsrcGroupSemantics[]; 40 extern const char kFecSsrcGroupSemantics[];
41 extern const char kFecFrSsrcGroupSemantics[]; 41 extern const char kFecFrSsrcGroupSemantics[];
42 extern const char kFidSsrcGroupSemantics[]; 42 extern const char kFidSsrcGroupSemantics[];
43 extern const char kSimSsrcGroupSemantics[]; 43 extern const char kSimSsrcGroupSemantics[];
44 44
45 struct SsrcGroup { 45 struct SsrcGroup {
46 SsrcGroup(const std::string& usage, const std::vector<uint32_t>& ssrcs) 46 SsrcGroup(const std::string& usage, const std::vector<uint32_t>& ssrcs)
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 bool IsOneSsrcStream(const StreamParams& sp); 323 bool IsOneSsrcStream(const StreamParams& sp);
324 324
325 // Checks if |sp| defines parameters for one Simulcast stream. There may be RTX 325 // Checks if |sp| defines parameters for one Simulcast stream. There may be RTX
326 // streams associated with the simulcast streams. Leaving as non-static so we 326 // streams associated with the simulcast streams. Leaving as non-static so we
327 // can test this function. 327 // can test this function.
328 bool IsSimulcastStream(const StreamParams& sp); 328 bool IsSimulcastStream(const StreamParams& sp);
329 329
330 } // namespace cricket 330 } // namespace cricket
331 331
332 #endif // WEBRTC_MEDIA_BASE_STREAMPARAMS_H_ 332 #endif // WEBRTC_MEDIA_BASE_STREAMPARAMS_H_
OLDNEW
« no previous file with comments | « webrtc/media/base/rtputils_unittest.cc ('k') | webrtc/media/base/streamparams_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698