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

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

Issue 2603203003: Revert of Replace basictypes.h with stdint.h for int_t types. (Closed)
Patch Set: Created 3 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
« no previous file with comments | « webrtc/media/base/videocapturer.h ('k') | webrtc/media/devices/gtkvideorenderer.h » ('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) 2004 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 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 // Common definition for video, including fourcc and VideoFormat. 11 // Common definition for video, including fourcc and VideoFormat.
12 12
13 #ifndef WEBRTC_MEDIA_BASE_VIDEOCOMMON_H_ // NOLINT 13 #ifndef WEBRTC_MEDIA_BASE_VIDEOCOMMON_H_ // NOLINT
14 #define WEBRTC_MEDIA_BASE_VIDEOCOMMON_H_ 14 #define WEBRTC_MEDIA_BASE_VIDEOCOMMON_H_
15 15
16 #include <stdint.h>
17
18 #include <string> 16 #include <string>
19 17
18 #include "webrtc/base/basictypes.h"
20 #include "webrtc/base/timeutils.h" 19 #include "webrtc/base/timeutils.h"
21 20
22 namespace cricket { 21 namespace cricket {
23 22
24 // TODO(janahan): For now, a hard-coded ssrc is used as the video ssrc. 23 // TODO(janahan): For now, a hard-coded ssrc is used as the video ssrc.
25 // This is because when the video frame is passed to the mediaprocessor for 24 // This is because when the video frame is passed to the mediaprocessor for
26 // processing, it doesn't have the correct ssrc. Since currently only Tx 25 // processing, it doesn't have the correct ssrc. Since currently only Tx
27 // Video processing is supported, this is ok. When we switch over to trigger 26 // Video processing is supported, this is ok. When we switch over to trigger
28 // from capturer, this should be fixed and this const removed. 27 // from capturer, this should be fixed and this const removed.
29 const uint32_t kDummyVideoSsrc = 0xFFFFFFFF; 28 const uint32_t kDummyVideoSsrc = 0xFFFFFFFF;
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 format.width * format.height * format.framerate(); 219 format.width * format.height * format.framerate();
221 } 220 }
222 221
223 // Get a string presentation in the form of "fourcc width x height x fps" 222 // Get a string presentation in the form of "fourcc width x height x fps"
224 std::string ToString() const; 223 std::string ToString() const;
225 }; 224 };
226 225
227 } // namespace cricket 226 } // namespace cricket
228 227
229 #endif // WEBRTC_MEDIA_BASE_VIDEOCOMMON_H_ // NOLINT 228 #endif // WEBRTC_MEDIA_BASE_VIDEOCOMMON_H_ // NOLINT
OLDNEW
« no previous file with comments | « webrtc/media/base/videocapturer.h ('k') | webrtc/media/devices/gtkvideorenderer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698