webmts: Move PES/TS sources to m2ts sub directory.

Change-Id: I5c02b62460a6bf8dd73fb9274d1668a5a13af373

CMakeLists.txt

@@ -159,18 +159,18 @@ if (ENABLE_WEBMTS)
   add_library(webmts
               "${LIBWEBM_SRC_DIR}/common/libwebm_util.cc"
               "${LIBWEBM_SRC_DIR}/common/libwebm_util.h"
-              "${LIBWEBM_SRC_DIR}/webm2pes.cc"
-              "${LIBWEBM_SRC_DIR}/webm2pes.h"
-              "${LIBWEBM_SRC_DIR}/vpxpes2ts.cc"
-              "${LIBWEBM_SRC_DIR}/vpxpes2ts.h")
+              "${LIBWEBM_SRC_DIR}/m2ts/webm2pes.cc"
+              "${LIBWEBM_SRC_DIR}/m2ts/webm2pes.h"
+              "${LIBWEBM_SRC_DIR}/m2ts/vpxpes2ts.cc"
+              "${LIBWEBM_SRC_DIR}/m2ts/vpxpes2ts.h")
 
   # webm2pes section.
   add_executable(webm2pes
-                "${LIBWEBM_SRC_DIR}/webm2pes_main.cc")
+                "${LIBWEBM_SRC_DIR}/m2ts/webm2pes_main.cc")
   target_link_libraries(webm2pes LINK_PUBLIC webm webmts)
 
   # webm2ts section.
-  add_executable(webm2ts "${LIBWEBM_SRC_DIR}/vpxpes2ts_main.cc")
+  add_executable(webm2ts "${LIBWEBM_SRC_DIR}/m2ts/vpxpes2ts_main.cc")
   target_link_libraries(webm2ts LINK_PUBLIC webm webmts)
 endif ()
 
@@ -194,7 +194,7 @@ if (ENABLE_TESTS)
     add_executable(webm2pes_tests
                   "${LIBWEBM_SRC_DIR}/testing/test_util.cc"
                   "${LIBWEBM_SRC_DIR}/testing/test_util.h"
-                  "${LIBWEBM_SRC_DIR}/testing/webm2pes_tests.cc")
+                  "${LIBWEBM_SRC_DIR}/m2ts/tests/webm2pes_tests.cc")
     target_link_libraries(webm2pes_tests LINK_PUBLIC gtest webm webmts)
   endif ()
 endif ()

m2ts/tests/webm2pes_tests.cc

@@ -5,7 +5,7 @@
 // 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.
-#include "webm2pes.h"
+#include "m2ts/webm2pes.h"
 
 #include <cstdint>
 #include <cstdio>

m2ts/vpxpes2ts.cc

@@ -5,7 +5,7 @@
 // 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.
-#include "vpxpes2ts.h"
+#include "m2ts/vpxpes2ts.h"
 
 #include <algorithm>
 #include <cstdio>

m2ts/vpxpes2ts.h

@@ -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 LIBWEBM_VPXPES2TS_H_
-#define LIBWEBM_VPXPES2TS_H_
+#ifndef LIBWEBM_M2TS_VPXPES2TS_H_
+#define LIBWEBM_M2TS_VPXPES2TS_H_
 
 #include <cstdio>
 #include <cstdint>
@@ -15,7 +15,7 @@
 #include <vector>
 
 #include "common/libwebm_util.h"
-#include "webm2pes.h"
+#include "m2ts/webm2pes.h"
 
 namespace libwebm {
 
@@ -45,4 +45,4 @@ class VpxPes2Ts : public PacketReceiverInterface {
 
 }  // namespace libwebm
 
-#endif  // LIBWEBM_VPXPES2TS_H_
+#endif  // LIBWEBM_M2TS_VPXPES2TS_H_

m2ts/vpxpes2ts_main.cc

@@ -5,7 +5,7 @@
 // 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.
-#include "vpxpes2ts.h"
+#include "m2ts/vpxpes2ts.h"
 
 #include <cstdio>
 #include <string>

m2ts/webm2pes.cc

@@ -5,7 +5,7 @@
 // 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.
-#include "webm2pes.h"
+#include "m2ts/webm2pes.h"
 
 #include <cstring>
 #include <vector>

m2ts/webm2pes.h

@@ -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 LIBWEBM_WEBM2PES_H_
-#define LIBWEBM_WEBM2PES_H_
+#ifndef LIBWEBM_M2TS_WEBM2PES_H_
+#define LIBWEBM_M2TS_WEBM2PES_H_
 
 #include <cstdint>
 #include <memory>
@@ -223,4 +223,4 @@ class Webm2Pes {
 
 }  // namespace libwebm
 
-#endif  // LIBWEBM_WEBM2PES_H_
+#endif  // LIBWEBM_M2TS_WEBM2PES_H_

m2ts/webm2pes_main.cc

@@ -5,7 +5,7 @@
 // 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.
-#include "webm2pes.h"
+#include "m2ts/webm2pes.h"
 
 #include <cstdio>
 #include <string>