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

reapply clang-format

Browse Source 
Change-Id: Ic04e8429b07fe9b7dc15dc836d16ba9f30317ee2
This commit is contained in:
clang-format
2016-03-16 12:18:08 -07:00
committed by James Zern
parent 8d3421503f
commit 91ca780522
6 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/libwebm_util.cc
View File

@@ -19,8 +19,7 @@ std::int64_t NanosecondsTo90KhzTicks(std::int64_t nanoseconds) {
} }
bool ParseVP9SuperFrameIndex(const std::uint8_t* frame, bool ParseVP9SuperFrameIndex(const std::uint8_t* frame,
std::size_t frame_length, std::size_t frame_length, Ranges* frame_ranges) {
Ranges* frame_ranges) {
if (frame == nullptr || frame_length == 0 || frame_ranges == nullptr) if (frame == nullptr || frame_length == 0 || frame_ranges == nullptr)
return false; return false;

3
common/libwebm_util.h
View File

@@ -46,8 +46,7 @@ std::int64_t NanosecondsTo90KhzTicks(std::int64_t nanoseconds);
// Returns true and stores frame offsets and lengths in |frame_ranges| when // Returns true and stores frame offsets and lengths in |frame_ranges| when
// |frame| has a valid VP9 super frame index. // |frame| has a valid VP9 super frame index.
bool ParseVP9SuperFrameIndex(const std::uint8_t* frame, bool ParseVP9SuperFrameIndex(const std::uint8_t* frame,
std::size_t frame_length, std::size_t frame_length, Ranges* frame_ranges);
Ranges* frame_ranges);
// Writes |val| to |fileptr| and returns true upon success. // Writes |val| to |fileptr| and returns true upon success.
bool WriteUint8(std::uint8_t val, std::FILE* fileptr); bool WriteUint8(std::uint8_t val, std::FILE* fileptr);

6
m2ts/webm2pes.h
View File

@@ -25,10 +25,8 @@ namespace libwebm {
// Maximum size is 64 bits. Users may call the Check() method to perform minimal // Maximum size is 64 bits. Users may call the Check() method to perform minimal
// validation (size > 0 and <= 64). // validation (size > 0 and <= 64).
struct PesHeaderField { struct PesHeaderField {
PesHeaderField(std::uint64_t value, PesHeaderField(std::uint64_t value, std::uint32_t size_in_bits,
std::uint32_t size_in_bits, std::uint8_t byte_index, std::uint8_t bits_to_shift)
std::uint8_t byte_index,
std::uint8_t bits_to_shift)
: bits(value), : bits(value),
num_bits(size_in_bits), num_bits(size_in_bits),
index(byte_index), index(byte_index),

6
testing/muxer_tests.cc
View File

@@ -28,7 +28,7 @@
#ifdef _MSC_VER #ifdef _MSC_VER
// Disable MSVC warnings that suggest making code non-portable. // Disable MSVC warnings that suggest making code non-portable.
#pragma warning(disable:4996) #pragma warning(disable : 4996)
#endif #endif
using ::mkvmuxer::AudioTrack; using ::mkvmuxer::AudioTrack;
@@ -46,9 +46,7 @@ namespace test {
// Base class containing boiler plate stuff. // Base class containing boiler plate stuff.
class MuxerTest : public testing::Test { class MuxerTest : public testing::Test {
public: public:
MuxerTest() { MuxerTest() { Init(); }
Init();
}
~MuxerTest() { CloseWriter(); } ~MuxerTest() { CloseWriter(); }

4
testing/test_util.cc
View File

@@ -9,7 +9,7 @@
#ifdef _MSC_VER #ifdef _MSC_VER
// Disable MSVC warnings that suggest making code non-portable. // Disable MSVC warnings that suggest making code non-portable.
#pragma warning(disable:4996) #pragma warning(disable : 4996)
#endif #endif
#include <cstdint> #include <cstdint>
@@ -59,7 +59,5 @@ bool CompareFiles(const std::string& file1, const std::string& file2) {
return std::feof(f1.get()) && std::feof(f2.get()); return std::feof(f1.get()) && std::feof(f2.get());
} }
} // namespace test } // namespace test
} // namespace libwebm } // namespace libwebm