generic-library/webm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

clang-format re-run

Browse Source 
Re-run clang-format to pick up some missed changes over the past
few CLs. Also update the .clang-format file to break after ternary
operator.

Change-Id: Ia4ba4e58362c2dbe36aeb33894f0411af33ef17d
This commit is contained in:
Vignesh Venkatasubramanian 2015-06-04 16:48:48 -07:00
parent d6d04acdcc
commit 7affc5c3f8
5 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.clang-format
View File

@ -12,7 +12,7 @@ AllowShortFunctionsOnASingleLine: true
AlwaysBreakTemplateDeclarations: true AlwaysBreakTemplateDeclarations: true
AlwaysBreakBeforeMultilineStrings: true AlwaysBreakBeforeMultilineStrings: true
BreakBeforeBinaryOperators: false BreakBeforeBinaryOperators: false
BreakBeforeTernaryOperators: true BreakBeforeTernaryOperators: false
BreakConstructorInitializersBeforeComma: false BreakConstructorInitializersBeforeComma: false
BinPackParameters: true BinPackParameters: true
ColumnLimit: 80 ColumnLimit: 80

7
mkvmuxer.cpp
View File

@ -1539,9 +1539,7 @@ bool Cluster::Init(IMkvWriter* ptr_writer) {
return true; return true;
} }
bool Cluster::AddFrame(const Frame* const frame) { bool Cluster::AddFrame(const Frame* const frame) { return DoWriteFrame(frame); }
return DoWriteFrame(frame);
}
bool Cluster::AddFrame(const uint8* data, uint64 length, uint64 track_number, bool Cluster::AddFrame(const uint8* data, uint64 length, uint64 track_number,
uint64 abs_timecode, bool is_key) { uint64 abs_timecode, bool is_key) {
@ -2848,7 +2846,8 @@ bool Segment::CheckHeaderInfo() {
void Segment::UpdateDocTypeVersion() { void Segment::UpdateDocTypeVersion() {
for (uint32 index = 0; index < tracks_.track_entries_size(); ++index) { for (uint32 index = 0; index < tracks_.track_entries_size(); ++index) {
const Track* track = tracks_.GetTrackByIndex(index); const Track* track = tracks_.GetTrackByIndex(index);
if (track == NULL) break; if (track == NULL)
break;
if ((track->codec_delay() || track->seek_pre_roll()) && if ((track->codec_delay() || track->seek_pre_roll()) &&
doc_type_version_ < 4) { doc_type_version_ < 4) {
doc_type_version_ = 4; doc_type_version_ = 4;

6
mkvmuxerutil.cpp
View File

@ -542,9 +542,9 @@ uint64 WriteFrame(IMkvWriter* writer, const Frame* const frame,
if (relative_timecode < 0 || relative_timecode > kMaxBlockTimecode) if (relative_timecode < 0 || relative_timecode > kMaxBlockTimecode)
return 0; return 0;
return frame->CanBeSimpleBlock() return frame->CanBeSimpleBlock() ?
? WriteSimpleBlock(writer, frame, relative_timecode) WriteSimpleBlock(writer, frame, relative_timecode) :
: WriteBlock(writer, frame, relative_timecode, WriteBlock(writer, frame, relative_timecode,
cluster->timecode_scale()); cluster->timecode_scale());
} }

4
sample_muxer.cpp
View File

@ -494,8 +494,8 @@ int main(int argc, char* argv[]) {
mkvmuxer::Frame muxer_frame; mkvmuxer::Frame muxer_frame;
if (!muxer_frame.Init(data, data_len)) if (!muxer_frame.Init(data, data_len))
return EXIT_FAILURE; return EXIT_FAILURE;
muxer_frame.set_track_number( muxer_frame.set_track_number(track_type == Track::kAudio ? aud_track :
track_type == Track::kAudio ? aud_track : vid_track); vid_track);
if (block->GetDiscardPadding()) if (block->GetDiscardPadding())
muxer_frame.set_discard_padding(block->GetDiscardPadding()); muxer_frame.set_discard_padding(block->GetDiscardPadding());
muxer_frame.set_timestamp(time_ns); muxer_frame.set_timestamp(time_ns);