mkvmuxer: Move sources to mkvmuxer/ sub dir.

Change-Id: I22dff1e2ece102c294081ab2ec8600fdb872922e

CMakeLists.txt

@@ -40,6 +40,18 @@ endif ()
 set(CMAKE_CXX_FLAGS "-D__STDC_CONSTANT_MACROS ${CMAKE_CXX_FLAGS}")
 set(CMAKE_CXX_FLAGS "-D__STDC_LIMIT_MACROS ${CMAKE_CXX_FLAGS}")
 
+# mkvmuxer section.
+# TODO(tomfinegan): move to mkvmuxer/CMakeLists.txt
+add_library(mkvmuxer STATIC
+            "${LIBWEBM_SRC_DIR}/mkvmuxer/mkvmuxer.cpp"
+            "${LIBWEBM_SRC_DIR}/mkvmuxer/mkvmuxer.hpp"
+            "${LIBWEBM_SRC_DIR}/mkvmuxer/mkvmuxertypes.hpp"
+            "${LIBWEBM_SRC_DIR}/mkvmuxer/mkvmuxerutil.cpp"
+            "${LIBWEBM_SRC_DIR}/mkvmuxer/mkvmuxerutil.hpp"
+            "${LIBWEBM_SRC_DIR}/mkvmuxer/mkvwriter.cpp"
+            "${LIBWEBM_SRC_DIR}/mkvmuxer/mkvwriter.hpp"
+            "${LIBWEBM_SRC_DIR}/webmids.hpp")
+
 # mkvparser section.
 # TODO(tomfinegan): move to mkvparser/CMakeLists.txt.
 add_library(mkvparser STATIC
@@ -55,15 +67,8 @@ add_library(webm STATIC
             "${LIBWEBM_SRC_DIR}/common/file_util.h"
             "${LIBWEBM_SRC_DIR}/common/hdr_util.cc"
             "${LIBWEBM_SRC_DIR}/common/hdr_util.h"
-            "${LIBWEBM_SRC_DIR}/mkvmuxer.cpp"
-            "${LIBWEBM_SRC_DIR}/mkvmuxer.hpp"
-            "${LIBWEBM_SRC_DIR}/mkvmuxertypes.hpp"
-            "${LIBWEBM_SRC_DIR}/mkvmuxerutil.cpp"
-            "${LIBWEBM_SRC_DIR}/mkvmuxerutil.hpp"
-            "${LIBWEBM_SRC_DIR}/mkvwriter.cpp"
-            "${LIBWEBM_SRC_DIR}/mkvwriter.hpp"
             "${LIBWEBM_SRC_DIR}/webmids.hpp")
-target_link_libraries(webm LINK_PUBLIC mkvparser)
+target_link_libraries(webm LINK_PUBLIC mkvmuxer mkvparser)
 
 if (WIN32)
   # Use libwebm and libwebm.lib for project and library name on Windows (instead

Makefile.unix

@@ -4,7 +4,7 @@ INCLUDES  := -I.
 CXXFLAGS  := -W -Wall -g -MMD -MP $(DEFINES) $(INCLUDES)
 LIBWEBMA  := libwebm.a
 LIBWEBMSO := libwebm.so
-WEBMOBJS  := mkvmuxer.o mkvmuxerutil.o mkvwriter.o
+WEBMOBJS  := mkvmuxer/mkvmuxer.o mkvmuxer/mkvmuxerutil.o mkvmuxer/mkvwriter.o
 WEBMOBJS  += mkvparser/mkvparser.o mkvparser/mkvreader.o
 WEBMOBJS  += common/file_util.o common/hdr_util.o
 OBJSA     := $(WEBMOBJS:.o=_a.o)

common/file_util.h

@@ -12,7 +12,7 @@
 
 #include <string>
 
-#include "../mkvmuxertypes.hpp"  // LIBWEBM_DISALLOW_COPY_AND_ASSIGN()
+#include "mkvmuxer/mkvmuxertypes.hpp"  // LIBWEBM_DISALLOW_COPY_AND_ASSIGN()
 
 namespace libwebm {
 

common/hdr_util.h

@@ -10,7 +10,7 @@
 
 #include <memory>
 
-#include "../mkvmuxer.hpp"
+#include "mkvmuxer/mkvmuxer.hpp"
 
 namespace libwebm {
 

mkvmuxer/mkvmuxer.cpp

@@ -6,9 +6,7 @@
 // in the file PATENTS.  All contributing project authors may
 // be found in the AUTHORS file in the root of the source tree.
 
-#include "mkvmuxer.hpp"
-
-#include <stdint.h>
+#include "mkvmuxer/mkvmuxer.hpp"
 
 #include <cfloat>
 #include <climits>
@@ -19,9 +17,9 @@
 #include <new>
 #include <vector>
 
-#include "mkvmuxerutil.hpp"
+#include "mkvmuxer/mkvmuxerutil.hpp"
+#include "mkvmuxer/mkvwriter.hpp"
 #include "mkvparser/mkvparser.hpp"
-#include "mkvwriter.hpp"
 #include "webmids.hpp"
 
 #ifdef _MSC_VER

mkvmuxer/mkvmuxer.hpp

@@ -6,8 +6,8 @@
 // in the file PATENTS.  All contributing project authors may
 // be found in the AUTHORS file in the root of the source tree.
 
-#ifndef MKVMUXER_HPP
-#define MKVMUXER_HPP
+#ifndef MKVMUXER_MKVMUXER_HPP_
+#define MKVMUXER_MKVMUXER_HPP_
 
 #include <stdint.h>
 
@@ -15,7 +15,7 @@
 #include <list>
 #include <map>
 
-#include "mkvmuxertypes.hpp"
+#include "mkvmuxer/mkvmuxertypes.hpp"
 #include "webmids.hpp"
 
 // For a description of the WebM elements see
@@ -1683,4 +1683,4 @@ class Segment {
 }  // namespace mkvmuxer
 }  // namespace libwebm
 
-#endif  // MKVMUXER_HPP
+#endif  // MKVMUXER_MKVMUXER_HPP_

mkvmuxer/mkvmuxertypes.hpp

@@ -6,8 +6,8 @@
 // in the file PATENTS.  All contributing project authors may
 // be found in the AUTHORS file in the root of the source tree.
 
-#ifndef MKVMUXERTYPES_HPP
-#define MKVMUXERTYPES_HPP
+#ifndef MKVMUXER_MKVMUXERTYPES_HPP_
+#define MKVMUXER_MKVMUXERTYPES_HPP_
 
 // Copied from Chromium basictypes.h
 // A macro to disallow the copy constructor and operator= functions
@@ -16,4 +16,4 @@
   TypeName(const TypeName&);                       \
   void operator=(const TypeName&)
 
-#endif  // MKVMUXERTYPES_HPP
+#endif  // MKVMUXER_MKVMUXERTYPES_HPP_

mkvmuxer/mkvmuxerutil.cpp

@@ -6,14 +6,12 @@
 // in the file PATENTS.  All contributing project authors may
 // be found in the AUTHORS file in the root of the source tree.
 
-#include "mkvmuxerutil.hpp"
+#include "mkvmuxer/mkvmuxerutil.hpp"
 
 #ifdef __ANDROID__
 #include <fcntl.h>
 #endif
 
-#include <stdint.h>
-
 #include <cassert>
 #include <cmath>
 #include <cstdio>
@@ -22,8 +20,8 @@
 #include <ctime>
 #include <new>
 
-#include "mkvmuxer.hpp"
-#include "mkvwriter.hpp"
+#include "mkvmuxer/mkvmuxer.hpp"
+#include "mkvmuxer/mkvwriter.hpp"
 #include "webmids.hpp"
 
 #ifdef _MSC_VER

mkvmuxer/mkvmuxerutil.hpp

@@ -5,8 +5,8 @@
 // tree. An additional intellectual property rights grant can be found
 // in the file PATENTS.  All contributing project authors may
 // be found in the AUTHORS file in the root of the source tree.
-#ifndef MKVMUXERUTIL_HPP
-#define MKVMUXERUTIL_HPP
+#ifndef MKVMUXER_MKVMUXERUTIL_HPP_
+#define MKVMUXER_MKVMUXERUTIL_HPP_
 
 #include <stdint.h>
 
@@ -82,4 +82,4 @@ uint64_t MakeUID(unsigned int* seed);
 }  // namespace mkvmuxer
 }  // namespace libwebm
 
