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

Side by Side Diff: webrtc/media/base/videocommon.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/media/base/videocommon.h ('k') | webrtc/media/base/videocommon_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) 2010 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2010 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/media/base/videocommon.h" 11 #include "webrtc/media/base/videocommon.h"
12 12
13 #include <limits.h> // For INT_MAX 13 #include <limits.h> // For INT_MAX
14 #include <math.h> 14 #include <math.h>
15 #include <sstream> 15 #include <sstream>
16 16
17 #include "webrtc/base/arraysize.h" 17 #include "webrtc/rtc_base/arraysize.h"
18 18
19 namespace cricket { 19 namespace cricket {
20 20
21 struct FourCCAliasEntry { 21 struct FourCCAliasEntry {
22 uint32_t alias; 22 uint32_t alias;
23 uint32_t canonical; 23 uint32_t canonical;
24 }; 24 };
25 25
26 static const FourCCAliasEntry kFourCCAliases[] = { 26 static const FourCCAliasEntry kFourCCAliases[] = {
27 {FOURCC_IYUV, FOURCC_I420}, 27 {FOURCC_IYUV, FOURCC_I420},
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 } 70 }
71 } 71 }
72 72
73 std::ostringstream ss; 73 std::ostringstream ss;
74 ss << fourcc_name << width << "x" << height << "x" 74 ss << fourcc_name << width << "x" << height << "x"
75 << IntervalToFpsFloat(interval); 75 << IntervalToFpsFloat(interval);
76 return ss.str(); 76 return ss.str();
77 } 77 }
78 78
79 } // namespace cricket 79 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/media/base/videocommon.h ('k') | webrtc/media/base/videocommon_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698