From 1f74651b5b687671404c9d7611aa39217920e609 Mon Sep 17 00:00:00 2001 From: Tom Finegan Date: Mon, 7 Mar 2016 12:32:30 -0800 Subject: [PATCH] webmts: Move PES/TS sources to m2ts sub directory. Change-Id: I5c02b62460a6bf8dd73fb9274d1668a5a13af373 --- CMakeLists.txt | 14 +++++++------- {testing => m2ts/tests}/webm2pes_tests.cc | 2 +- vpxpes2ts.cc => m2ts/vpxpes2ts.cc | 2 +- vpxpes2ts.h => m2ts/vpxpes2ts.h | 8 ++++---- vpxpes2ts_main.cc => m2ts/vpxpes2ts_main.cc | 2 +- webm2pes.cc => m2ts/webm2pes.cc | 2 +- webm2pes.h => m2ts/webm2pes.h | 6 +++--- webm2pes_main.cc => m2ts/webm2pes_main.cc | 2 +- 8 files changed, 19 insertions(+), 19 deletions(-) rename {testing => m2ts/tests}/webm2pes_tests.cc (99%) rename vpxpes2ts.cc => m2ts/vpxpes2ts.cc (99%) rename vpxpes2ts.h => m2ts/vpxpes2ts.h (90%) rename vpxpes2ts_main.cc => m2ts/vpxpes2ts_main.cc (96%) rename webm2pes.cc => m2ts/webm2pes.cc (99%) rename webm2pes.h => m2ts/webm2pes.h (98%) rename webm2pes_main.cc => m2ts/webm2pes_main.cc (97%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b4e725..5445444 100644 --- a/CMakeLists.txt +++ b/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 () diff --git a/testing/webm2pes_tests.cc b/m2ts/tests/webm2pes_tests.cc similarity index 99% rename from testing/webm2pes_tests.cc rename to m2ts/tests/webm2pes_tests.cc index de192ef..a7ae0c4 100644 --- a/testing/webm2pes_tests.cc +++ b/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 #include diff --git a/vpxpes2ts.cc b/m2ts/vpxpes2ts.cc similarity index 99% rename from vpxpes2ts.cc rename to m2ts/vpxpes2ts.cc index 611c846..0607e11 100644 --- a/vpxpes2ts.cc +++ b/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 #include diff --git a/vpxpes2ts.h b/m2ts/vpxpes2ts.h similarity index 90% rename from vpxpes2ts.h rename to m2ts/vpxpes2ts.h index 60bd7d5..9c00c4f 100644 --- a/vpxpes2ts.h +++ b/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 #include @@ -15,7 +15,7 @@ #include #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_ diff --git a/vpxpes2ts_main.cc b/m2ts/vpxpes2ts_main.cc similarity index 96% rename from vpxpes2ts_main.cc rename to m2ts/vpxpes2ts_main.cc index a899337..06e507e 100644 --- a/vpxpes2ts_main.cc +++ b/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 #include diff --git a/webm2pes.cc b/m2ts/webm2pes.cc similarity index 99% rename from webm2pes.cc rename to m2ts/webm2pes.cc index d5583e3..e2fc9e6 100644 --- a/webm2pes.cc +++ b/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 #include diff --git a/webm2pes.h b/m2ts/webm2pes.h similarity index 98% rename from webm2pes.h rename to m2ts/webm2pes.h index 5d9f41a..6ceddc3 100644 --- a/webm2pes.h +++ b/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 #include @@ -223,4 +223,4 @@ class Webm2Pes { } // namespace libwebm -#endif // LIBWEBM_WEBM2PES_H_ +#endif // LIBWEBM_M2TS_WEBM2PES_H_ diff --git a/webm2pes_main.cc b/m2ts/webm2pes_main.cc similarity index 97% rename from webm2pes_main.cc rename to m2ts/webm2pes_main.cc index 09b8553..f8145a1 100644 --- a/webm2pes_main.cc +++ b/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 #include