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