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

sample_muxer: clean-up to conform to style guide

Browse Source 
Change-Id: I77a4657d71359777a8f55f40346014f90051e02d
This commit is contained in:
Matthew Heaney
2012-10-08 12:50:41 -07:00
parent 49078292b4
commit cb8899a920
4 changed files with 36 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
sample_muxer_metadata.cc
View File

@@ -7,8 +7,12 @@ using std::string;
SampleMuxerMetadata::SampleMuxerMetadata() : segment_(NULL) {
}
void SampleMuxerMetadata::Init(mkvmuxer::Segment* s) {
segment_ = s;
bool SampleMuxerMetadata::Init(mkvmuxer::Segment* segment) {
if (segment == NULL || segment_ != NULL)
return false;
segment_ = segment;
return true;
}
bool SampleMuxerMetadata::Load(const char* file, Kind kind) {
@@ -63,28 +67,28 @@ bool SampleMuxerMetadata::AddTrack(
const char* codec_id;
switch (kind) {
case kSubtitles:
type = 0x11;
codec_id = "D_WEBVTT/SUBTITLES";
break;
case kSubtitles:
type = 0x11;
codec_id = "D_WEBVTT/SUBTITLES";
break;
case kCaptions:
type = 0x11;
codec_id = "D_WEBVTT/CAPTIONS";
break;
case kCaptions:
type = 0x11;
codec_id = "D_WEBVTT/CAPTIONS";
break;
case kDescriptions:
type = 0x21;
codec_id = "D_WEBVTT/DESCRIPTIONS";
break;
case kDescriptions:
type = 0x21;
codec_id = "D_WEBVTT/DESCRIPTIONS";
break;
case kMetadata:
type = 0x21;
codec_id = "D_WEBVTT/METADATA";
break;
case kMetadata:
type = 0x21;
codec_id = "D_WEBVTT/METADATA";
break;
default:
return false;
default:
return false;
}
track->set_type(type);