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

Move hdr_util to common.

Browse Source 
Change-Id: I383680b79d798fd77bb385e1b8087967962eb230
This commit is contained in:
Tom Finegan 2016-03-07 11:09:44 -08:00
parent 1f64aaf180
commit 87f9beae01
5 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -106,8 +106,8 @@ endif ()
# Libwebm section. # Libwebm section.
add_library(webm STATIC add_library(webm STATIC
"${LIBWEBM_SRC_DIR}/hdr_util.cpp" "${LIBWEBM_SRC_DIR}/common/hdr_util.cc"
"${LIBWEBM_SRC_DIR}/hdr_util.hpp" "${LIBWEBM_SRC_DIR}/common/hdr_util.h"
"${LIBWEBM_SRC_DIR}/mkvmuxer.cpp" "${LIBWEBM_SRC_DIR}/mkvmuxer.cpp"
"${LIBWEBM_SRC_DIR}/mkvmuxer.hpp" "${LIBWEBM_SRC_DIR}/mkvmuxer.hpp"
"${LIBWEBM_SRC_DIR}/mkvmuxertypes.hpp" "${LIBWEBM_SRC_DIR}/mkvmuxertypes.hpp"

8
Makefile.unix
View File

@ -3,7 +3,7 @@ CXXFLAGS := -W -Wall -g -MMD -MP
LIBWEBMA := libwebm.a LIBWEBMA := libwebm.a
LIBWEBMSO := libwebm.so LIBWEBMSO := libwebm.so
WEBMOBJS := mkvparser.o mkvreader.o mkvmuxer.o mkvmuxerutil.o mkvwriter.o WEBMOBJS := mkvparser.o mkvreader.o mkvmuxer.o mkvmuxerutil.o mkvwriter.o
WEBMOBJS += hdr_util.o WEBMOBJS += common/hdr_util.o
OBJSA := $(WEBMOBJS:.o=_a.o) OBJSA := $(WEBMOBJS:.o=_a.o)
OBJSSO := $(WEBMOBJS:.o=_so.o) OBJSSO := $(WEBMOBJS:.o=_so.o)
OBJECTS1 := sample.o OBJECTS1 := sample.o
@ -12,7 +12,7 @@ OBJECTS3 := dumpvtt.o vttreader.o webvttparser.o
OBJECTS4 := vttdemux.o webvttparser.o OBJECTS4 := vttdemux.o webvttparser.o
INCLUDES := -I. INCLUDES := -I.
DEPS := $(WEBMOBJS:.o=.d) $(OBJECTS1:.o=.d) $(OBJECTS2:.o=.d) DEPS := $(WEBMOBJS:.o=.d) $(OBJECTS1:.o=.d) $(OBJECTS2:.o=.d)
DEPS += $(OBJECTS3:.o=.d) $(OBJECTS4:.o=.d) DEPS += $(OBJECTS3:.o=.d) $(OBJECTS4:.o=.d) $(OBJSA:.o=.d) $(OBJSSO:.o=.d)
EXES := sample_muxer sample dumpvtt vttdemux EXES := sample_muxer sample dumpvtt vttdemux
all: $(EXES) all: $(EXES)
@ -42,9 +42,13 @@ libwebm.so: $(OBJSSO)
%_a.o: %.cpp %_a.o: %.cpp
$(CXX) -c $(CXXFLAGS) $(INCLUDES) $< -o $@ $(CXX) -c $(CXXFLAGS) $(INCLUDES) $< -o $@
%_a.o: %.cc
$(CXX) -c $(CXXFLAGS) $(INCLUDES) $< -o $@
%_so.o: %.cpp %_so.o: %.cpp
$(CXX) -c $(CXXFLAGS) -fPIC $(INCLUDES) $< -o $@ $(CXX) -c $(CXXFLAGS) -fPIC $(INCLUDES) $< -o $@
%_so.o: %.cc
$(CXX) -c $(CXXFLAGS) -fPIC $(INCLUDES) $< -o $@
clean: clean:
$(RM) -f $(OBJECTS1) $(OBJECTS2) $(OBJECTS3) $(OBJECTS4) $(OBJSA) $(OBJSSO) $(LIBWEBMA) $(LIBWEBMSO) $(EXES) $(DEPS) Makefile.bak $(RM) -f $(OBJECTS1) $(OBJECTS2) $(OBJECTS3) $(OBJECTS4) $(OBJSA) $(OBJSSO) $(LIBWEBMA) $(LIBWEBMSO) $(EXES) $(DEPS) Makefile.bak

2
hdr_util.cpp → common/hdr_util.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 "hdr_util.hpp" #include "hdr_util.h"
namespace libwebm { namespace libwebm {
bool CopyPrimaryChromaticity(const mkvparser::PrimaryChromaticity& parser_pc, bool CopyPrimaryChromaticity(const mkvparser::PrimaryChromaticity& parser_pc,

10
hdr_util.hpp → common/hdr_util.h
View File

@ -5,13 +5,13 @@
// 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_HDR_UTIL_H_ #ifndef LIBWEBM_COMMON_HDR_UTIL_H_
#define LIBWEBM_HDR_UTIL_H_ #define LIBWEBM_COMMON_HDR_UTIL_H_
#include <memory> #include <memory>
#include "mkvmuxer.hpp" #include "../mkvmuxer.hpp"
#include "mkvparser.hpp" #include "../mkvparser.hpp"
namespace libwebm { namespace libwebm {
@ -39,4 +39,4 @@ bool CopyColour(const mkvparser::Colour& parser_colour,
} // namespace libwebm } // namespace libwebm
#endif // LIBWEBM_HDR_UTIL_H_ #endif // LIBWEBM_COMMON_HDR_UTIL_H_

2
sample_muxer.cpp
View File

@ -14,7 +14,7 @@
#include <string> #include <string>
// libwebm common includes. // libwebm common includes.
#include "hdr_util.hpp" #include "common/hdr_util.h"
// libwebm parser includes // libwebm parser includes
#include "mkvparser.hpp" #include "mkvparser.hpp"