clang-format v6.0.1
Change-Id: Idba2397df40fb1693c8c58e0f31f98b918395c79
diff --git a/mkvmuxer/mkvmuxer.cc b/mkvmuxer/mkvmuxer.cc
index d4a1b7a..5120312 100644
--- a/mkvmuxer/mkvmuxer.cc
+++ b/mkvmuxer/mkvmuxer.cc
@@ -1035,19 +1035,16 @@
!WriteEbmlElement(writer, libwebm::kMkvLuminanceMin, luminance_min_)) {
return false;
}
- if (r_ &&
- !r_->Write(writer, libwebm::kMkvPrimaryRChromaticityX,
- libwebm::kMkvPrimaryRChromaticityY)) {
+ if (r_ && !r_->Write(writer, libwebm::kMkvPrimaryRChromaticityX,
+ libwebm::kMkvPrimaryRChromaticityY)) {
return false;
}
- if (g_ &&
- !g_->Write(writer, libwebm::kMkvPrimaryGChromaticityX,
- libwebm::kMkvPrimaryGChromaticityY)) {
+ if (g_ && !g_->Write(writer, libwebm::kMkvPrimaryGChromaticityX,
+ libwebm::kMkvPrimaryGChromaticityY)) {
return false;
}
- if (b_ &&
- !b_->Write(writer, libwebm::kMkvPrimaryBChromaticityX,
- libwebm::kMkvPrimaryBChromaticityY)) {
+ if (b_ && !b_->Write(writer, libwebm::kMkvPrimaryBChromaticityX,
+ libwebm::kMkvPrimaryBChromaticityY)) {
return false;
}
if (white_point_ &&
diff --git a/mkvmuxer/mkvmuxerutil.cc b/mkvmuxer/mkvmuxerutil.cc
index 355d4e2..3bff7cd 100644
--- a/mkvmuxer/mkvmuxerutil.cc
+++ b/mkvmuxer/mkvmuxerutil.cc
@@ -136,9 +136,8 @@
return false;
}
- if (!frame->is_key() &&
- !WriteEbmlElement(writer, libwebm::kMkvReferenceBlock,
- reference_block_timestamp)) {
+ if (!frame->is_key() && !WriteEbmlElement(writer, libwebm::kMkvReferenceBlock,
+ reference_block_timestamp)) {
return false;
}
diff --git a/testing/test_util.h b/testing/test_util.h
index 526c392..5f85ec7 100644
--- a/testing/test_util.h
+++ b/testing/test_util.h
@@ -17,7 +17,7 @@
class IMkvReader;
class MkvReader;
class Segment;
-}
+} // namespace mkvparser
namespace test {
diff --git a/webm_info.cc b/webm_info.cc
index 1b05067..cf70d7b 100644
--- a/webm_info.cc
+++ b/webm_info.cc
@@ -28,12 +28,12 @@
namespace {
-using mkvparser::ContentEncoding;
-using std::string;
-using std::wstring;
using libwebm::Indent;
using libwebm::kNanosecondsPerSecond;
using libwebm::kNanosecondsPerSecondi;
+using mkvparser::ContentEncoding;
+using std::string;
+using std::wstring;
const char VERSION_STRING[] = "1.0.4.5";
@@ -1312,9 +1312,10 @@
const vp9_parser::Vp9Level level = level_stats.GetLevel();
fprintf(out, "VP9 Level:%d\n", level);
fprintf(
- out, "mlsr:%" PRId64 " mlps:%" PRId64 " mlpb:%" PRId64
- " abr:%g mcs:%g cr:%g mct:%d"
- " mad:%d mrf:%d\n",
+ out,
+ "mlsr:%" PRId64 " mlps:%" PRId64 " mlpb:%" PRId64
+ " abr:%g mcs:%g cr:%g mct:%d"
+ " mad:%d mrf:%d\n",
level_stats.GetMaxLumaSampleRate(), level_stats.GetMaxLumaPictureSize(),
level_stats.GetMaxLumaPictureBreadth(), level_stats.GetAverageBitRate(),
level_stats.GetMaxCpbSize(), level_stats.GetCompressionRatio(),
diff --git a/webm_parser/src/ancestory.cc b/webm_parser/src/ancestory.cc
index 4357df9..9860a28 100644
--- a/webm_parser/src/ancestory.cc
+++ b/webm_parser/src/ancestory.cc
@@ -54,10 +54,13 @@
Id::kEbml,
};
static constexpr Id kSeekAncestory[] = {
- Id::kSegment, Id::kSeekHead, Id::kSeek,
+ Id::kSegment,
+ Id::kSeekHead,
+ Id::kSeek,
};
static constexpr Id kInfoAncestory[] = {
- Id::kSegment, Id::kInfo,
+ Id::kSegment,
+ Id::kInfo,
};
static constexpr Id kBlockMoreAncestory[] = {
Id::kSegment, Id::kCluster, Id::kBlockGroup,
@@ -67,10 +70,16 @@
Id::kSegment, Id::kCluster, Id::kBlockGroup, Id::kSlices, Id::kTimeSlice,
};
static constexpr Id kVideoAncestory[] = {
- Id::kSegment, Id::kTracks, Id::kTrackEntry, Id::kVideo,
+ Id::kSegment,
+ Id::kTracks,
+ Id::kTrackEntry,
+ Id::kVideo,
};
static constexpr Id kAudioAncestory[] = {
- Id::kSegment, Id::kTracks, Id::kTrackEntry, Id::kAudio,
+ Id::kSegment,
+ Id::kTracks,
+ Id::kTrackEntry,
+ Id::kAudio,
};
static constexpr Id kContentEncAesSettingsAncestory[] = {
Id::kSegment,
@@ -82,17 +91,26 @@
Id::kContentEncAesSettings,
};
static constexpr Id kCueTrackPositionsAncestory[] = {
- Id::kSegment, Id::kCues, Id::kCuePoint, Id::kCueTrackPositions,
+ Id::kSegment,
+ Id::kCues,
+ Id::kCuePoint,
+ Id::kCueTrackPositions,
};
static constexpr Id kChapterDisplayAncestory[] = {
Id::kSegment, Id::kChapters, Id::kEditionEntry,
Id::kChapterAtom, Id::kChapterDisplay,
};
static constexpr Id kTargetsAncestory[] = {
- Id::kSegment, Id::kTags, Id::kTag, Id::kTargets,
+ Id::kSegment,
+ Id::kTags,
+ Id::kTag,
+ Id::kTargets,
};
static constexpr Id kSimpleTagAncestory[] = {
- Id::kSegment, Id::kTags, Id::kTag, Id::kSimpleTag,
+ Id::kSegment,
+ Id::kTags,
+ Id::kTag,
+ Id::kSimpleTag,
};
switch (id) {
diff --git a/webm_parser/tests/block_parser_test.cc b/webm_parser/tests/block_parser_test.cc
index bdb58b5..9768b68 100644
--- a/webm_parser/tests/block_parser_test.cc
+++ b/webm_parser/tests/block_parser_test.cc
@@ -69,7 +69,8 @@
// Data.
{
0x81, // Track number = 1.
- 0x00, 0x00, // Timecode = 0.
+ 0x00,
+ 0x00, // Timecode = 0.
0x86, // Flags = key_frame | ebml_lacing.
0x00, // Lace count - 1 = 0 (1 frame).
@@ -97,7 +98,8 @@
// Data.
{
0x81, // Track number = 1.
- 0x00, 0x00, // Timecode = 0.
+ 0x00,
+ 0x00, // Timecode = 0.
0x82, // Flags = key_frame | xiph_lacing.
0x00, // Lace count - 1 = 0 (1 frame).
@@ -125,7 +127,8 @@
// Data.
{
0x81, // Track number = 1.
- 0x00, 0x00, // Timecode = 0.
+ 0x00,
+ 0x00, // Timecode = 0.
0x84, // Flags = key_frame | fixed_lacing.
0x00, // Lace count - 1 = 0 (1 frame).
@@ -148,6 +151,7 @@
};
// Test data for an EBML-laced block.
+// clang-format off
const TestData ebml_lacing = {
// Data.
{
@@ -318,6 +322,7 @@
// expected_frame_sizes
{510, 256, 2, 3},
};
+// clang-format on
// Test data for a fixed-laced block.
const TestData fixed_lacing = {
@@ -380,7 +385,8 @@
// Data.
{
0x81, // Track number = 1.
- 0x00, 0x00, // Timecode = 0.
+ 0x00,
+ 0x00, // Timecode = 0.
0x00, // Flags = 0.
// Lace data (1 frame).
@@ -407,7 +413,8 @@
// Data.
{
0x82, // Track number = 2.
- 0xFE, 0xDC, // Timecode = -292.
+ 0xFE,
+ 0xDC, // Timecode = -292.
0x08, // Flags = invisible.
// Lace data (1 frame).
@@ -433,8 +440,10 @@
const TestData simple_block_flags = {
// Data.
{
- 0x41, 0x23, // Track number = 291.
- 0x12, 0x34, // Timecode = 4660.
+ 0x41,
+ 0x23, // Track number = 291.
+ 0x12,
+ 0x34, // Timecode = 4660.
0x89, // Flags = key_frame | invisible | discardable.
// Lace data (1 frame).
diff --git a/webm_parser/tests/projection_parser_test.cc b/webm_parser/tests/projection_parser_test.cc
index 03ac502..747c4f5 100644
--- a/webm_parser/tests/projection_parser_test.cc
+++ b/webm_parser/tests/projection_parser_test.cc
@@ -15,8 +15,8 @@
using webm::ElementParserTest;
using webm::Id;
using webm::Projection;
-using webm::ProjectionType;
using webm::ProjectionParser;
+using webm::ProjectionType;
namespace {