-#endif  // MKVMUXERUTIL_HPP
+#endif  // MKVMUXER_MKVMUXERUTIL_HPP_

mkvmuxer/mkvwriter.cpp

@@ -6,7 +6,7 @@
 // in the file PATENTS.  All contributing project authors may
 // be found in the AUTHORS file in the root of the source tree.
 
-#include "mkvwriter.hpp"
+#include "mkvmuxer/mkvwriter.hpp"
 
 #ifdef _MSC_VER
 #include <share.h>  // for _SH_DENYWR

mkvmuxer/mkvwriter.hpp

@@ -6,13 +6,13 @@
 // in the file PATENTS.  All contributing project authors may
 // be found in the AUTHORS file in the root of the source tree.
 
-#ifndef MKVWRITER_HPP
-#define MKVWRITER_HPP
+#ifndef MKVMUXER_MKVWRITER_HPP_
+#define MKVMUXER_MKVWRITER_HPP_
 
 #include <stdio.h>
 
-#include "mkvmuxer.hpp"
-#include "mkvmuxertypes.hpp"
+#include "mkvmuxer/mkvmuxer.hpp"
+#include "mkvmuxer/mkvmuxertypes.hpp"
 
 namespace libwebm {
 namespace mkvmuxer {
@@ -50,4 +50,4 @@ class MkvWriter : public IMkvWriter {
 }  // namespace mkvmuxer
 }  // namespace libwebm
 
-#endif  // MKVWRITER_HPP
+#endif  // MKVMUXER_MKVWRITER_HPP_

sample_muxer.cpp

@@ -23,9 +23,9 @@
 #include "mkvparser/mkvreader.hpp"
 
 // libwebm mkvmuxer includes
-#include "mkvmuxer.hpp"
-#include "mkvmuxertypes.hpp"
-#include "mkvwriter.hpp"
+#include "mkvmuxer/mkvmuxer.hpp"
+#include "mkvmuxer/mkvmuxertypes.hpp"
+#include "mkvmuxer/mkvwriter.hpp"
 
 #include "sample_muxer_metadata.h"
 

sample_muxer_metadata.cc

@@ -14,7 +14,7 @@
 #include <cstdio>
 #include <string>
 
-#include "mkvmuxer.hpp"
+#include "mkvmuxer/mkvmuxer.hpp"
 #include "webvtt/vttreader.h"
 
 namespace libwebm {

testing/muxer_tests.cc

@@ -20,9 +20,9 @@
 
 #include "common/file_util.h"
 #include "common/libwebm_util.h"
-#include "mkvmuxer.hpp"
+#include "mkvmuxer/mkvmuxer.hpp"
+#include "mkvmuxer/mkvwriter.hpp"
 #include "mkvparser/mkvreader.hpp"
-#include "mkvwriter.hpp"
 #include "testing/test_util.h"
 
 #ifdef _MSC_VER