From 047385eaaea13a6e58c0fd6d2313f69ce00c7cb9 Mon Sep 17 00:00:00 2001 From: Ilari Liusvaara Date: Tue, 2 Nov 2010 19:24:14 +0200 Subject: [PATCH] streamtools: refactor output/scaler drivers to their own directories --- streamtools/Makefile | 23 +++++++++++----------- .../{output-drv-faac.cpp => output-drv/faac.cpp} | 0 .../ivfenc.cpp} | 0 .../oggenc.cpp} | 0 .../rawaudio.cpp} | 0 .../rawi420.cpp} | 0 .../rawrgbx.cpp} | 0 .../timecodev2.cpp} | 0 .../{output-drv-wav.cpp => output-drv/wav.cpp} | 0 .../{output-drv-x264.cpp => output-drv/x264.cpp} | 0 .../{resizer-bilinear.cpp => resizer/bilinear.cpp} | 0 streamtools/{resizer-hqx.cpp => resizer/hqx.cpp} | 2 ++ .../{resizer-lanczos.cpp => resizer/lanczos.cpp} | 0 .../letterbox.cpp} | 0 .../letterbox2.cpp} | 0 .../{resizer-nearest.cpp => resizer/nearest.cpp} | 0 streamtools/{resizer-test.cpp => resizer/test.cpp} | 0 .../{resizer-xdrop9.cpp => resizer/xdrop9.cpp} | 0 18 files changed, 14 insertions(+), 11 deletions(-) rename streamtools/{output-drv-faac.cpp => output-drv/faac.cpp} (100%) rename streamtools/{output-drv-ivfenc.cpp => output-drv/ivfenc.cpp} (100%) rename streamtools/{output-drv-oggenc.cpp => output-drv/oggenc.cpp} (100%) rename streamtools/{output-drv-rawaudio.cpp => output-drv/rawaudio.cpp} (100%) rename streamtools/{output-drv-rawi420.cpp => output-drv/rawi420.cpp} (100%) rename streamtools/{output-drv-rawrgbx.cpp => output-drv/rawrgbx.cpp} (100%) rename streamtools/{output-drv-timecodev2.cpp => output-drv/timecodev2.cpp} (100%) rename streamtools/{output-drv-wav.cpp => output-drv/wav.cpp} (100%) rename streamtools/{output-drv-x264.cpp => output-drv/x264.cpp} (100%) rename streamtools/{resizer-bilinear.cpp => resizer/bilinear.cpp} (100%) rename streamtools/{resizer-hqx.cpp => resizer/hqx.cpp} (99%) rename streamtools/{resizer-lanczos.cpp => resizer/lanczos.cpp} (100%) rename streamtools/{resizer-letterbox.cpp => resizer/letterbox.cpp} (100%) rename streamtools/{resizer-letterbox2.cpp => resizer/letterbox2.cpp} (100%) rename streamtools/{resizer-nearest.cpp => resizer/nearest.cpp} (100%) rename streamtools/{resizer-test.cpp => resizer/test.cpp} (100%) rename streamtools/{resizer-xdrop9.cpp => resizer/xdrop9.cpp} (100%) diff --git a/streamtools/Makefile b/streamtools/Makefile index 8da0a09..d537f92 100644 --- a/streamtools/Makefile +++ b/streamtools/Makefile @@ -1,27 +1,22 @@ all: screenshot.exe dumppackets.exe picturestodump.exe audiotodump.exe demuxdump.exe muxdump.exe mknulldump.exe cutdump.exe fmtopcm.exe playdump.exe dumpconvert.exe guessresolution.exe testresizer.exe COMPILER=g++ -CXXFLAGS2=-g -O2 -Wall -CXXFLAGS=$(CXXFLAGS2) -RESIZE_DRIVERS=resize.o resizer-lanczos.o resizer-nearest.o resizer-test.o resize-linear-separable.o resizer-bilinear.o resizer-xdrop9.o resizer-letterbox.o resizer-letterbox2.o +CXXFLAGS=-g -O2 -Wall -I. +CXXFLAGS2=$(CXXFLAGS) -Werror +RESIZE_DRIVERS=resize.o resize-linear-separable.o $(patsubst %.cpp,%.o,$(wildcard resizer/*.cpp)) I420_DRIVER_FILES=output-drv-rawi420.o rgbtorgb.o X264_DRIVER_FILES=output-drv-x264.o rgbtorgb.o -OUTPUT_DRIVERS=$(RESIZE_DRIVERS) dedup.o output-drv.o output-drv-rawrgbx.o output-drv-timecodev2.o output-drv-rawaudio.o output-drv-wav.o output-drv-faac.o $(I420_DRIVER_FILES) $(X264_DRIVER_FILES) output-drv-oggenc.o output-drv-ivfenc.o +OUTPUT_DRIVERS=rgbtorgb.o $(RESIZE_DRIVERS) dedup.o output-drv.o $(patsubst %.cpp,%.o,$(wildcard output-drv/*.cpp)) ifdef WITH_HQX -RESIZE_DRIVERS += resizer-hqx.o ADD_LIBS=-lhqx -endif -ifdef MINGW -MINGW_LIBS=-lmingw32 -else -MINGW_LIBS= +CXXFLAGS2 += -DWITH_HQX=1 endif ifdef LIBS_PATH LIBS_PATH2=-L$(LIBS_PATH) else LIBS_PATH2= endif -LIBS=$(LIBS_PATH2) -lz -lSDL -lSDL_image -lSDL_ttf $(MINGW_LIBS) -lSDL $(ADD_LIBS) +LIBS=$(LIBS_PATH2) -lz -lSDL -lSDL_image -lSDL_ttf -lSDL $(ADD_LIBS) picturestodump.exe: picturestodump.o newpacket.o png-out.o timecounter.o main.o $(COMPILER) $(CXXFLAGS2) -o $@ $^ $(LIBS) @@ -70,3 +65,9 @@ opl.o: opl.cpp opl.h testresizer.exe: testresizer.o $(RESIZE_DRIVERS) main.o $(COMPILER) $(CXXFLAGS2) -o $@ $^ $(LIBS) + +resizer/%.o: resizer/*.cpp + $(COMPILER) $(CXXFLAGS2) -Werror -c -o $@ $< `sdl-config --cflags` + +output-drv/%.o: output-drv/*.cpp + $(COMPILER) $(CXXFLAGS2) -Werror -c -o $@ $< `sdl-config --cflags` diff --git a/streamtools/output-drv-faac.cpp b/streamtools/output-drv/faac.cpp similarity index 100% rename from streamtools/output-drv-faac.cpp rename to streamtools/output-drv/faac.cpp diff --git a/streamtools/output-drv-ivfenc.cpp b/streamtools/output-drv/ivfenc.cpp similarity index 100% rename from streamtools/output-drv-ivfenc.cpp rename to streamtools/output-drv/ivfenc.cpp diff --git a/streamtools/output-drv-oggenc.cpp b/streamtools/output-drv/oggenc.cpp similarity index 100% rename from streamtools/output-drv-oggenc.cpp rename to streamtools/output-drv/oggenc.cpp diff --git a/streamtools/output-drv-rawaudio.cpp b/streamtools/output-drv/rawaudio.cpp similarity index 100% rename from streamtools/output-drv-rawaudio.cpp rename to streamtools/output-drv/rawaudio.cpp diff --git a/streamtools/output-drv-rawi420.cpp b/streamtools/output-drv/rawi420.cpp similarity index 100% rename from streamtools/output-drv-rawi420.cpp rename to streamtools/output-drv/rawi420.cpp diff --git a/streamtools/output-drv-rawrgbx.cpp b/streamtools/output-drv/rawrgbx.cpp similarity index 100% rename from streamtools/output-drv-rawrgbx.cpp rename to streamtools/output-drv/rawrgbx.cpp diff --git a/streamtools/output-drv-timecodev2.cpp b/streamtools/output-drv/timecodev2.cpp similarity index 100% rename from streamtools/output-drv-timecodev2.cpp rename to streamtools/output-drv/timecodev2.cpp diff --git a/streamtools/output-drv-wav.cpp b/streamtools/output-drv/wav.cpp similarity index 100% rename from streamtools/output-drv-wav.cpp rename to streamtools/output-drv/wav.cpp diff --git a/streamtools/output-drv-x264.cpp b/streamtools/output-drv/x264.cpp similarity index 100% rename from streamtools/output-drv-x264.cpp rename to streamtools/output-drv/x264.cpp diff --git a/streamtools/resizer-bilinear.cpp b/streamtools/resizer/bilinear.cpp similarity index 100% rename from streamtools/resizer-bilinear.cpp rename to streamtools/resizer/bilinear.cpp diff --git a/streamtools/resizer-hqx.cpp b/streamtools/resizer/hqx.cpp similarity index 99% rename from streamtools/resizer-hqx.cpp rename to streamtools/resizer/hqx.cpp index 51704b0..e307463 100644 --- a/streamtools/resizer-hqx.cpp +++ b/streamtools/resizer/hqx.cpp @@ -1,3 +1,4 @@ +#ifdef WITH_HQX #include "resize.hpp" #include extern "C" { @@ -111,3 +112,4 @@ namespace simple_resizer r_hqx3d("hqx3d", resize_frame, RMETHOD_HQX3d); simple_resizer r_hqx4d("hqx4d", resize_frame, RMETHOD_HQX4d); } +#endif diff --git a/streamtools/resizer-lanczos.cpp b/streamtools/resizer/lanczos.cpp similarity index 100% rename from streamtools/resizer-lanczos.cpp rename to streamtools/resizer/lanczos.cpp diff --git a/streamtools/resizer-letterbox.cpp b/streamtools/resizer/letterbox.cpp similarity index 100% rename from streamtools/resizer-letterbox.cpp rename to streamtools/resizer/letterbox.cpp diff --git a/streamtools/resizer-letterbox2.cpp b/streamtools/resizer/letterbox2.cpp similarity index 100% rename from streamtools/resizer-letterbox2.cpp rename to streamtools/resizer/letterbox2.cpp diff --git a/streamtools/resizer-nearest.cpp b/streamtools/resizer/nearest.cpp similarity index 100% rename from streamtools/resizer-nearest.cpp rename to streamtools/resizer/nearest.cpp diff --git a/streamtools/resizer-test.cpp b/streamtools/resizer/test.cpp similarity index 100% rename from streamtools/resizer-test.cpp rename to streamtools/resizer/test.cpp diff --git a/streamtools/resizer-xdrop9.cpp b/streamtools/resizer/xdrop9.cpp similarity index 100% rename from streamtools/resizer-xdrop9.cpp rename to streamtools/resizer/xdrop9.cpp -- 2.11.4.GIT