generic-library/webm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Change-Id: I5c02b62460a6bf8dd73fb9274d1668a5a13af373
This commit is contained in:
Tom Finegan
2016-03-07 12:32:30 -08:00
parent 1b895e97d0
commit 1f74651b5b
8 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

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

2
testing/webm2pes_tests.cc → m2ts/tests/webm2pes_tests.cc
View File

@@ -5,7 +5,7 @@
// tree. An additional intellectual property rights grant can be found // tree. An additional intellectual property rights grant can be found
// in the file PATENTS. All contributing project authors may // in the file PATENTS. All contributing project authors may
// be found in the AUTHORS file in the root of the source tree. // be found in the AUTHORS file in the root of the source tree.
#include "webm2pes.h" #include "m2ts/webm2pes.h"
#include <cstdint> #include <cstdint>
#include <cstdio> #include <cstdio>

2
vpxpes2ts.cc → m2ts/vpxpes2ts.cc
View File

@@ -5,7 +5,7 @@
// tree. An additional intellectual property rights grant can be found // tree. An additional intellectual property rights grant can be found
// in the file PATENTS. All contributing project authors may // in the file PATENTS. All contributing project authors may
// be found in the AUTHORS file in the root of the source tree. // be found in the AUTHORS file in the root of the source tree.
#include "vpxpes2ts.h" #include "m2ts/vpxpes2ts.h"
#include <algorithm> #include <algorithm>
#include <cstdio> #include <cstdio>

8
vpxpes2ts.h → m2ts/vpxpes2ts.h
View File

@@ -5,8 +5,8 @@
// tree. An additional intellectual property rights grant can be found // tree. An additional intellectual property rights grant can be found
// in the file PATENTS. All contributing project authors may // in the file PATENTS. All contributing project authors may
// be found in the AUTHORS file in the root of the source tree. // be found in the AUTHORS file in the root of the source tree.
#ifndef LIBWEBM_VPXPES2TS_H_ #ifndef LIBWEBM_M2TS_VPXPES2TS_H_
#define LIBWEBM_VPXPES2TS_H_ #define LIBWEBM_M2TS_VPXPES2TS_H_
#include <cstdio> #include <cstdio>
#include <cstdint> #include <cstdint>
@@ -15,7 +15,7 @@
#include <vector> #include <vector>
#include "common/libwebm_util.h" #include "common/libwebm_util.h"
#include "webm2pes.h" #include "m2ts/webm2pes.h"
namespace libwebm { namespace libwebm {
@@ -45,4 +45,4 @@ class VpxPes2Ts : public PacketReceiverInterface {
} // namespace libwebm } // namespace libwebm
#endif // LIBWEBM_VPXPES2TS_H_ #endif // LIBWEBM_M2TS_VPXPES2TS_H_

2
vpxpes2ts_main.cc → m2ts/vpxpes2ts_main.cc
View File

@@ -5,7 +5,7 @@
// tree. An additional intellectual property rights grant can be found // tree. An additional intellectual property rights grant can be found
// in the file PATENTS. All contributing project authors may // in the file PATENTS. All contributing project authors may
// be found in the AUTHORS file in the root of the source tree. // be found in the AUTHORS file in the root of the source tree.
#include "vpxpes2ts.h" #include "m2ts/vpxpes2ts.h"
#include <cstdio> #include <cstdio>
#include <string> #include <string>

2
webm2pes.cc → m2ts/webm2pes.cc
View File

@@ -5,7 +5,7 @@
// tree. An additional intellectual property rights grant can be found // tree. An additional intellectual property rights grant can be found
// in the file PATENTS. All contributing project authors may // in the file PATENTS. All contributing project authors may
// be found in the AUTHORS file in the root of the source tree. // be found in the AUTHORS file in the root of the source tree.
#include "webm2pes.h" #include "m2ts/webm2pes.h"
#include <cstring> #include <cstring>
#include <vector> #include <vector>

6
webm2pes.h → m2ts/webm2pes.h
View File

@@ -5,8 +5,8 @@
// tree. An additional intellectual property rights grant can be found // tree. An additional intellectual property rights grant can be found
// in the file PATENTS. All contributing project authors may // in the file PATENTS. All contributing project authors may
// be found in the AUTHORS file in the root of the source tree. // be found in the AUTHORS file in the root of the source tree.
#ifndef LIBWEBM_WEBM2PES_H_ #ifndef LIBWEBM_M2TS_WEBM2PES_H_
#define LIBWEBM_WEBM2PES_H_ #define LIBWEBM_M2TS_WEBM2PES_H_
#include <cstdint> #include <cstdint>
#include <memory> #include <memory>
@@ -223,4 +223,4 @@ class Webm2Pes {
} // namespace libwebm } // namespace libwebm
#endif // LIBWEBM_WEBM2PES_H_ #endif // LIBWEBM_M2TS_WEBM2PES_H_

2
webm2pes_main.cc → m2ts/webm2pes_main.cc
View File

@@ -5,7 +5,7 @@
// tree. An additional intellectual property rights grant can be found // tree. An additional intellectual property rights grant can be found
// in the file PATENTS. All contributing project authors may // in the file PATENTS. All contributing project authors may
// be found in the AUTHORS file in the root of the source tree. // be found in the AUTHORS file in the root of the source tree.
#include "webm2pes.h" #include "m2ts/webm2pes.h"
#include <cstdio> #include <cstdio>
#include <string> #include <string>