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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -6,9 +6,8 @@ WEBMOBJS := mkvparser.o mkvreader.o mkvmuxer.o mkvmuxerutil.o mkvwriter.o
OBJSA := $(WEBMOBJS:.o=_a.o) OBJSA := $(WEBMOBJS:.o=_a.o)
OBJSSO := $(WEBMOBJS:.o=_so.o) OBJSSO := $(WEBMOBJS:.o=_so.o)
OBJECTS1 := sample.o OBJECTS1 := sample.o
OBJECTS2 := sample_muxer.o OBJECTS2 := sample_muxer.o vttreader.o webvttparser.o sample_muxer_metadata.o
OBJECTS3 := dumpvtt.o vttreader.o webvttparser.o OBJECTS3 := dumpvtt.o vttreader.o webvttparser.o
OBJECTS4 := vttreader.o webvttparser.o sample_muxer_metadata.o
INCLUDES := -I. INCLUDES := -I.
EXES := samplemuxer sample dumpvtt EXES := samplemuxer sample dumpvtt
@ -17,7 +16,7 @@ all: $(EXES)
sample: sample.o $(LIBWEBMA) sample: sample.o $(LIBWEBMA)
$(CXX) $^ -o $@ $(CXX) $^ -o $@
samplemuxer: sample_muxer.o $(LIBWEBMA) $(OBJECTS4) samplemuxer: $(OBJECTS2) $(LIBWEBMA)
$(CXX) $^ -o $@ $(CXX) $^ -o $@
dumpvtt: $(OBJECTS3) dumpvtt: $(OBJECTS3)
@ -41,4 +40,4 @@ libwebm.so: $(OBJSSO)
$(CXX) -c $(CXXFLAGS) -fPIC $(INCLUDES) $< -o $@ $(CXX) -c $(CXXFLAGS) -fPIC $(INCLUDES) $< -o $@
clean: clean:
$(RM) -f $(OBJECTS1) $(OBJECTS2) $(OBJECTS3) $(OBJECTS4) $(OBJSA) $(OBJSSO) $(LIBWEBMA) $(LIBWEBMSO) $(EXES) Makefile.bak $(RM) -f $(OBJECTS1) $(OBJECTS2) $(OBJECTS3) $(OBJSA) $(OBJSSO) $(LIBWEBMA) $(LIBWEBMSO) $(EXES) Makefile.bak

8
sample_muxer.cpp
View File

@ -131,7 +131,7 @@ int ParseArgWebVTT(
return 0; // not a WebVTT arg return 0; // not a WebVTT arg
} }
} // end namespace } // end namespace
int main(int argc, char* argv[]) { int main(int argc, char* argv[]) {
char* input = NULL; char* input = NULL;
@ -399,7 +399,11 @@ int main(int argc, char* argv[]) {
// input file. // input file.
SampleMuxerMetadata metadata; SampleMuxerMetadata metadata;
metadata.Init(&muxer_segment);
if (!metadata.Init(&muxer_segment)) {
printf("\n Could not initialize metadata cache.\n");
return EXIT_FAILURE;
}
if (!LoadMetadataFiles(metadata_files, &metadata)) if (!LoadMetadataFiles(metadata_files, &metadata))
return EXIT_FAILURE; return EXIT_FAILURE;

44
sample_muxer_metadata.cc
View File

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

5
sample_muxer_metadata.h
View File

@ -26,8 +26,9 @@ class SampleMuxerMetadata {
SampleMuxerMetadata(); SampleMuxerMetadata();
// Bind this metadata object to the muxer instance. // Bind this metadata object to the muxer instance. Returns false
void Init(mkvmuxer::Segment* segment); // if segment equals NULL, or Init has already been called.
bool Init(mkvmuxer::Segment* segment);
// Parse the WebVTT file |filename| having the indicated |kind|, and // Parse the WebVTT file |filename| having the indicated |kind|, and
// create a corresponding track in the segment. Returns false on // create a corresponding track in the segment. Returns false on