577
|
1 |
# HG changeset patch
|
|
2 |
# Parent 6d0e0f7dc4cf04f1d08f8b4f8e9312ac05928608
|
|
3 |
remove trailing commas in enum definitions as these are unpalatable for gcc
|
|
4 |
(4.3.4) in pedantic mode
|
|
5 |
|
|
6 |
diff --git a/media/webrtc/trunk/src/common_types.h b/media/webrtc/trunk/src/common_types.h
|
|
7 |
--- a/media/webrtc/trunk/src/common_types.h
|
|
8 |
+++ b/media/webrtc/trunk/src/common_types.h
|
|
9 |
@@ -342,17 +342,17 @@ enum TelephoneEventDetectionMethods
|
|
10 |
enum NsModes // type of Noise Suppression
|
|
11 |
{
|
|
12 |
kNsUnchanged = 0, // previously set mode
|
|
13 |
kNsDefault, // platform default
|
|
14 |
kNsConference, // conferencing default
|
|
15 |
kNsLowSuppression, // lowest suppression
|
|
16 |
kNsModerateSuppression,
|
|
17 |
kNsHighSuppression,
|
|
18 |
- kNsVeryHighSuppression, // highest suppression
|
|
19 |
+ kNsVeryHighSuppression // highest suppression
|
|
20 |
};
|
|
21 |
|
|
22 |
enum AgcModes // type of Automatic Gain Control
|
|
23 |
{
|
|
24 |
kAgcUnchanged = 0, // previously set mode
|
|
25 |
kAgcDefault, // platform default
|
|
26 |
// adaptive mode for use when analog volume control exists (e.g. for
|
|
27 |
// PC softphone)
|
|
28 |
@@ -367,17 +367,17 @@ enum AgcModes // type o
|
|
29 |
|
|
30 |
// EC modes
|
|
31 |
enum EcModes // type of Echo Control
|
|
32 |
{
|
|
33 |
kEcUnchanged = 0, // previously set mode
|
|
34 |
kEcDefault, // platform default
|
|
35 |
kEcConference, // conferencing default (aggressive AEC)
|
|
36 |
kEcAec, // Acoustic Echo Cancellation
|
|
37 |
- kEcAecm, // AEC mobile
|
|
38 |
+ kEcAecm // AEC mobile
|
|
39 |
};
|
|
40 |
|
|
41 |
// AECM modes
|
|
42 |
enum AecmModes // mode of AECM
|
|
43 |
{
|
|
44 |
kAecmQuietEarpieceOrHeadset = 0,
|
|
45 |
// Quiet earpiece or headset use
|
|
46 |
kAecmEarpiece, // most earpiece use
|
|
47 |
@@ -416,43 +416,43 @@ enum NetEqModes // NetEQ pla
|
|
48 |
// Optimized trade-off between low delay and jitter robustness for two-way
|
|
49 |
// communication.
|
|
50 |
kNetEqDefault = 0,
|
|
51 |
// Improved jitter robustness at the cost of increased delay. Can be
|
|
52 |
// used in one-way communication.
|
|
53 |
kNetEqStreaming = 1,
|
|
54 |
// Optimzed for decodability of fax signals rather than for perceived audio
|
|
55 |
// quality.
|
|
56 |
- kNetEqFax = 2,
|
|
57 |
+ kNetEqFax = 2
|
|
58 |
};
|
|
59 |
|
|
60 |
enum NetEqBgnModes // NetEQ Background Noise (BGN) configurations
|
|
61 |
{
|
|
62 |
// BGN is always on and will be generated when the incoming RTP stream
|
|
63 |
// stops (default).
|
|
64 |
kBgnOn = 0,
|
|
65 |
// The BGN is faded to zero (complete silence) after a few seconds.
|
|
66 |
kBgnFade = 1,
|
|
67 |
// BGN is not used at all. Silence is produced after speech extrapolation
|
|
68 |
// has faded.
|
|
69 |
- kBgnOff = 2,
|
|
70 |
+ kBgnOff = 2
|
|
71 |
};
|
|
72 |
|
|
73 |
enum OnHoldModes // On Hold direction
|
|
74 |
{
|
|
75 |
kHoldSendAndPlay = 0, // Put both sending and playing in on-hold state.
|
|
76 |
kHoldSendOnly, // Put only sending in on-hold state.
|
|
77 |
kHoldPlayOnly // Put only playing in on-hold state.
|
|
78 |
};
|
|
79 |
|
|
80 |
enum AmrMode
|
|
81 |
{
|
|
82 |
kRfc3267BwEfficient = 0,
|
|
83 |
kRfc3267OctetAligned = 1,
|
|
84 |
- kRfc3267FileStorage = 2,
|
|
85 |
+ kRfc3267FileStorage = 2
|
|
86 |
};
|
|
87 |
|
|
88 |
// ==================================================================
|
|
89 |
// Video specific types
|
|
90 |
// ==================================================================
|
|
91 |
|
|
92 |
// Raw video types
|
|
93 |
enum RawVideoType
|