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

clang-format on sample_muxer_metadata.(cc|h)

Browse Source 
Conformance of sample_muxer_metadata.(cc|h) to Google C++ style guide.

Change-Id: I500a8cdbc443981ecae6ac2a7d8de7cab1c72e28
This commit is contained in:
Vignesh Venkatasubramanian 2014-04-14 12:09:20 -07:00
parent fb6b6e6444
commit 1a0130d069
2 changed files with 15 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
sample_muxer_metadata.cc
View File

@ -13,8 +13,7 @@
#include <string> #include <string>
#include "vttreader.h" #include "vttreader.h"
SampleMuxerMetadata::SampleMuxerMetadata() : segment_(NULL) { SampleMuxerMetadata::SampleMuxerMetadata() : segment_(NULL) {}
}
bool SampleMuxerMetadata::Init(mkvmuxer::Segment* segment) { bool SampleMuxerMetadata::Init(mkvmuxer::Segment* segment) {
if (segment == NULL || segment_ != NULL) if (segment == NULL || segment_ != NULL)
@ -93,9 +92,8 @@ bool SampleMuxerMetadata::LoadChapters(const char* file) {
return true; return true;
} }
bool SampleMuxerMetadata::ParseChapters( bool SampleMuxerMetadata::ParseChapters(const char* file,
const char* file, cue_list_t* cues_ptr) {
cue_list_t* cues_ptr) {
cue_list_t& cues = *cues_ptr; cue_list_t& cues = *cues_ptr;
cues.clear(); cues.clear();
@ -199,9 +197,7 @@ bool SampleMuxerMetadata::AddChapter(const cue_t& cue) {
return true; return true;
} }
bool SampleMuxerMetadata::AddTrack( bool SampleMuxerMetadata::AddTrack(Kind kind, mkvmuxer::uint64* track_num) {
Kind kind,
mkvmuxer::uint64* track_num) {
*track_num = 0; *track_num = 0;
// Track number value 0 means "let muxer choose track number" // Track number value 0 means "let muxer choose track number"
@ -249,10 +245,8 @@ bool SampleMuxerMetadata::AddTrack(
return true; return true;
} }
bool SampleMuxerMetadata::Parse( bool SampleMuxerMetadata::Parse(const char* file, Kind /* kind */,
const char* file, mkvmuxer::uint64 track_num) {
Kind /* kind */,
mkvmuxer::uint64 track_num) {
libwebvtt::VttReader r; libwebvtt::VttReader r;
int e = r.Open(file); int e = r.Open(file);
@ -311,16 +305,14 @@ void SampleMuxerMetadata::MakeFrame(const cue_t& c, std::string* pf) {
WriteCuePayload(c.payload, pf); WriteCuePayload(c.payload, pf);
} }
void SampleMuxerMetadata::WriteCueIdentifier( void SampleMuxerMetadata::WriteCueIdentifier(const std::string& identifier,
const std::string& identifier, std::string* pf) {
std::string* pf) {
pf->append(identifier); pf->append(identifier);
pf->push_back('\x0A'); // LF pf->push_back('\x0A'); // LF
} }
void SampleMuxerMetadata::WriteCueSettings( void SampleMuxerMetadata::WriteCueSettings(const cue_t::settings_t& settings,
const cue_t::settings_t& settings, std::string* pf) {
std::string* pf) {
if (settings.empty()) { if (settings.empty()) {
pf->push_back('\x0A'); // LF pf->push_back('\x0A'); // LF
return; return;
@ -347,9 +339,8 @@ void SampleMuxerMetadata::WriteCueSettings(
pf->push_back('\x0A'); // LF pf->push_back('\x0A'); // LF
} }
void SampleMuxerMetadata::WriteCuePayload( void SampleMuxerMetadata::WriteCuePayload(const cue_t::payload_t& payload,
const cue_t::payload_t& payload, std::string* pf) {
std::string* pf) {
typedef cue_t::payload_t::const_iterator iter_t; typedef cue_t::payload_t::const_iterator iter_t;
iter_t i = payload.begin(); iter_t i = payload.begin();
@ -362,8 +353,7 @@ void SampleMuxerMetadata::WriteCuePayload(
} }
} }
bool SampleMuxerMetadata::SortableCue::Write( bool SampleMuxerMetadata::SortableCue::Write(mkvmuxer::Segment* segment) const {
mkvmuxer::Segment* segment) const {
// Cue start time expressed in milliseconds // Cue start time expressed in milliseconds
const mkvmuxer::int64 start_ms = cue.start_time.presentation(); const mkvmuxer::int64 start_ms = cue.start_time.presentation();

11
sample_muxer_metadata.h
View File

@ -17,13 +17,7 @@
class SampleMuxerMetadata { class SampleMuxerMetadata {
public: public:
enum Kind { enum Kind { kSubtitles, kCaptions, kDescriptions, kMetadata, kChapters };
kSubtitles,
kCaptions,
kDescriptions,
kMetadata,
kChapters
};
SampleMuxerMetadata(); SampleMuxerMetadata();
@ -86,8 +80,7 @@ class SampleMuxerMetadata {
// Parse the WebVTT chapters in |file| to populate |cues|. Returns // Parse the WebVTT chapters in |file| to populate |cues|. Returns
// false on error. // false on error.
static bool ParseChapters(const char* file, static bool ParseChapters(const char* file, cue_list_t* cues);
cue_list_t* cues);
// Adds WebVTT cue |chapter| to the chapters element of the output // Adds WebVTT cue |chapter| to the chapters element of the output
// file's segment element. Returns false on error. // file's segment element. Returns false on error.