Mass file extension update.
- Use .cc and .h everywhere. - Update includes/include guards. - Remove extra makefile targets necessitated by previous mix of cpp/cc. Change-Id: I7aad29152d4177937f8f42927c16c6572228c104
This commit is contained in:
Tom Finegan
parent
79cb9805c1
commit
504e0f2d5b
10
Android.mk
10
Android.mk
@ -4,9 +4,9 @@ include $(CLEAR_VARS)
|
||||
LOCAL_MODULE:= libwebm
|
||||
LOCAL_SRC_FILES:= common/file_util.cc \
|
||||
common/hdr_util.cc \
|
||||
mkvparser/mkvparser.cpp \
|
||||
mkvparser/mkvreader.cpp \
|
||||
mkvmuxer/mkvmuxer.cpp \
|
||||
mkvmuxer/mkvmuxerutil.cpp \
|
||||
mkvmuxer/mkvwriter.cpp
|
||||
mkvparser/mkvparser.cc \
|
||||
mkvparser/mkvreader.cc \
|
||||
mkvmuxer/mkvmuxer.cc \
|
||||
mkvmuxer/mkvmuxerutil.cc \
|
||||
mkvmuxer/mkvwriter.cc
|
||||
include $(BUILD_STATIC_LIBRARY)
|
||||
|
||||
@ -43,23 +43,23 @@ 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}/common/webmids.hpp")
|
||||
"${LIBWEBM_SRC_DIR}/mkvmuxer/mkvmuxer.cc"
|
||||
"${LIBWEBM_SRC_DIR}/mkvmuxer/mkvmuxer.h"
|
||||
"${LIBWEBM_SRC_DIR}/mkvmuxer/mkvmuxertypes.h"
|
||||
"${LIBWEBM_SRC_DIR}/mkvmuxer/mkvmuxerutil.cc"
|
||||
"${LIBWEBM_SRC_DIR}/mkvmuxer/mkvmuxerutil.h"
|
||||
"${LIBWEBM_SRC_DIR}/mkvmuxer/mkvwriter.cc"
|
||||
"${LIBWEBM_SRC_DIR}/mkvmuxer/mkvwriter.h"
|
||||
"${LIBWEBM_SRC_DIR}/common/webmids.h")
|
||||
|
||||
# mkvparser section.
|
||||
# TODO(tomfinegan): move to mkvparser/CMakeLists.txt.
|
||||
add_library(mkvparser STATIC
|
||||
"${LIBWEBM_SRC_DIR}/mkvparser/mkvparser.cpp"
|
||||
"${LIBWEBM_SRC_DIR}/mkvparser/mkvparser.hpp"
|
||||
"${LIBWEBM_SRC_DIR}/mkvparser/mkvreader.cpp"
|
||||
"${LIBWEBM_SRC_DIR}/mkvparser/mkvreader.hpp"
|
||||
"${LIBWEBM_SRC_DIR}/common/webmids.hpp")
|
||||
"${LIBWEBM_SRC_DIR}/mkvparser/mkvparser.cc"
|
||||
"${LIBWEBM_SRC_DIR}/mkvparser/mkvparser.h"
|
||||
"${LIBWEBM_SRC_DIR}/mkvparser/mkvreader.cc"
|
||||
"${LIBWEBM_SRC_DIR}/mkvparser/mkvreader.h"
|
||||
"${LIBWEBM_SRC_DIR}/common/webmids.h")
|
||||
|
||||
# Libwebm section.
|
||||
add_library(webm STATIC
|
||||
@ -67,7 +67,7 @@ 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}/common/webmids.hpp")
|
||||
"${LIBWEBM_SRC_DIR}/common/webmids.h")
|
||||
target_link_libraries(webm LINK_PUBLIC mkvmuxer mkvparser)
|
||||
|
||||
if (WIN32)
|
||||
@ -81,12 +81,12 @@ include_directories("${LIBWEBM_SRC_DIR}")
|
||||
|
||||
# Sample (mkvparser) section.
|
||||
add_executable(sample
|
||||
"${LIBWEBM_SRC_DIR}/sample.cpp")
|
||||
"${LIBWEBM_SRC_DIR}/sample.cc")
|
||||
target_link_libraries(sample LINK_PUBLIC webm)
|
||||
|
||||
# Sample muxer section.
|
||||
add_executable(sample_muxer
|
||||
"${LIBWEBM_SRC_DIR}/sample_muxer.cpp"
|
||||
"${LIBWEBM_SRC_DIR}/sample_muxer.cc"
|
||||
"${LIBWEBM_SRC_DIR}/sample_muxer_metadata.cc"
|
||||
"${LIBWEBM_SRC_DIR}/sample_muxer_metadata.h"
|
||||
"${LIBWEBM_SRC_DIR}/webvtt/vttreader.cc"
|
||||
|
||||
@ -40,16 +40,10 @@ libwebm.a: $(OBJSA)
|
||||
libwebm.so: $(OBJSSO)
|
||||
$(CXX) $(CXXFLAGS) -shared $(OBJSSO) -o $(LIBWEBMSO)
|
||||
|
||||
%.o: %.cpp
|
||||
$(CXX) -c $(CXXFLAGS) $< -o $@
|
||||
|
||||
%_a.o: %.cpp
|
||||
%.o: %.cc
|
||||
$(CXX) -c $(CXXFLAGS) $< -o $@
|
||||
%_a.o: %.cc
|
||||
$(CXX) -c $(CXXFLAGS) $< -o $@
|
||||
|
||||
%_so.o: %.cpp
|
||||
$(CXX) -c $(CXXFLAGS) -fPIC $< -o $@
|
||||
%_so.o: %.cc
|
||||
$(CXX) -c $(CXXFLAGS) -fPIC $< -o $@
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
#include <string>
|
||||
|
||||
#include "mkvmuxer/mkvmuxertypes.hpp" // LIBWEBM_DISALLOW_COPY_AND_ASSIGN()
|
||||
#include "mkvmuxer/mkvmuxertypes.h" // LIBWEBM_DISALLOW_COPY_AND_ASSIGN()
|
||||
|
||||
namespace libwebm {
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
#include <cstddef>
|
||||
#include <new>
|
||||
|
||||
#include "mkvparser/mkvparser.hpp"
|
||||
#include "mkvparser/mkvparser.h"
|
||||
|
||||
namespace libwebm {
|
||||
bool CopyPrimaryChromaticity(const mkvparser::PrimaryChromaticity& parser_pc,
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
#include <memory>
|
||||
|
||||
#include "mkvmuxer/mkvmuxer.hpp"
|
||||
#include "mkvmuxer/mkvmuxer.h"
|
||||
|
||||
namespace libwebm {
|
||||
|
||||
|
||||
@ -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 WEBMIDS_HPP
|
||||
#define WEBMIDS_HPP
|
||||
#ifndef COMMON_WEBMIDS_H_
|
||||
#define COMMON_WEBMIDS_H_
|
||||
|
||||
namespace libwebm {
|
||||
|
||||
@ -181,4 +181,4 @@ enum MkvId {
|
||||
|
||||
} // namespace libwebm
|
||||
|
||||
#endif // WEBMIDS_HPP
|
||||
#endif // COMMON_WEBMIDS_H_
|
||||
@ -14,10 +14,9 @@
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include "mkvparser/mkvparser.hpp"
|
||||
#include "mkvparser/mkvreader.hpp"
|
||||
|
||||
#include "common/libwebm_util.h"
|
||||
#include "mkvparser/mkvparser.h"
|
||||
#include "mkvparser/mkvreader.h"
|
||||
|
||||
namespace libwebm {
|
||||
|
||||
|
||||
@ -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 "mkvmuxer/mkvmuxer.hpp"
|
||||
#include "mkvmuxer/mkvmuxer.h"
|
||||
|
||||
#include <cfloat>
|
||||
#include <climits>
|
||||
@ -17,10 +17,10 @@
|
||||
#include <new>
|
||||
#include <vector>
|
||||
|
||||
#include "common/webmids.hpp"
|
||||
#include "mkvmuxer/mkvmuxerutil.hpp"
|
||||
#include "mkvmuxer/mkvwriter.hpp"
|
||||
#include "mkvparser/mkvparser.hpp"
|
||||
#include "common/webmids.h"
|
||||
#include "mkvmuxer/mkvmuxerutil.h"
|
||||
#include "mkvmuxer/mkvwriter.h"
|
||||
#include "mkvparser/mkvparser.h"
|
||||
|
||||
#ifdef _MSC_VER
|
||||
// Disable MSVC warnings that suggest making code non-portable.
|
||||
@ -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_MKVMUXER_HPP_
|
||||
#define MKVMUXER_MKVMUXER_HPP_
|
||||
#ifndef MKVMUXER_MKVMUXER_H_
|
||||
#define MKVMUXER_MKVMUXER_H_
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
@ -15,8 +15,8 @@
|
||||
#include <list>
|
||||
#include <map>
|
||||
|
||||
#include "common/webmids.hpp"
|
||||
#include "mkvmuxer/mkvmuxertypes.hpp"
|
||||
#include "common/webmids.h"
|
||||
#include "mkvmuxer/mkvmuxertypes.h"
|
||||
|
||||
// For a description of the WebM elements see
|
||||
// http://www.webmproject.org/code/specs/container/.
|
||||
@ -1683,4 +1683,4 @@ class Segment {
|
||||
} // namespace mkvmuxer
|
||||
} // namespace libwebm
|
||||
|
||||
#endif // MKVMUXER_MKVMUXER_HPP_
|
||||
#endif // MKVMUXER_MKVMUXER_H_
|
||||
@ -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_MKVMUXERTYPES_HPP_
|
||||
#define MKVMUXER_MKVMUXERTYPES_HPP_
|
||||
#ifndef MKVMUXER_MKVMUXERTYPES_H_
|
||||
#define MKVMUXER_MKVMUXERTYPES_H_
|
||||
|
||||
// Copied from Chromium basictypes.h
|
||||
// A macro to disallow the copy constructor and operator= functions
|
||||
@ -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 "mkvmuxer/mkvmuxerutil.hpp"
|
||||
#include "mkvmuxer/mkvmuxerutil.h"
|
||||
|
||||
#ifdef __ANDROID__
|
||||
#include <fcntl.h>
|
||||
@ -20,9 +20,9 @@
|
||||
#include <ctime>
|
||||
#include <new>
|
||||
|
||||
#include "common/webmids.hpp"
|
||||
#include "mkvmuxer/mkvmuxer.hpp"
|
||||
#include "mkvmuxer/mkvwriter.hpp"
|
||||
#include "common/webmids.h"
|
||||
#include "mkvmuxer/mkvmuxer.h"
|
||||
#include "mkvmuxer/mkvwriter.h"
|
||||
|
||||
#ifdef _MSC_VER
|
||||
// Disable MSVC warnings that suggest making code non-portable.
|
||||
@ -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 MKVMUXER_MKVMUXERUTIL_HPP_
|
||||
#define MKVMUXER_MKVMUXERUTIL_HPP_
|
||||
#ifndef MKVMUXER_MKVMUXERUTIL_H_
|
||||
#define MKVMUXER_MKVMUXERUTIL_H_
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
@ -82,4 +82,4 @@ uint64_t MakeUID(unsigned int* seed);
|
||||
} // namespace mkvmuxer
|
||||
} // namespace libwebm
|
||||
|
||||
#endif // MKVMUXER_MKVMUXERUTIL_HPP_
|
||||
#endif // MKVMUXER_MKVMUXERUTIL_H_
|
||||
@ -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 "mkvmuxer/mkvwriter.hpp"
|
||||
#include "mkvmuxer/mkvwriter.h"
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#include <share.h> // for _SH_DENYWR
|
||||
@ -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 MKVMUXER_MKVWRITER_HPP_
|
||||
#define MKVMUXER_MKVWRITER_HPP_
|
||||
#ifndef MKVMUXER_MKVWRITER_H_
|
||||
#define MKVMUXER_MKVWRITER_H_
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#include "mkvmuxer/mkvmuxer.hpp"
|
||||
#include "mkvmuxer/mkvmuxertypes.hpp"
|
||||
#include "mkvmuxer/mkvmuxer.h"
|
||||
#include "mkvmuxer/mkvmuxertypes.h"
|
||||
|
||||
namespace libwebm {
|
||||
namespace mkvmuxer {
|
||||
@ -50,4 +50,4 @@ class MkvWriter : public IMkvWriter {
|
||||
} // namespace mkvmuxer
|
||||
} // namespace libwebm
|
||||
|
||||
#endif // MKVMUXER_MKVWRITER_HPP_
|
||||
#endif // MKVMUXER_MKVWRITER_H_
|
||||
@ -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 "mkvparser/mkvparser.hpp"
|
||||
#include "mkvparser/mkvparser.h"
|
||||
|
||||
#if defined(_MSC_VER) && _MSC_VER < 1800
|
||||
#include <float.h> // _isnan() / _finite()
|
||||
@ -20,7 +20,7 @@
|
||||
#include <memory>
|
||||
#include <new>
|
||||
|
||||
#include "common/webmids.hpp"
|
||||
#include "common/webmids.h"
|
||||
|
||||
#ifdef _MSC_VER
|
||||
// Disable MSVC warnings that suggest making code non-portable.
|
||||
@ -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 MKVPARSER_HPP
|
||||
#define MKVPARSER_HPP
|
||||
#ifndef MKVPARSER_MKVPARSER_H_
|
||||
#define MKVPARSER_MKVPARSER_H_
|
||||
|
||||
#include <cstddef>
|
||||
|
||||
@ -1111,4 +1111,4 @@ inline long libwebm::mkvparser::Segment::LoadCluster() {
|
||||
return LoadCluster(pos, size);
|
||||
}
|
||||
|
||||
#endif // MKVPARSER_HPP
|
||||
#endif // MKVPARSER_MKVPARSER_H_
|
||||
@ -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 "mkvparser/mkvreader.hpp"
|
||||
#include "mkvparser/mkvreader.h"
|
||||
|
||||
#include <cassert>
|
||||
|
||||
@ -5,12 +5,12 @@
|
||||
// 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 MKVREADER_HPP
|
||||
#define MKVREADER_HPP
|
||||
#ifndef MKVPARSER_MKVREADER_H_
|
||||
#define MKVPARSER_MKVREADER_H_
|
||||
|
||||
#include <cstdio>
|
||||
|
||||
#include "mkvparser/mkvparser.hpp"
|
||||
#include "mkvparser/mkvparser.h"
|
||||
|
||||
namespace libwebm {
|
||||
namespace mkvparser {
|
||||
@ -44,4 +44,4 @@ class MkvReader : public IMkvReader {
|
||||
} // namespace mkvparser
|
||||
} // namespace libwebm
|
||||
|
||||
#endif // MKVREADER_HPP
|
||||
#endif // MKVPARSER_MKVREADER_H_
|
||||
@ -13,8 +13,8 @@
|
||||
#include <memory>
|
||||
#include <new>
|
||||
|
||||
#include "mkvparser/mkvparser.hpp"
|
||||
#include "mkvparser/mkvreader.hpp"
|
||||
#include "mkvparser/mkvparser.h"
|
||||
#include "mkvparser/mkvreader.h"
|
||||
|
||||
#ifdef _MSC_VER
|
||||
// Disable MSVC warnings that suggest making code non-portable.
|
||||
@ -19,13 +19,13 @@
|
||||
#include "common/hdr_util.h"
|
||||
|
||||
// libwebm mkvparser includes
|
||||
#include "mkvparser/mkvparser.hpp"
|
||||
#include "mkvparser/mkvreader.hpp"
|
||||
#include "mkvparser/mkvparser.h"
|
||||
#include "mkvparser/mkvreader.h"
|
||||
|
||||
// libwebm mkvmuxer includes
|
||||
#include "mkvmuxer/mkvmuxer.hpp"
|
||||
#include "mkvmuxer/mkvmuxertypes.hpp"
|
||||
#include "mkvmuxer/mkvwriter.hpp"
|
||||
#include "mkvmuxer/mkvmuxer.h"
|
||||
#include "mkvmuxer/mkvmuxertypes.h"
|
||||
#include "mkvmuxer/mkvwriter.h"
|
||||
|
||||
#include "sample_muxer_metadata.h"
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
#include <cstdio>
|
||||
#include <string>
|
||||
|
||||
#include "mkvmuxer/mkvmuxer.hpp"
|
||||
#include "mkvmuxer/mkvmuxer.h"
|
||||
#include "webvtt/vttreader.h"
|
||||
|
||||
namespace libwebm {
|
||||
|
||||
@ -20,9 +20,9 @@
|
||||
|
||||
#include "common/file_util.h"
|
||||
#include "common/libwebm_util.h"
|
||||
#include "mkvmuxer/mkvmuxer.hpp"
|
||||
#include "mkvmuxer/mkvwriter.hpp"
|
||||
#include "mkvparser/mkvreader.hpp"
|
||||
#include "mkvmuxer/mkvmuxer.h"
|
||||
#include "mkvmuxer/mkvwriter.h"
|
||||
#include "mkvparser/mkvreader.h"
|
||||
#include "testing/test_util.h"
|
||||
|
||||
#ifdef _MSC_VER
|
||||
|
||||
@ -14,8 +14,8 @@
|
||||
#include <iomanip>
|
||||
#include <string>
|
||||
|
||||
#include "mkvparser/mkvparser.hpp"
|
||||
#include "mkvparser/mkvreader.hpp"
|
||||
#include "mkvparser/mkvparser.h"
|
||||
#include "mkvparser/mkvreader.h"
|
||||
#include "testing/test_util.h"
|
||||
|
||||
using libwebm::mkvparser::AudioTrack;
|
||||
|
||||
@ -14,8 +14,8 @@
|
||||
#include <string>
|
||||
#include <utility>
|
||||
|
||||
#include "mkvparser/mkvparser.hpp"
|
||||
#include "mkvparser/mkvreader.hpp"
|
||||
#include "mkvparser/mkvparser.h"
|
||||
#include "mkvparser/mkvreader.h"
|
||||
#include "webvtt/webvttparser.h"
|
||||
|
||||
#ifdef _MSC_VER
|
||||
|
||||
Loading…
Reference in New Issue
Block a user