Merge "clang-format on mkvmuxertypes.hpp and webmids.hpp"

This commit is contained in:
Vignesh Venkatasubramanian
2014-04-28 10:40:43 -07:00
committed by Gerrit Code Review
2 changed files with 151 additions and 151 deletions

View File

@@ -1,30 +1,30 @@
// Copyright (c) 2012 The WebM project authors. All Rights Reserved. // Copyright (c) 2012 The WebM project authors. All Rights Reserved.
// //
// Use of this source code is governed by a BSD-style license // Use of this source code is governed by a BSD-style license
// that can be found in the LICENSE file in the root of the source // that can be found in the LICENSE file in the root of the source
// tree. An additional intellectual property rights grant can be found // tree. An additional intellectual property rights grant can be found
// in the file PATENTS. All contributing project authors may // in the file PATENTS. All contributing project authors may
// be found in the AUTHORS file in the root of the source tree. // be found in the AUTHORS file in the root of the source tree.
#ifndef MKVMUXERTYPES_HPP #ifndef MKVMUXERTYPES_HPP
#define MKVMUXERTYPES_HPP #define MKVMUXERTYPES_HPP
// Copied from Chromium basictypes.h // Copied from Chromium basictypes.h
// A macro to disallow the copy constructor and operator= functions // A macro to disallow the copy constructor and operator= functions
// This should be used in the private: declarations for a class // This should be used in the private: declarations for a class
#define LIBWEBM_DISALLOW_COPY_AND_ASSIGN(TypeName) \ #define LIBWEBM_DISALLOW_COPY_AND_ASSIGN(TypeName) \
TypeName(const TypeName&); \ TypeName(const TypeName&); \
void operator=(const TypeName&) void operator=(const TypeName&)
namespace mkvmuxer { namespace mkvmuxer {
typedef unsigned char uint8; typedef unsigned char uint8;
typedef short int16; typedef short int16;
typedef int int32; typedef int int32;
typedef unsigned int uint32; typedef unsigned int uint32;
typedef long long int64; typedef long long int64;
typedef unsigned long long uint64; typedef unsigned long long uint64;
} //end namespace mkvmuxer } // end namespace mkvmuxer
#endif // MKVMUXERTYPES_HPP #endif // MKVMUXERTYPES_HPP

View File

@@ -12,130 +12,130 @@
namespace mkvmuxer { namespace mkvmuxer {
enum MkvId { enum MkvId {
kMkvEBML = 0x1A45DFA3, kMkvEBML = 0x1A45DFA3,
kMkvEBMLVersion = 0x4286, kMkvEBMLVersion = 0x4286,
kMkvEBMLReadVersion = 0x42F7, kMkvEBMLReadVersion = 0x42F7,
kMkvEBMLMaxIDLength = 0x42F2, kMkvEBMLMaxIDLength = 0x42F2,
kMkvEBMLMaxSizeLength = 0x42F3, kMkvEBMLMaxSizeLength = 0x42F3,
kMkvDocType = 0x4282, kMkvDocType = 0x4282,
kMkvDocTypeVersion = 0x4287, kMkvDocTypeVersion = 0x4287,
kMkvDocTypeReadVersion = 0x4285, kMkvDocTypeReadVersion = 0x4285,
kMkvVoid = 0xEC, kMkvVoid = 0xEC,
kMkvSignatureSlot = 0x1B538667, kMkvSignatureSlot = 0x1B538667,
kMkvSignatureAlgo = 0x7E8A, kMkvSignatureAlgo = 0x7E8A,
kMkvSignatureHash = 0x7E9A, kMkvSignatureHash = 0x7E9A,
kMkvSignaturePublicKey = 0x7EA5, kMkvSignaturePublicKey = 0x7EA5,
kMkvSignature = 0x7EB5, kMkvSignature = 0x7EB5,
kMkvSignatureElements = 0x7E5B, kMkvSignatureElements = 0x7E5B,
kMkvSignatureElementList = 0x7E7B, kMkvSignatureElementList = 0x7E7B,
kMkvSignedElement = 0x6532, kMkvSignedElement = 0x6532,
//segment // segment
kMkvSegment = 0x18538067, kMkvSegment = 0x18538067,
//Meta Seek Information // Meta Seek Information
kMkvSeekHead = 0x114D9B74, kMkvSeekHead = 0x114D9B74,
kMkvSeek = 0x4DBB, kMkvSeek = 0x4DBB,
kMkvSeekID = 0x53AB, kMkvSeekID = 0x53AB,
kMkvSeekPosition = 0x53AC, kMkvSeekPosition = 0x53AC,
//Segment Information // Segment Information
kMkvInfo = 0x1549A966, kMkvInfo = 0x1549A966,
kMkvTimecodeScale = 0x2AD7B1, kMkvTimecodeScale = 0x2AD7B1,
kMkvDuration = 0x4489, kMkvDuration = 0x4489,
kMkvDateUTC = 0x4461, kMkvDateUTC = 0x4461,
kMkvMuxingApp = 0x4D80, kMkvMuxingApp = 0x4D80,
kMkvWritingApp = 0x5741, kMkvWritingApp = 0x5741,
//Cluster // Cluster
kMkvCluster = 0x1F43B675, kMkvCluster = 0x1F43B675,
kMkvTimecode = 0xE7, kMkvTimecode = 0xE7,
kMkvPrevSize = 0xAB, kMkvPrevSize = 0xAB,
kMkvBlockGroup = 0xA0, kMkvBlockGroup = 0xA0,
kMkvBlock = 0xA1, kMkvBlock = 0xA1,
kMkvBlockDuration = 0x9B, kMkvBlockDuration = 0x9B,
kMkvReferenceBlock = 0xFB, kMkvReferenceBlock = 0xFB,
kMkvLaceNumber = 0xCC, kMkvLaceNumber = 0xCC,
kMkvSimpleBlock = 0xA3, kMkvSimpleBlock = 0xA3,
kMkvBlockAdditions = 0x75A1, kMkvBlockAdditions = 0x75A1,
kMkvBlockMore = 0xA6, kMkvBlockMore = 0xA6,
kMkvBlockAddID = 0xEE, kMkvBlockAddID = 0xEE,
kMkvBlockAdditional = 0xA5, kMkvBlockAdditional = 0xA5,
kMkvDiscardPadding = 0x75A2, kMkvDiscardPadding = 0x75A2,
//Track // Track
kMkvTracks = 0x1654AE6B, kMkvTracks = 0x1654AE6B,
kMkvTrackEntry = 0xAE, kMkvTrackEntry = 0xAE,
kMkvTrackNumber = 0xD7, kMkvTrackNumber = 0xD7,
kMkvTrackUID = 0x73C5, kMkvTrackUID = 0x73C5,
kMkvTrackType = 0x83, kMkvTrackType = 0x83,
kMkvFlagEnabled = 0xB9, kMkvFlagEnabled = 0xB9,
kMkvFlagDefault = 0x88, kMkvFlagDefault = 0x88,
kMkvFlagForced = 0x55AA, kMkvFlagForced = 0x55AA,
kMkvFlagLacing = 0x9C, kMkvFlagLacing = 0x9C,
kMkvDefaultDuration = 0x23E383, kMkvDefaultDuration = 0x23E383,
kMkvMaxBlockAdditionID = 0x55EE, kMkvMaxBlockAdditionID = 0x55EE,
kMkvName = 0x536E, kMkvName = 0x536E,
kMkvLanguage = 0x22B59C, kMkvLanguage = 0x22B59C,
kMkvCodecID = 0x86, kMkvCodecID = 0x86,
kMkvCodecPrivate = 0x63A2, kMkvCodecPrivate = 0x63A2,
kMkvCodecName = 0x258688, kMkvCodecName = 0x258688,
kMkvCodecDelay = 0x56AA, kMkvCodecDelay = 0x56AA,
kMkvSeekPreRoll = 0x56BB, kMkvSeekPreRoll = 0x56BB,
//video // video
kMkvVideo = 0xE0, kMkvVideo = 0xE0,
kMkvFlagInterlaced = 0x9A, kMkvFlagInterlaced = 0x9A,
kMkvStereoMode = 0x53B8, kMkvStereoMode = 0x53B8,
kMkvAlphaMode = 0x53C0, kMkvAlphaMode = 0x53C0,
kMkvPixelWidth = 0xB0, kMkvPixelWidth = 0xB0,
kMkvPixelHeight = 0xBA, kMkvPixelHeight = 0xBA,
kMkvPixelCropBottom = 0x54AA, kMkvPixelCropBottom = 0x54AA,
kMkvPixelCropTop = 0x54BB, kMkvPixelCropTop = 0x54BB,
kMkvPixelCropLeft = 0x54CC, kMkvPixelCropLeft = 0x54CC,
kMkvPixelCropRight = 0x54DD, kMkvPixelCropRight = 0x54DD,
kMkvDisplayWidth = 0x54B0, kMkvDisplayWidth = 0x54B0,
kMkvDisplayHeight = 0x54BA, kMkvDisplayHeight = 0x54BA,
kMkvDisplayUnit = 0x54B2, kMkvDisplayUnit = 0x54B2,
kMkvAspectRatioType = 0x54B3, kMkvAspectRatioType = 0x54B3,
kMkvFrameRate = 0x2383E3, kMkvFrameRate = 0x2383E3,
//end video // end video
//audio // audio
kMkvAudio = 0xE1, kMkvAudio = 0xE1,
kMkvSamplingFrequency = 0xB5, kMkvSamplingFrequency = 0xB5,
kMkvOutputSamplingFrequency = 0x78B5, kMkvOutputSamplingFrequency = 0x78B5,
kMkvChannels = 0x9F, kMkvChannels = 0x9F,
kMkvBitDepth = 0x6264, kMkvBitDepth = 0x6264,
//end audio // end audio
//ContentEncodings // ContentEncodings
kMkvContentEncodings = 0x6D80, kMkvContentEncodings = 0x6D80,
kMkvContentEncoding = 0x6240, kMkvContentEncoding = 0x6240,
kMkvContentEncodingOrder = 0x5031, kMkvContentEncodingOrder = 0x5031,
kMkvContentEncodingScope = 0x5032, kMkvContentEncodingScope = 0x5032,
kMkvContentEncodingType = 0x5033, kMkvContentEncodingType = 0x5033,
kMkvContentEncryption = 0x5035, kMkvContentEncryption = 0x5035,
kMkvContentEncAlgo = 0x47E1, kMkvContentEncAlgo = 0x47E1,
kMkvContentEncKeyID = 0x47E2, kMkvContentEncKeyID = 0x47E2,
kMkvContentEncAESSettings = 0x47E7, kMkvContentEncAESSettings = 0x47E7,
kMkvAESSettingsCipherMode = 0x47E8, kMkvAESSettingsCipherMode = 0x47E8,
kMkvAESSettingsCipherInitData = 0x47E9, kMkvAESSettingsCipherInitData = 0x47E9,
//end ContentEncodings // end ContentEncodings
//Cueing Data // Cueing Data
kMkvCues = 0x1C53BB6B, kMkvCues = 0x1C53BB6B,
kMkvCuePoint = 0xBB, kMkvCuePoint = 0xBB,
kMkvCueTime = 0xB3, kMkvCueTime = 0xB3,
kMkvCueTrackPositions = 0xB7, kMkvCueTrackPositions = 0xB7,
kMkvCueTrack = 0xF7, kMkvCueTrack = 0xF7,
kMkvCueClusterPosition = 0xF1, kMkvCueClusterPosition = 0xF1,
kMkvCueBlockNumber = 0x5378, kMkvCueBlockNumber = 0x5378,
//Chapters // Chapters
kMkvChapters = 0x1043A770, kMkvChapters = 0x1043A770,
kMkvEditionEntry = 0x45B9, kMkvEditionEntry = 0x45B9,
kMkvChapterAtom = 0xB6, kMkvChapterAtom = 0xB6,
kMkvChapterUID = 0x73C4, kMkvChapterUID = 0x73C4,
kMkvChapterStringUID = 0x5654, kMkvChapterStringUID = 0x5654,
kMkvChapterTimeStart = 0x91, kMkvChapterTimeStart = 0x91,
kMkvChapterTimeEnd = 0x92, kMkvChapterTimeEnd = 0x92,
kMkvChapterDisplay = 0x80, kMkvChapterDisplay = 0x80,
kMkvChapString = 0x85, kMkvChapString = 0x85,
kMkvChapLanguage = 0x437C, kMkvChapLanguage = 0x437C,
kMkvChapCountry = 0x437E kMkvChapCountry = 0x437E
}; };
} // end namespace mkvmuxer } // end namespace mkvmuxer
#endif // WEBMIDS_HPP #endif // WEBMIDS_HPP