Namespace reorg: Make everything a child of libwebm.

(that is not already)
Some details:
- mkvmuxer and mkvparser wrapped by libwebm
- Matroska element constants moved from mkvmuxer to libwebm
- integer types moved from mkvmuxer to libwebm

Change-Id: Ic91e887e50adbc2d735bf6264534a5d01135df31

sample_muxer_metadata.cc

@@ -17,6 +17,8 @@
 #include "mkvmuxer.hpp"
 #include "vttreader.h"
 
+namespace libwebm {
+
 SampleMuxerMetadata::SampleMuxerMetadata() : segment_(NULL) {}
 
 bool SampleMuxerMetadata::Init(mkvmuxer::Segment* segment) {
@@ -31,7 +33,7 @@ bool SampleMuxerMetadata::Load(const char* file, Kind kind) {
   if (kind == kChapters)
     return LoadChapters(file);
 
-  mkvmuxer::uint64 track_num;
+  uint64 track_num;
 
   if (!AddTrack(kind, &track_num)) {
     printf("Unable to add track for WebVTT file \"%s\"\n", file);
@@ -56,7 +58,7 @@ bool SampleMuxerMetadata::AddChapters() {
   return true;
 }
 
-bool SampleMuxerMetadata::Write(mkvmuxer::int64 time_ns) {
+bool SampleMuxerMetadata::Write(int64 time_ns) {
   typedef cues_set_t::iterator iter_t;
 
   iter_t i = cues_set_.begin();
@@ -172,8 +174,8 @@ bool SampleMuxerMetadata::AddChapter(const cue_t& cue) {
   const time_ms_t stop_time_ms = cue.stop_time.presentation();
 
   enum { kNsPerMs = 1000000 };
-  const mkvmuxer::uint64 start_time_ns = start_time_ms * kNsPerMs;
-  const mkvmuxer::uint64 stop_time_ns = stop_time_ms * kNsPerMs;
+  const uint64 start_time_ns = start_time_ms * kNsPerMs;
+  const uint64 stop_time_ns = stop_time_ms * kNsPerMs;
 
   chapter->set_time(*segment_, start_time_ns, stop_time_ns);
 
@@ -201,7 +203,7 @@ bool SampleMuxerMetadata::AddChapter(const cue_t& cue) {
   return true;
 }
 
-bool SampleMuxerMetadata::AddTrack(Kind kind, mkvmuxer::uint64* track_num) {
+bool SampleMuxerMetadata::AddTrack(Kind kind, uint64* track_num) {
   *track_num = 0;
 
   // Track number value 0 means "let muxer choose track number"
@@ -250,7 +252,7 @@ bool SampleMuxerMetadata::AddTrack(Kind kind, mkvmuxer::uint64* track_num) {
 }
 
 bool SampleMuxerMetadata::Parse(const char* file, Kind /* kind */,
-                                mkvmuxer::uint64 track_num) {
+                                uint64 track_num) {
   libwebvtt::VttReader r;
   int e = r.Open(file);
 
@@ -359,26 +361,26 @@ void SampleMuxerMetadata::WriteCuePayload(const cue_t::payload_t& payload,
 
 bool SampleMuxerMetadata::SortableCue::Write(mkvmuxer::Segment* segment) const {
   // Cue start time expressed in milliseconds
-  const mkvmuxer::int64 start_ms = cue.start_time.presentation();
+  const int64 start_ms = cue.start_time.presentation();
 
   // Cue start time expressed in nanoseconds (MKV time)
-  const mkvmuxer::int64 start_ns = start_ms * 1000000;
+  const int64 start_ns = start_ms * 1000000;
 
   // Cue stop time expressed in milliseconds
-  const mkvmuxer::int64 stop_ms = cue.stop_time.presentation();
+  const int64 stop_ms = cue.stop_time.presentation();
 
   // Cue stop time expressed in nanonseconds
-  const mkvmuxer::int64 stop_ns = stop_ms * 1000000;
+  const int64 stop_ns = stop_ms * 1000000;
 
   // Metadata blocks always specify the block duration.
-  const mkvmuxer::int64 duration_ns = stop_ns - start_ns;
+  const int64 duration_ns = stop_ns - start_ns;
 
   std::string frame;
   MakeFrame(cue, &frame);
 
-  typedef const mkvmuxer::uint8* data_t;
+  typedef const uint8* data_t;
   const data_t buf = reinterpret_cast<data_t>(frame.data());
-  const mkvmuxer::uint64 len = frame.length();
+  const uint64 len = frame.length();
 
   mkvmuxer::Frame muxer_frame;
   if (!muxer_frame.Init(buf, len))
@@ -389,3 +391,5 @@ bool SampleMuxerMetadata::SortableCue::Write(mkvmuxer::Segment* segment) const {
   muxer_frame.set_is_key(true);  // All metadata frames are keyframes.
   return segment->AddGenericFrame(&muxer_frame);
 }
+
+}  // namespace libwebm