Chromium Code Reviews

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

Issue 1425613004: Remove VIDEOCODEC_* from engine_configurations.h. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: remove comment part Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
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 14 matching lines...)
25 25
26 #define VCM_MAX(a, b) (((a) > (b)) ? (a) : (b)) 26 #define VCM_MAX(a, b) (((a) > (b)) ? (a) : (b))
27 #define VCM_MIN(a, b) (((a) < (b)) ? (a) : (b)) 27 #define VCM_MIN(a, b) (((a) < (b)) ? (a) : (b))
28 28
29 #define VCM_DEFAULT_CODEC_WIDTH 352 29 #define VCM_DEFAULT_CODEC_WIDTH 352
30 #define VCM_DEFAULT_CODEC_HEIGHT 288 30 #define VCM_DEFAULT_CODEC_HEIGHT 288
31 #define VCM_DEFAULT_FRAME_RATE 30 31 #define VCM_DEFAULT_FRAME_RATE 30
32 #define VCM_MIN_BITRATE 30 32 #define VCM_MIN_BITRATE 30
33 #define VCM_FLUSH_INDICATOR 4 33 #define VCM_FLUSH_INDICATOR 4
34 34
35 // Helper macros for creating the static codec list
36 #define VCM_NO_CODEC_IDX -1
37 #ifdef VIDEOCODEC_VP8
38 #define VCM_VP8_IDX (VCM_NO_CODEC_IDX + 1)
39 #else
40 #define VCM_VP8_IDX VCM_NO_CODEC_IDX
41 #endif
42 #ifdef VIDEOCODEC_VP9
43 #define VCM_VP9_IDX (VCM_VP8_IDX + 1)
44 #else
45 #define VCM_VP9_IDX VCM_VP8_IDX
46 #endif
47 #ifdef VIDEOCODEC_H264
48 #define VCM_H264_IDX (VCM_VP9_IDX + 1)
49 #else
50 #define VCM_H264_IDX VCM_VP9_IDX
51 #endif
52 #ifdef VIDEOCODEC_I420
53 #define VCM_I420_IDX (VCM_H264_IDX + 1)
54 #else
55 #define VCM_I420_IDX VCM_H264_IDX
56 #endif
57 #define VCM_NUM_VIDEO_CODECS_AVAILABLE (VCM_I420_IDX + 1)
58
59 #define VCM_NO_RECEIVER_ID 0 35 #define VCM_NO_RECEIVER_ID 0
60 36
61 inline int32_t VCMId(const int32_t vcmId, const int32_t receiverId = 0) 37 inline int32_t VCMId(const int32_t vcmId, const int32_t receiverId = 0)
62 { 38 {
63 return static_cast<int32_t>((vcmId << 16) + receiverId); 39 return static_cast<int32_t>((vcmId << 16) + receiverId);
64 } 40 }
65 41
66 } // namespace webrtc 42 } // namespace webrtc
67 43
68 #endif // WEBRTC_MODULES_VIDEO_CODING_SOURCE_INTERNAL_DEFINES_H_ 44 #endif // WEBRTC_MODULES_VIDEO_CODING_SOURCE_INTERNAL_DEFINES_H_
OLDNEW

Powered by Google App Engine