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

Merge "clang-format on sample_muxer.cpp"

Browse Source
This commit is contained in:
Vignesh Venkatasubramanian 2014-04-25 22:08:27 -07:00 committed by Gerrit Code Review
commit 3402e12d1a
1 changed files with 44 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
sample_muxer.cpp
View File

@ -62,16 +62,16 @@ void Usage() {
printf(" -cues_before_clusters <int> >0 puts Cues before Clusters\n"); printf(" -cues_before_clusters <int> >0 puts Cues before Clusters\n");
printf("\n"); printf("\n");
printf("Metadata options:\n"); printf("Metadata options:\n");
printf(" -webvtt-subtitles <vttfile> " printf(" -webvtt-subtitles <vttfile> ");
"add WebVTT subtitles as metadata track\n"); printf("add WebVTT subtitles as metadata track\n");
printf(" -webvtt-captions <vttfile> " printf(" -webvtt-captions <vttfile> ");
"add WebVTT captions as metadata track\n"); printf("add WebVTT captions as metadata track\n");
printf(" -webvtt-descriptions <vttfile> " printf(" -webvtt-descriptions <vttfile> ");
"add WebVTT descriptions as metadata track\n"); printf("add WebVTT descriptions as metadata track\n");
printf(" -webvtt-metadata <vttfile> " printf(" -webvtt-metadata <vttfile> ");
"add WebVTT subtitles as metadata track\n"); printf("add WebVTT subtitles as metadata track\n");
printf(" -webvtt-chapters <vttfile> " printf(" -webvtt-chapters <vttfile> ");
"add WebVTT chapters as MKV chapters element\n"); printf("add WebVTT chapters as MKV chapters element\n");
} }
struct MetadataFile { struct MetadataFile {
@ -82,8 +82,7 @@ struct MetadataFile {
typedef std::list<MetadataFile> metadata_files_t; typedef std::list<MetadataFile> metadata_files_t;
// Cache the WebVTT filenames specified as command-line args. // Cache the WebVTT filenames specified as command-line args.
bool LoadMetadataFiles( bool LoadMetadataFiles(const metadata_files_t& files,
const metadata_files_t& files,
SampleMuxerMetadata* metadata) { SampleMuxerMetadata* metadata) {
typedef metadata_files_t::const_iterator iter_t; typedef metadata_files_t::const_iterator iter_t;
@ -100,22 +99,21 @@ bool LoadMetadataFiles(
return true; return true;
} }
int ParseArgWebVTT( int ParseArgWebVTT(char* argv[], int* argv_index, int argc_check,
char* argv[],
int* argv_index,
int argc_check,
metadata_files_t* metadata_files) { metadata_files_t* metadata_files) {
int& i = *argv_index; int& i = *argv_index;
enum { kCount = 5 }; enum { kCount = 5 };
struct Arg { const char* name; SampleMuxerMetadata::Kind kind; }; struct Arg {
const char* name;
SampleMuxerMetadata::Kind kind;
};
const Arg args[kCount] = { const Arg args[kCount] = {
{"-webvtt-subtitles", SampleMuxerMetadata::kSubtitles}, {"-webvtt-subtitles", SampleMuxerMetadata::kSubtitles},
{"-webvtt-captions", SampleMuxerMetadata::kCaptions}, {"-webvtt-captions", SampleMuxerMetadata::kCaptions},
{"-webvtt-descriptions", SampleMuxerMetadata::kDescriptions}, {"-webvtt-descriptions", SampleMuxerMetadata::kDescriptions},
{"-webvtt-metadata", SampleMuxerMetadata::kMetadata}, {"-webvtt-metadata", SampleMuxerMetadata::kMetadata},
{ "-webvtt-chapters", SampleMuxerMetadata::kChapters } {"-webvtt-chapters", SampleMuxerMetadata::kChapters}};
};
for (int idx = 0; idx < kCount; ++idx) { for (int idx = 0; idx < kCount; ++idx) {
const Arg& arg = args[idx]; const Arg& arg = args[idx];
@ -202,8 +200,7 @@ int main(int argc, char* argv[]) {
cues_on_video_track = false; cues_on_video_track = false;
} else if (!strcmp("-max_cluster_duration", argv[i]) && i < argc_check) { } else if (!strcmp("-max_cluster_duration", argv[i]) && i < argc_check) {
const double seconds = strtod(argv[++i], &end); const double seconds = strtod(argv[++i], &end);
max_cluster_duration = max_cluster_duration = static_cast<uint64>(seconds * 1000000000.0);
static_cast<uint64>(seconds * 1000000000.0);
} else if (!strcmp("-max_cluster_size", argv[i]) && i < argc_check) { } else if (!strcmp("-max_cluster_size", argv[i]) && i < argc_check) {
max_cluster_size = strtol(argv[++i], &end, 10); max_cluster_size = strtol(argv[++i], &end, 10);
} else if (!strcmp("-switch_tracks", argv[i]) && i < argc_check) { } else if (!strcmp("-switch_tracks", argv[i]) && i < argc_check) {
@ -249,9 +246,8 @@ int main(int argc, char* argv[]) {
ebml_header.Parse(&reader, pos); ebml_header.Parse(&reader, pos);
mkvparser::Segment* parser_segment; mkvparser::Segment* parser_segment;
long long ret = mkvparser::Segment::CreateInstance(&reader, long long ret =
pos, mkvparser::Segment::CreateInstance(&reader, pos, parser_segment);
parser_segment);
if (ret) { if (ret) {
printf("\n Segment::CreateInstance() failed."); printf("\n Segment::CreateInstance() failed.");
return EXIT_FAILURE; return EXIT_FAILURE;
@ -342,8 +338,7 @@ int main(int argc, char* argv[]) {
return EXIT_FAILURE; return EXIT_FAILURE;
} }
mkvmuxer::VideoTrack* const video = mkvmuxer::VideoTrack* const video = static_cast<mkvmuxer::VideoTrack*>(
static_cast<mkvmuxer::VideoTrack*>(
muxer_segment.GetTrackByNumber(vid_track)); muxer_segment.GetTrackByNumber(vid_track));
if (!video) { if (!video) {
printf("\n Could not get video track.\n"); printf("\n Could not get video track.\n");
@ -382,8 +377,7 @@ int main(int argc, char* argv[]) {
return EXIT_FAILURE; return EXIT_FAILURE;
} }
mkvmuxer::AudioTrack* const audio = mkvmuxer::AudioTrack* const audio = static_cast<mkvmuxer::AudioTrack*>(
static_cast<mkvmuxer::AudioTrack*>(
muxer_segment.GetTrackByNumber(aud_track)); muxer_segment.GetTrackByNumber(aud_track));
if (!audio) { if (!audio) {
printf("\n Could not get audio track.\n"); printf("\n Could not get audio track.\n");
@ -462,8 +456,7 @@ int main(int argc, char* argv[]) {
const mkvparser::Block* const block = block_entry->GetBlock(); const mkvparser::Block* const block = block_entry->GetBlock();
const long long trackNum = block->GetTrackNumber(); const long long trackNum = block->GetTrackNumber();
const mkvparser::Track* const parser_track = const mkvparser::Track* const parser_track =
parser_tracks->GetTrackByNumber( parser_tracks->GetTrackByNumber(static_cast<unsigned long>(trackNum));
static_cast<unsigned long>(trackNum));
const long long track_type = parser_track->GetType(); const long long track_type = parser_track->GetType();
const long long time_ns = block->GetTime(cluster); const long long time_ns = block->GetTime(cluster);
@ -498,17 +491,11 @@ int main(int argc, char* argv[]) {
bool frame_added = false; bool frame_added = false;
if (discard_padding) { if (discard_padding) {
frame_added = frame_added = muxer_segment.AddFrameWithDiscardPadding(
muxer_segment.AddFrameWithDiscardPadding(data, frame.len, data, frame.len, discard_padding, track_num, time_ns, is_key);
discard_padding,
track_num,
time_ns,
is_key);
} else { } else {
frame_added = muxer_segment.AddFrame(data, frame.len, frame_added = muxer_segment.AddFrame(data, frame.len, track_num,
track_num, time_ns, is_key);
time_ns,
is_key);
} }
if (!frame_added) { if (!frame_added) {
printf("\n Could not add frame.\n"); printf("\n Could not add frame.\n");