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

Side by Side Diff: webrtc/modules/video_coding/internal_defines.h

Issue 1543503002: Lint fix for webrtc/modules/video_coding PART 2! (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years 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
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
11 #ifndef WEBRTC_MODULES_VIDEO_CODING_INTERNAL_DEFINES_H_ 11 #ifndef WEBRTC_MODULES_VIDEO_CODING_INTERNAL_DEFINES_H_
12 #define WEBRTC_MODULES_VIDEO_CODING_INTERNAL_DEFINES_H_ 12 #define WEBRTC_MODULES_VIDEO_CODING_INTERNAL_DEFINES_H_
13 13
14 #include "webrtc/typedefs.h" 14 #include "webrtc/typedefs.h"
15 15
16 namespace webrtc 16 namespace webrtc {
17 {
18 17
19 #define MASK_32_BITS(x) (0xFFFFFFFF & (x)) 18 #define MASK_32_BITS(x) (0xFFFFFFFF & (x))
20 19
21 inline uint32_t MaskWord64ToUWord32(int64_t w64) 20 inline uint32_t MaskWord64ToUWord32(int64_t w64) {
22 { 21 return static_cast<uint32_t>(MASK_32_BITS(w64));
23 return static_cast<uint32_t>(MASK_32_BITS(w64));
24 } 22 }
25 23
26 #define VCM_MAX(a, b) (((a) > (b)) ? (a) : (b)) 24 #define VCM_MAX(a, b) (((a) > (b)) ? (a) : (b))
27 #define VCM_MIN(a, b) (((a) < (b)) ? (a) : (b)) 25 #define VCM_MIN(a, b) (((a) < (b)) ? (a) : (b))
28 26
29 #define VCM_DEFAULT_CODEC_WIDTH 352 27 #define VCM_DEFAULT_CODEC_WIDTH 352
30 #define VCM_DEFAULT_CODEC_HEIGHT 288 28 #define VCM_DEFAULT_CODEC_HEIGHT 288
31 #define VCM_DEFAULT_FRAME_RATE 30 29 #define VCM_DEFAULT_FRAME_RATE 30
32 #define VCM_MIN_BITRATE 30 30 #define VCM_MIN_BITRATE 30
33 #define VCM_FLUSH_INDICATOR 4 31 #define VCM_FLUSH_INDICATOR 4
34 32
35 #define VCM_NO_RECEIVER_ID 0 33 #define VCM_NO_RECEIVER_ID 0
36 34
37 inline int32_t VCMId(const int32_t vcmId, const int32_t receiverId = 0) 35 inline int32_t VCMId(const int32_t vcmId, const int32_t receiverId = 0) {
38 { 36 return static_cast<int32_t>((vcmId << 16) + receiverId);
39 return static_cast<int32_t>((vcmId << 16) + receiverId);
40 } 37 }
41 38
42 } // namespace webrtc 39 } // namespace webrtc
43 40
44 #endif // WEBRTC_MODULES_VIDEO_CODING_INTERNAL_DEFINES_H_ 41 #endif // WEBRTC_MODULES_VIDEO_CODING_INTERNAL_DEFINES_H_
OLDNEW
« no previous file with comments | « webrtc/modules/video_coding/inter_frame_delay.cc ('k') | webrtc/modules/video_coding/jitter_buffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698