# strive towards having a rock-stable ABI, but at least the soversion will increase
# whenever it breaks, so that you will not have silent failures, and distribution package
# management can run its course.
-movit_ltversion = 2:2:0
-movit_version = 1.1.2
+movit_ltversion = 8:3:0
+movit_version = 1.6.3
prefix = @prefix@
exec_prefix = @exec_prefix@
includedir = @includedir@
libdir = @libdir@
datarootdir = @datarootdir@
-datadir = @datadir@
top_builddir = @top_builddir@
with_demo_app = @with_demo_app@
-with_SDL2 = @with_SDL2@
+with_benchmark = @with_benchmark@
with_coverage = @with_coverage@
CC=@CC@
CXX=@CXX@
-CXXFLAGS=-Wall @CXXFLAGS@ -fvisibility-inlines-hidden -I$(GTEST_DIR)/include @SDL2_CFLAGS@ @SDL_CFLAGS@ @Eigen3_CFLAGS@ @epoxy_CFLAGS@ @FFTW3_CFLAGS@
-ifeq ($(with_SDL2),yes)
-CXXFLAGS += -DHAVE_SDL2
+CXXFLAGS=-Wall @CXXFLAGS@ -fvisibility-inlines-hidden -I$(GTEST_DIR)/include @SDL2_CFLAGS@ @Eigen3_CFLAGS@ @epoxy_CFLAGS@ @FFTW3_CFLAGS@ @benchmark_CFLAGS@
+ifeq ($(with_benchmark),yes)
+CXXFLAGS += -DHAVE_BENCHMARK
endif
LDFLAGS=@LDFLAGS@
LDLIBS=@epoxy_LIBS@ @FFTW3_LIBS@ -lpthread
-TEST_LDLIBS=@epoxy_LIBS@ @SDL2_LIBS@ @SDL_LIBS@ -lpthread
-DEMO_LDLIBS=@SDL2_image_LIBS@ @SDL_image_LIBS@ -lrt -lpthread @libpng_LIBS@ @FFTW3_LIBS@
+TEST_LDLIBS=@epoxy_LIBS@ @SDL2_LIBS@ @benchmark_LIBS@ -lpthread
+DEMO_LDLIBS=@SDL2_image_LIBS@ -lrt -lpthread @libpng_LIBS@ @FFTW3_LIBS@
SHELL=@SHELL@
LIBTOOL=@LIBTOOL@ --tag=CXX
RANLIB=ranlib
LDLIBS += -lgcov
endif
-DEMO_OBJS=demo.o
+DEMO_OBJS=demo.o widgets.o
# Inputs.
TESTED_INPUTS = flat_input
TESTED_INPUTS += ycbcr_input
+TESTED_INPUTS += ycbcr_422interleaved_input
INPUTS = $(TESTED_INPUTS) $(UNTESTED_INPUTS)
TESTED_EFFECTS += complex_modulate_effect
TESTED_EFFECTS += luma_mix_effect
TESTED_EFFECTS += fft_convolution_effect
+TESTED_EFFECTS += ycbcr_conversion_effect
+TESTED_EFFECTS += deinterlace_effect
UNTESTED_EFFECTS = sandbox_effect
UNTESTED_EFFECTS += mirror_effect
# Unit tests.
TESTS=effect_chain_test fp16_test $(TESTED_INPUTS:=_test) $(TESTED_EFFECTS:=_test)
-LIB_OBJS=effect_util.o util.o widgets.o effect.o effect_chain.o init.o resource_pool.o fp16.o $(INPUTS:=.o) $(EFFECTS:=.o)
+LIB_OBJS=effect_util.o util.o effect.o effect_chain.o init.o resource_pool.o ycbcr.o bundled_shaders.o $(INPUTS:=.o) $(EFFECTS:=.o)
# Default target:
all: libmovit.la $(TESTS)
clean:
$(LIBTOOL) --mode=clean $(RM) demo $(TESTS) libmovit.la $(OBJS) $(OBJS:.o=.lo)
- $(RM) $(OBJS:.o=.gcno) $(OBJS:.o=.gcda) $(DEPS) step*.dot chain*.frag
+ $(LIBTOOL) --mode=clean $(RM) $(MAKE_BUNDLE_OBJS) $(MAKE_BUNDLE_OBJS:.o=.lo) make_bundled_shaders bundled_shaders.cpp
+ $(RM) $(OBJS:.o=.gcno) $(OBJS:.o=.gcda) $(MAKE_BUNDLE_OBJS:.o=.gcno) $(MAKE_BUNDLE_OBJS:.o=.gcda) $(DEPS) step*.dot chain*.frag
$(RM) -r movit.info coverage/ .libs/
distclean: clean
@exit 1
endif
-HDRS = effect_chain.h effect_util.h effect.h input.h image_format.h init.h util.h defs.h resource_pool.h fp16.h
+HDRS = effect_chain.h effect_util.h effect.h input.h image_format.h init.h util.h defs.h resource_pool.h fp16.h ycbcr.h version.h
HDRS += $(INPUTS:=.h)
HDRS += $(EFFECTS:=.h)
-SHADERS = vs.vert vs.130.vert vs.300es.vert
-SHADERS += header.frag header.130.frag header.300es.frag
-SHADERS += footer.frag footer.130.frag footer.300es.frag
-SHADERS += texture1d.frag texture1d.130.frag texture1d.300es.frag
+SHADERS = vs.vert vs.130.vert vs.150.vert vs.300es.vert
+SHADERS += header.130.frag header.150.frag header.300es.frag header.comp
+SHADERS += footer.frag identity.frag footer.comp
+SHADERS += texture1d.130.frag texture1d.150.frag texture1d.300es.frag
SHADERS += $(INPUTS:=.frag)
-SHADERS += $(EFFECTS:=.frag)
+SHADERS += $(EFFECTS:=.frag) deinterlace_effect.comp
SHADERS += highlight_cutoff_effect.frag
SHADERS += overlay_matte_effect.frag
MISSING_SHADERS += fft_convolution_effect.frag fft_input.frag
SHADERS := $(filter-out $(MISSING_SHADERS),$(SHADERS))
+# A program to compile all the shaders into one bundle that we can link into the library.
+MAKE_BUNDLE_OBJS=make_bundled_shaders.o util.o init.o resource_pool.o
+make_bundled_shaders: $(MAKE_BUNDLE_OBJS)
+ $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o make_bundled_shaders $(MAKE_BUNDLE_OBJS) -lepoxy
+bundled_shaders.cpp: make_bundled_shaders $(SHADERS)
+ ./make_bundled_shaders $(SHADERS) > $@
+
install: libmovit.la
$(MKDIR) -p $(DESTDIR)$(libdir)/
$(LIBTOOL) --mode=install $(INSTALL) -m 0644 libmovit.la $(DESTDIR)$(libdir)/
$(MKDIR) -p $(DESTDIR)$(includedir)/movit/
$(INSTALL) -m 0644 $(HDRS) $(DESTDIR)$(includedir)/movit/
- $(MKDIR) -p $(DESTDIR)$(datadir)/movit/
- $(INSTALL) -m 0644 $(SHADERS) $(DESTDIR)$(datadir)/movit/
$(MKDIR) -p $(DESTDIR)$(libdir)/pkgconfig/
$(INSTALL) -m 644 movit.pc $(DESTDIR)$(libdir)/pkgconfig/
DISTDIR=movit-$(movit_version)
-OTHER_DIST_FILES=add.frag autogen.sh blue.frag configure.ac d65.h identity.frag invert_effect.frag Makefile.in mipmap_needing_effect.frag movit.pc.in README NEWS test_util.h widgets.h
+OTHER_DIST_FILES=add.frag autogen.sh blue.frag configure.ac d65.h identity.frag invert_effect.frag Makefile.in mipmap_needing_effect.frag downscale2x.frag downscale2x.comp mirror.comp identity.comp movit.pc.in README NEWS test_util.h widgets.h
dist:
$(MKDIR) $(DISTDIR)
cp $(OWN_OBJS:.o=.cpp) $(DISTDIR)/
cp $(HDRS) $(DISTDIR)/
- cp $(SHADERS) $(DISTDIR)/
cp $(OTHER_DIST_FILES) $(DISTDIR)/
( cd $(DISTDIR) && aclocal && libtoolize --install --copy && autoconf && $(RM) -r autom4te.cache/ )
tar zcvvf ../$(DISTDIR).tar.gz $(DISTDIR)