| Index: webrtc/modules/video_coding/jitter_buffer_common.h | 
| diff --git a/webrtc/modules/video_coding/jitter_buffer_common.h b/webrtc/modules/video_coding/jitter_buffer_common.h | 
| index 97af78087afff02ff32af7f9436c28aaffbeb970..65356f1d1bc2992bb470c721e450a53198b75dba 100644 | 
| --- a/webrtc/modules/video_coding/jitter_buffer_common.h | 
| +++ b/webrtc/modules/video_coding/jitter_buffer_common.h | 
| @@ -19,11 +19,11 @@ namespace webrtc { | 
| static const float kFastConvergeMultiplier = 0.4f; | 
| static const float kNormalConvergeMultiplier = 0.2f; | 
|  | 
| -enum { kMaxNumberOfFrames     = 300 }; | 
| -enum { kStartNumberOfFrames   = 6 }; | 
| -enum { kMaxVideoDelayMs       = 10000 }; | 
| +enum { kMaxNumberOfFrames = 300 }; | 
| +enum { kStartNumberOfFrames = 6 }; | 
| +enum { kMaxVideoDelayMs = 10000 }; | 
| enum { kPacketsPerFrameMultiplier = 5 }; | 
| -enum { kFastConvergeThreshold = 5}; | 
| +enum { kFastConvergeThreshold = 5 }; | 
|  | 
| enum VCMJitterBufferEnum { | 
| kMaxConsecutiveOldFrames = 60, | 
| @@ -36,36 +36,36 @@ enum VCMJitterBufferEnum { | 
| }; | 
|  | 
| enum VCMFrameBufferEnum { | 
| -  kOutOfBoundsPacket    = -7, | 
| -  kNotInitialized       = -6, | 
| -  kOldPacket            = -5, | 
| -  kGeneralError         = -4, | 
| -  kFlushIndicator       = -3,   // Indicator that a flush has occurred. | 
| -  kTimeStampError       = -2, | 
| -  kSizeError            = -1, | 
| -  kNoError              = 0, | 
| -  kIncomplete           = 1,    // Frame incomplete. | 
| -  kCompleteSession      = 3,    // at least one layer in the frame complete. | 
| -  kDecodableSession     = 4,    // Frame incomplete, but ready to be decoded | 
| -  kDuplicatePacket      = 5     // We're receiving a duplicate packet. | 
| +  kOutOfBoundsPacket = -7, | 
| +  kNotInitialized = -6, | 
| +  kOldPacket = -5, | 
| +  kGeneralError = -4, | 
| +  kFlushIndicator = -3,  // Indicator that a flush has occurred. | 
| +  kTimeStampError = -2, | 
| +  kSizeError = -1, | 
| +  kNoError = 0, | 
| +  kIncomplete = 1,        // Frame incomplete. | 
| +  kCompleteSession = 3,   // at least one layer in the frame complete. | 
| +  kDecodableSession = 4,  // Frame incomplete, but ready to be decoded | 
| +  kDuplicatePacket = 5    // We're receiving a duplicate packet. | 
| }; | 
|  | 
| enum VCMFrameBufferStateEnum { | 
| -  kStateEmpty,              // frame popped by the RTP receiver | 
| -  kStateIncomplete,         // frame that have one or more packet(s) stored | 
| -  kStateComplete,           // frame that have all packets | 
| -  kStateDecodable           // Hybrid mode - frame can be decoded | 
| +  kStateEmpty,       // frame popped by the RTP receiver | 
| +  kStateIncomplete,  // frame that have one or more packet(s) stored | 
| +  kStateComplete,    // frame that have all packets | 
| +  kStateDecodable    // Hybrid mode - frame can be decoded | 
| }; | 
|  | 
| -enum { kH264StartCodeLengthBytes = 4}; | 
| +enum { kH264StartCodeLengthBytes = 4 }; | 
|  | 
| // Used to indicate if a received packet contain a complete NALU (or equivalent) | 
| enum VCMNaluCompleteness { | 
| -  kNaluUnset = 0,       // Packet has not been filled. | 
| -  kNaluComplete = 1,    // Packet can be decoded as is. | 
| -  kNaluStart,           // Packet contain beginning of NALU | 
| -  kNaluIncomplete,      // Packet is not beginning or end of NALU | 
| -  kNaluEnd,             // Packet is the end of a NALU | 
| +  kNaluUnset = 0,     // Packet has not been filled. | 
| +  kNaluComplete = 1,  // Packet can be decoded as is. | 
| +  kNaluStart,         // Packet contain beginning of NALU | 
| +  kNaluIncomplete,    // Packet is not beginning or end of NALU | 
| +  kNaluEnd,           // Packet is the end of a NALU | 
| }; | 
| }  // namespace webrtc | 
|  | 
|  |