}
CanvasZoomSize::CanvasZoomSize(Canvas *canvas)
- : BC_MenuItem(_("Zoom..."))
+ : BC_MenuItem(_("Resize Window..."))
{
this->canvas = canvas;
}
// Dispatch the command
start_render_engine();
break;
-
- case SINGLE_FRAME_FWD:
- case SINGLE_FRAME_REWIND:
// fall through
default:
is_playing_back = 1;
+ case REWIND:
+ case GOTO_END:
perform_change();
arm_render_engine();
{
//printf("PlaybackEngine::send_command 1 %d\n", command);
// Stop requires transferring the output buffer to a refresh buffer.
- int do_stop = 0;
int curr_command = is_playing_back ? this->command->command : STOP;
int curr_single_frame = TransportCommand::single_frame(curr_command);
int curr_audio = this->command->toggle_audio ?
int single_frame = TransportCommand::single_frame(command);
int next_audio = next_command->toggle_audio ? !single_frame : single_frame;
float next_speed = next_command->speed;
-
+ int cmd = -1;
// Dispatch command
switch( command ) {
+ case STOP:
+ transport_stop(wait_tracking);
+ break;
case FAST_REWIND: // Commands that play back
case NORMAL_REWIND:
case SLOW_REWIND:
if( next_speed ) curr_command = COMMAND_NONE;
// Same direction pressed twice, not shuttle, and no change in audio state, Stop
if( curr_command == command && !curr_single_frame &&
- curr_audio == next_audio ) { do_stop = 1; break; }
-
+ curr_audio == next_audio ) {
+ transport_stop(wait_tracking);
+ break;
+ }
// Resume or change direction
switch( curr_command ) {
- default:
- transport_stop(0);
- next_command->resume = 1;
-// fall through
+ case REWIND:
+ case GOTO_END:
case STOP:
case COMMAND_NONE:
case SINGLE_FRAME_FWD:
case SINGLE_FRAME_REWIND:
case CURRENT_FRAME:
case LAST_FRAME:
- next_command->realtime = 1;
-// Start from scratch
- transport_command(command, CHANGE_NONE, edl, use_inout);
+// already stopped
+ break;
+ default:
+ transport_stop(0);
+ next_command->resume = 1;
break;
}
+ next_command->realtime = 1;
+ cmd = command;
break;
-
-// Commands that stop
- case STOP:
case REWIND:
case GOTO_END:
- do_stop = 1;
+ transport_stop(1);
+ next_command->realtime = 1;
+ cmd = command;
break;
}
-
- if( do_stop ) {
- transport_stop(wait_tracking);
- }
+ if( cmd >= 0 )
+ transport_command(cmd, CHANGE_NONE, edl, use_inout);
}
int PlaybackEngine::put_command(TransportCommand *command, int reset)
}
break;
+ case REWIND:
+ start_position = 0;
case CURRENT_FRAME:
case LAST_FRAME:
case SINGLE_FRAME_FWD:
end_position = start_position + frame_period;
break;
+ case GOTO_END:
+ end_position = length;
case SINGLE_FRAME_REWIND:
start_position = end_position - frame_period;
break;
libutil.a ],
[ . ])
-PKG_3RD([ilmbase],[auto],
- [ilmbase-2.2.1],
- [ Iex/.libs/libIex.a \
- IexMath/.libs/libIexMath.a \
- Half/.libs/libHalf.a \
- Imath/.libs/libImath.a \
- IlmThread/.libs/libIlmThread.a ],
- [ Iex Half Imath config IlmThread ])
-
PKG_DEF([ladspa], [ladspa-0.4.17], [], [])
PKG_3RD([lame],[auto],
[ . lavtools utils ])
PKG_3RD([openexr],[auto],
- [openexr-2.2.1],
- [ IlmImf/.libs/libIlmImf.a \
- IlmImfUtil/.libs/libIlmImfUtil.a ],
- [ IlmImf config ])
+ [openexr-2.4.1],
+ [ usr/local/lib/libHalf.a \
+ usr/local/lib/libIex.a \
+ usr/local/lib/libIexMath.a \
+ usr/local/lib/libIlmThread.a \
+ usr/local/lib/libImath.a \
+ usr/local/lib/libIlmImf.a \
+ usr/local/lib/libIlmImfUtil.a ],
+ [ usr/local/include/OpenEXR ])
+
+PKG_3RD([openExr],[auto], [openExr], [] [])
+PKG_3RD([ilmBase],[auto], [ilmBase], [] [])
#PKG_3RD([festival],[no],
# [festival],
[ usr/local/include ])
PKG_3RD([dav1d],[auto],
- [dav1d-0.6.0],
+ [dav1d-0.5.1],
[ usr/local/lib*/libdav1d*.a ],
[ usr/local/include ])
PKG_PROVIDE([fftw])
PKG_PROVIDE([flac])
PKG_PROVIDE([giflib])
-PKG_PROVIDE([ilmbase], [$WANT_OPENEXR])
+PKG_PROVIDE([ilmBase], [$WANT_OPENEXR])
PKG_PROVIDE([ladspa],[$WANT_LADSPA_BUILD])
PKG_PROVIDE([lame])
PKG_PROVIDE([libavc1394],[$WANT_FIREWIRE])
PKG_PROVIDE([libaom])
PKG_PROVIDE([dav1d])
PKG_PROVIDE([libwebp])
+PKG_PROVIDE([openExr], [$WANT_OPENEXR])
PKG_PROVIDE([openexr], [$WANT_OPENEXR])
PKG_PROVIDE([openjpeg])
PKG_PROVIDE([tiff])
flac.cfg_params?= --enable-shared=no
flac.cflags?="$(call inc_path,libogg) $(call ld_path,libogg,src/.libs)"
giflib.cfg_params=echo "exec true" > ./configure; chmod +x ./configure;
-ilmbase.cfg_vars= CFLAGS+=" -Wno-narrowing" CXXFLAGS+=" -Wno-narrowing"
-ilmbase.cfg_params?=--prefix=$(call bld_path,ilmbase,usr)
-ilmbase.mak_params?=; $(MAKE) -C ilmbase* install; cd $(call bld_path,ilmbase); ln -sf lib64 usr/lib
lame.cfg_vars?= CFLAGS+=" -O"
lame.cfg_params?=--enable-shared=no
lame.mak_params?= ; cd $(call bld_path,lame,include); ln -sf . lame
openjpeg.mak_params?= ; cd $(call bld_path,openjpeg,src/lib/openjp2); ln -sf . openjpeg-2.1
opencv.cfg_vars?=$(call cmake_config,.)
opencv.cfg_params?= -DBUILD_SHARED_LIBS:BOOL=OFF
-openexr.cfg_vars?=LD_LIBRARY_PATH=$(call bld_path,ilmbase,usr/lib)
-openexr.cfg_params?=--enable-shared=no --with-ilmbase-prefix=$(call bld_path,ilmbase,usr)
+openexr.cfg_vars?=true; \#
+openexr.mak_vars?=true; \#
speech_tools.mak_params?=-j1
tiff.cfg_vars+=LIBS+=" -lpthread"
tiff.cfg_params+= --enable-shared=no --disable-zstd $(call if_pkg,libwebp,\
$(call rules,$(call std-build,fftw))
$(call rules,$(call std-build,flac,libogg))
$(call rules,$(call std-build,giflib))
-$(call rules,$(call std-build,ilmbase))
+$(call rules,$(call std-build,ilmBase, openexr))
$(call rules,$(call std-build,ladspa))
$(call rules,$(call std-build,lame))
$(call rules,$(call std-build,libaom))
$(call rules,$(call std-build,libvorbis))
$(call rules,$(call std-build,mjpegtools, libjpeg))
$(call rules,$(call std-build,opencv))
-$(call rules,$(call std-build,openexr, ilmbase))
+$(call rules,$(call std-build,openexr))
+$(call rules,$(call std-build,openExr, ilmBase))
$(call rules,$(call std-build,openjpeg))
$(call rules,$(call std-build,opus))
$(call rules,$(call std-build,speech_tools))
--- /dev/null
+diff -urN a/Makefile b/Makefile
+--- a/Makefile 1969-12-31 17:00:00.000000000 -0700
++++ b/Makefile 2019-10-14 10:54:47.354841430 -0600
+@@ -0,0 +1,363 @@
++
++_ARCH := $(shell uname -m)
++ARCH_I32 := $(shell expr "x$(_ARCH)" : 'xi[346]86.*')
++ARCH_X64 := $(shell expr "x$(_ARCH)" : 'x..._64*')
++
++ifneq ($(ARCH_I32),0)
++ASM_ARCH := elf32
++ARCH_X86_32 := 1
++ARCH_X86_64 := 0
++endif
++ifneq ($(ARCH_X64),0)
++ASM_ARCH := elf64
++ARCH_X86_32 := 0
++ARCH_X86_64 := 1
++endif
++
++BUILD=build
++DESTDIR=/
++PREFIX=usr/local
++LIBDIR=$(PREFIX)/lib
++INCDIR=$(PREFIX)/include
++# make Q="" for verbose
++Q?=@echo == $@;
++OBJDIR?=$(BUILD)/static
++NASM_BLD=$(OBJDIR)/nasm
++ENTRY_BLD=$(OBJDIR)/entry
++SRC_BLD=$(OBJDIR)/src
++BIT8_BLD=$(OBJDIR)/bits8
++BIT16_BLD=$(OBJDIR)/bits16
++TOOLS_BLD=$(BUILD)/tools
++TESTS_BLD=$(BUILD)/tests
++
++STATIC_LIB=$(BUILD)/src/libdav1d.a
++SHARED_LIB=$(BUILD)/src/libdav1d.so
++DEFS= -DNDEBUG -D_FILE_OFFSET_BITS=64 -D_POSIX_C_SOURCE=200112L
++FUZZ= -DDAV1D_MT_FUZZING
++
++BLD_INCL= $(DEFS) -I. -Isrc -Iinclude/dav1d -Iinclude \
++ -I$(BUILD) -I$(BUILD)/include -I$(BUILD)/include/dav1d
++TOOLS_INCL= $(DEFS) -Itools -I. -I$(BUILD) -I$(BUILD)/tools \
++ -Iinclude -Iinclude/dav1d -I$(BUILD)/include/dav1d \
++ -I$(BUILD)/include -I/usr/include/SDL2
++
++NP?=.NOTPARALLEL:
++$(NP)
++MAKE_P:=$(MAKE) -j NP=""
++
++all: meson_data
++ $(MAKE_P) $(STATIC_LIB) OBJDIR=$(BUILD)/static
++ $(MAKE_P) $(SHARED_LIB) OBJDIR=$(BUILD)/shared
++# req SDL
++# $(MAKE_P) $(TOOLS) OBJDIR=$(BUILD)/static
++# $(MAKE_P) $(TESTS) OBJDIR=$(BUILD)/static
++
++CC_DEFS=\
++ -DNDEBUG \
++ -D_FILE_OFFSET_BITS=64 \
++ -D_POSIX_C_SOURCE=200112L \
++
++CC_OPTS=\
++ -pipe \
++ -Wall \
++ -Winvalid-pch \
++ -Wextra \
++ -std=c99 \
++ -O3 \
++ -fvisibility=hidden \
++ -Wundef \
++ -Werror=vla \
++ -Wno-maybe-uninitialized \
++ -Wno-missing-field-initializers \
++ -Wno-unused-parameter \
++ -Werror=missing-prototypes \
++ -fomit-frame-pointer \
++ -ffast-math \
++ -fPIC \
++ -mpreferred-stack-boundary=5 \
++
++SHA_OPTS=\
++ -Wl,--no-undefined \
++ -Wl,--as-needed \
++ -Wl,-O1 \
++ -shared \
++ -fPIC \
++ -Wl,--start-group \
++ -Wl,-soname,libdav1d.so.2 \
++ -Wl,--end-group \
++ -pthread \
++
++CC_CC=$(Q)cc $(CC_OPTS) $(CFLAGS)
++NASM=$(Q)/usr/bin/nasm
++any=$(foreach i,$(2),$(1)/$(i))
++
++# nasm
++NASM_OBJS=$(call any,$(NASM_BLD), \
++ cdef.obj \
++ film_grain.obj \
++ ipred.obj \
++ itx.obj \
++ cdef_sse.obj \
++ ipred_ssse3.obj \
++ loopfilter.obj \
++ looprestoration.obj \
++ mc.obj \
++ itx_ssse3.obj \
++ looprestoration_ssse3.obj \
++ loopfilter_ssse3.obj \
++ mc_ssse3.obj \
++ cpuid.obj \
++ msac.obj )
++
++$(NASM_BLD)/%.obj: src/x86/%.asm
++ $(NASM) -f $(ASM_ARCH) \
++ $< -o $@
++
++# entry
++ENTRY_OBJS=$(call any,$(ENTRY_BLD), \
++ lib.c.o \
++ thread_task.c.o)
++$(ENTRY_BLD)/%.c.o: src/%.c
++ $(CC_CC) -Iinclude -Ibuild/include/dav1d -Isrc/entry $(BLD_INCL) \
++ -mincoming-stack-boundary=4 -o $@ -c $<
++
++# src
++SRC_OBJS=$(call any,$(SRC_BLD), \
++ cdf.o \
++ cpu.o \
++ data.o \
++ decode.o \
++ dequant_tables.o \
++ getbits.o \
++ intra_edge.o \
++ lf_mask.o \
++ log.o \
++ msac.o \
++ obu.o \
++ picture.o \
++ qm.o \
++ ref.o \
++ ref_mvs.o \
++ scan.o \
++ tables.o \
++ warpmv.o \
++ wedge.o \
++ x86/cpu.c.o)
++$(SRC_BLD)/%.o: src/%.c
++ $(CC_CC) $(BLD_INCL) -pthread -o $@ -c $<
++$(SRC_BLD)/x86/%.c.o: src/x86/%.c
++ $(CC_CC) $(BLD_INCL) -o $@ -c $<
++
++# bits
++BITS_OBJS= \
++ cdef_tmpl.o \
++ cdef_apply_tmpl.o \
++ fg_apply_tmpl.o \
++ film_grain_tmpl.o \
++ ipred_tmpl.o \
++ ipred_prepare_tmpl.o \
++ itx_tmpl.o \
++ lf_apply_tmpl.o \
++ loopfilter_tmpl.o \
++ looprestoration_tmpl.o \
++ lr_apply_tmpl.o \
++ mc_tmpl.o \
++ recon_tmpl.o \
++ x86/cdef_init_tmpl.c.o \
++ x86/film_grain_init_tmpl.c.o \
++ x86/ipred_init_tmpl.c.o \
++ x86/itx_init_tmpl.c.o \
++ x86/loopfilter_init_tmpl.c.o \
++ x86/looprestoration_init_tmpl.c.o \
++ x86/mc_init_tmpl.c.o \
++
++BIT8_OBJS=$(call any,$(BIT8_BLD),$(BITS_OBJS))
++$(BIT8_BLD)/x86/%.c.o: src/x86/%.c
++ $(CC_CC) $(BLD_INCL) -DBITDEPTH=8 -o $@ -c $<
++$(BIT8_BLD)/%.o: src/%.c
++ $(CC_CC) $(BLD_INCL) -DBITDEPTH=8 -o $@ -c $<
++
++BIT16_OBJS=$(call any,$(BIT16_BLD),$(BITS_OBJS))
++$(BIT16_BLD)/x86/%.c.o: src/x86/%.c
++ $(CC_CC) $(BLD_INCL) -DBITDEPTH=16 -o $@ -c $<
++$(BIT16_BLD)/%.o: src/%.c
++ $(CC_CC) $(BLD_INCL) -DBITDEPTH=16 -o $@ -c $<
++
++$(BUILD)/config.h:
++ echo > $@ "#pragma once"
++ echo >> $@ "#define ARCH_AARCH64 0"
++ echo >> $@ "#define ARCH_ARM 0"
++ echo >> $@ "#define ARCH_PPC64LE 0"
++ echo >> $@ "#define ARCH_X86 1"
++ echo >> $@ "#define ARCH_X86_32 $(ARCH_X86_32)"
++ echo >> $@ "#define ARCH_X86_64 $(ARCH_X86_64)"
++ echo >> $@ "#define CONFIG_16BPC 1"
++ echo >> $@ "#define CONFIG_8BPC 1"
++ echo >> $@ "#define CONFIG_LOG 1"
++ echo >> $@ "#define ENDIANNESS_BIG 0"
++ echo >> $@ "#define HAVE_ASM 1"
++ echo >> $@ "#define HAVE_POSIX_MEMALIGN 1"
++ echo >> $@ "#define HAVE_UNISTD_H 1"
++ echo >> $@ "#define STACK_ALIGNMENT 32"
++
++$(BUILD)/config.asm:
++ echo > $@ "%define ARCH_X86_32 $(ARCH_X86_32)"
++ echo >> $@ "%define ARCH_X86_64 $(ARCH_X86_64)"
++ echo >> $@ "%define PIC 1"
++ echo >> $@ "%define STACK_ALIGNMENT 32"
++
++$(BUILD)/include/vcs_version.h:
++ mkdir -p $(BUILD)/include
++ echo > $@ "#define DAV1D_VERSION \"0.5.0\""
++
++$(BUILD)/include/dav1d/version.h:
++ mkdir -p $(BUILD)/include/dav1d
++ echo > $@ "#ifndef DAV1D_VERSION_H"
++ echo >> $@ "#define DAV1D_VERSION_H"
++ echo >> $@ "#define DAV1D_API_VERSION_MAJOR 2"
++ echo >> $@ "#define DAV1D_API_VERSION_MINOR 0"
++ echo >> $@ "#define DAV1D_API_VERSION_PATCH 0"
++ echo >> $@ "#endif /* DAV1D_VERSION_H */"
++
++$(TOOLS_BLD)/cli_config.h:
++ mkdir -p $(TOOLS_BLD)
++ echo > $@ "#pragma once"
++ echo >> $@ "#define HAVE_CLOCK_GETTIME 1"
++
++.PHONY: meson_data
++meson_data:
++ make meson_dirs OBJDIR=$(BUILD)/static
++ make meson_dirs OBJDIR=$(BUILD)/shared
++ ln -sf ./include/compat/gcc/stdatomic.h .
++
++.PHONY: meson_dirs
++meson_dirs: $(OBJDIR) \
++ $(BUILD)/config.h $(BUILD)/config.asm \
++ $(BUILD)/include/vcs_version.h \
++ $(BUILD)/include/dav1d/version.h \
++ $(TOOLS_BLD)/cli_config.h \
++
++LIB_OBJS=$(ENTRY_OBJS) $(NASM_OBJS) $(SRC_OBJS) $(BIT8_OBJS) $(BIT16_OBJS)
++
++$(STATIC_LIB): DIR?=static
++$(STATIC_LIB): $(LIB_OBJS)
++ rm -f $@
++ gcc-ar csrD $@ $(LIB_OBJS)
++
++$(SHARED_LIB): DIR?=shared
++$(SHARED_LIB): $(LIB_OBJS)
++ rm -f $@
++ cc -o $@ $(LIB_OBJS) $(SHA_OPTS)
++
++# tools
++DAV1D_OBJS=$(call any,$(TOOLS_BLD),\
++ dav1d.o \
++ dav1d_cli_parse.o \
++ input/annexb.o \
++ input/ivf.o \
++ input/input.o \
++ output/md5.o \
++ output/null.o \
++ output/output.o \
++ output/y4m2.o \
++ output/yuv.o)
++
++DAV1DPLAY_OBJS=$(call any,$(TOOLS_BLD),\
++ dav1dplay.o \
++ input/annexb.o \
++ input/ivf.o \
++ input/input.o)
++
++$(TOOLS_BLD)/%.o: tools/%.c
++ $(CC_CC) $(TOOLS_INCL) -o $@ -c $<
++
++DAV1D=$(TOOLS_BLD)/dav1d
++$(DAV1D): $(DAV1D_OBJS)
++ $(CC_CC) -pthread -I$(BUILD) -o $@ $(DAV1D_OBJS) $(STATIC_LIB)
++
++DAV1DPLAY=$(TOOLS_BLD)/dav1dplay
++$(DAV1DPLAY): $(DAV1DPLAY_OBJS)
++ $(CC_CC) -pthread -o $(TOOLS_BLD)/dav1dplay $(DAV1DPLAY_OBJS) $(STATIC_LIB) -lSDL2
++
++TOOLS=$(DAV1D) $(DAV1DPLAY)
++.PHONY: tools
++tools: $(TOOLS)
++
++# tests
++TESTS_CHKASM=tests/checkasm
++TESTS_CHKASM_BLD=$(TESTS_BLD)/checkasm
++CHKASM_BIT8=$(TESTS_CHKASM_BLD)/bit8
++CHKASM_BIT16=$(TESTS_CHKASM_BLD)/bit16
++CHKASM_BITS= \
++ cdef.o \
++ ipred.o \
++ itx.o \
++ loopfilter.o \
++ looprestoration.o \
++ mc.o \
++
++CHKASM_BIT8_OBJS=$(call any,$(CHKASM_BIT8),$(CHKASM_BITS))
++CHKASM_BIT16_OBJS=$(call any,$(CHKASM_BIT16),$(CHKASM_BITS))
++
++TESTS_CHKASM_OBJS= \
++ $(TESTS_CHKASM_BLD)/checkasm.o \
++ $(TESTS_CHKASM_BLD)/msac.o \
++ $(CHKASM_BIT8_OBJS) $(CHKASM_BIT16_OBJS) \
++ $(TESTS_CHKASM_BLD)/x86/checkasm.obj \
++
++$(TESTS_CHKASM_BLD)/%.o: $(TESTS_CHKASM)/%.c
++ $(CC_CC) $(BLD_INCL) -o $@ -c $<
++$(CHKASM_BIT8)/%.o: $(TESTS_CHKASM)/%.c
++ $(CC_CC) $(BLD_INCL) -DBITDEPTH=8 -o $@ -c $<
++$(CHKASM_BIT16)/%.o: $(TESTS_CHKASM)/%.c
++ $(CC_CC) $(BLD_INCL) -DBITDEPTH=16 -o $@ -c $<
++$(TESTS_CHKASM_BLD)/x86/%.obj: $(TESTS_CHKASM)/x86/%.asm
++ @$(NASM) -f $(ASM_ARCH) \
++ $< -o $@
++
++CHECKASM=$(TESTS_BLD)/checkasm/checkasm
++$(CHECKASM): $(TESTS_CHKASM_OBJS) $(STATIC_LIB)
++ $(CC_CC) -pthread -o $@ $(TESTS_CHKASM_OBJS) $(STATIC_LIB) -lm
++
++TESTS_FUZZER=tests/libfuzzer
++TESTS_FUZZER_BLD=$(TESTS_BLD)/libfuzzer
++TESTS_FUZZER_OBJS= \
++ $(TESTS_FUZZER_BLD)/main.o \
++ $(TESTS_FUZZER_BLD)/dav1d_fuzzer.o \
++
++$(TESTS_FUZZER_BLD)/%.o: $(TESTS_FUZZER)/%.c
++ $(CC_CC) $(BLD_INCL) -o $@ -c $<
++
++DAV1D_FUZZER=$(TESTS_BLD)/dav1d_fuzzer
++$(DAV1D_FUZZER): $(TESTS_FUZZER_OBJS) $(STATIC_LIB)
++ $(CC_CC) -pthread -o $@ $(TESTS_FUZZER_OBJS) $(STATIC_LIB)
++
++TESTS=$(CHECKASM) $(DAV1D_FUZZER)
++.PHONY: tests
++tests: $(TESTS)
++
++$(OBJDIR):
++ mkdir -p $@/include/dav1d \
++ $(BUILD)/src $(BUILD)/include \
++ $(ENTRY_BLD) $(NASM_BLD) \
++ $(SRC_BLD)/x86 $(BIT8_BLD)/x86 $(BIT16_BLD)/x86 \
++ $(TOOLS_BLD) $(TOOLS_BLD)/input $(TOOLS_BLD)/output \
++ $(TESTS_CHKASM_BLD)/bit8 $(TESTS_CHKASM_BLD)/bit16 \
++ $(TESTS_CHKASM_BLD)/x86 $(TESTS_FUZZER_BLD) \
++
++clean:
++ rm -rf $(BUILD)
++
++install:
++ mkdir -p $(DESTDIR)$(LIBDIR)
++ cp -a $(STATIC_LIB) $(DESTDIR)$(LIBDIR)
++ cp -a $(SHARED_LIB) $(DESTDIR)$(LIBDIR)
++ mkdir -p $(DESTDIR)$(INCDIR)
++ cp -a include/dav1d $(DESTDIR)$(INCDIR)
++ rm -f $(DESTDIR)$(INCDIR)/dav1d/meson.build
++ rm -f $(DESTDIR)$(INCDIR)/dav1d/version.h.in
++ cp -a $(BUILD)/include/dav1d/version.h $(DESTDIR)$(INCDIR)/version.h
++
+++ /dev/null
-diff -ruN a/Makefile b/Makefile
---- a/Makefile 1969-12-31 17:00:00.000000000 -0700
-+++ b/Makefile 2020-03-12 17:08:48.095517451 -0600
-@@ -0,0 +1,368 @@
-+
-+_ARCH := $(shell uname -m)
-+ARCH_I32 := $(shell expr "x$(_ARCH)" : 'xi[346]86.*')
-+ARCH_X64 := $(shell expr "x$(_ARCH)" : 'x..._64*')
-+
-+ifneq ($(ARCH_I32),0)
-+ASM_ARCH := elf32
-+ARCH_X86_32 := 1
-+ARCH_X86_64 := 0
-+endif
-+ifneq ($(ARCH_X64),0)
-+ASM_ARCH := elf64
-+ARCH_X86_32 := 0
-+ARCH_X86_64 := 1
-+endif
-+
-+BUILD=build
-+DESTDIR=/
-+PREFIX=usr/local
-+LIBDIR=$(PREFIX)/lib
-+INCDIR=$(PREFIX)/include
-+# make Q="" for verbose
-+Q?=@echo == $@;
-+OBJDIR?=$(BUILD)/static
-+NASM_BLD=$(OBJDIR)/nasm
-+ENTRY_BLD=$(OBJDIR)/entry
-+SRC_BLD=$(OBJDIR)/src
-+BIT8_BLD=$(OBJDIR)/bits8
-+BIT16_BLD=$(OBJDIR)/bits16
-+TOOLS_BLD=$(BUILD)/tools
-+TESTS_BLD=$(BUILD)/tests
-+
-+STATIC_LIB=$(BUILD)/src/libdav1d.a
-+SHARED_LIB=$(BUILD)/src/libdav1d.so
-+DEFS= -DNDEBUG -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
-+FUZZ= -DDAV1D_MT_FUZZING
-+
-+BLD_INCL= $(DEFS) -I. -Isrc -Iinclude/dav1d -Iinclude \
-+ -I$(BUILD) -I$(BUILD)/include -I$(BUILD)/include/dav1d
-+TOOLS_INCL= $(DEFS) -Itools -I. -I$(BUILD) -I$(BUILD)/tools \
-+ -Iinclude -Iinclude/dav1d -I$(BUILD)/include/dav1d \
-+ -I$(BUILD)/include -I/usr/include/SDL2
-+
-+NP?=.NOTPARALLEL:
-+$(NP)
-+MAKE_P:=$(MAKE) -j NP=""
-+
-+all: meson_data
-+ $(MAKE_P) $(STATIC_LIB) OBJDIR=$(BUILD)/static
-+ $(MAKE_P) $(SHARED_LIB) OBJDIR=$(BUILD)/shared
-+# req SDL
-+# $(MAKE_P) $(TOOLS) OBJDIR=$(BUILD)/static
-+# $(MAKE_P) $(TESTS) OBJDIR=$(BUILD)/static
-+
-+CC_DEFS=\
-+ -DNDEBUG \
-+ -D_FILE_OFFSET_BITS=64 \
-+ -D_POSIX_C_SOURCE=200112L \
-+
-+CC_OPTS=\
-+ -pipe \
-+ -Wall \
-+ -Winvalid-pch \
-+ -Wextra \
-+ -std=c99 \
-+ -O3 \
-+ -fvisibility=hidden \
-+ -Wundef \
-+ -Werror=vla \
-+ -Wno-maybe-uninitialized \
-+ -Wno-missing-field-initializers \
-+ -Wno-unused-parameter \
-+ -Werror=missing-prototypes \
-+ -fomit-frame-pointer \
-+ -ffast-math \
-+ -fPIC \
-+ -mpreferred-stack-boundary=6 \
-+
-+SHA_OPTS=\
-+ -Wl,--no-undefined \
-+ -Wl,--as-needed \
-+ -Wl,-O1 \
-+ -shared \
-+ -fPIC \
-+ -Wl,--start-group \
-+ -Wl,-soname,libdav1d.so.4 \
-+ -Wl,--end-group \
-+ -pthread \
-+
-+CC_CC=$(Q)cc $(CC_OPTS) $(CFLAGS)
-+NASM=$(Q)/usr/bin/nasm
-+any=$(foreach i,$(2),$(1)/$(i))
-+
-+# nasm
-+NASM_OBJS=$(call any,$(NASM_BLD), \
-+ cpuid.obj \
-+ msac.obj \
-+ cdef.obj \
-+ film_grain.obj \
-+ ipred.obj \
-+ itx.obj \
-+ loopfilter.obj \
-+ looprestoration.obj \
-+ mc.obj \
-+ cdef_sse.obj \
-+ film_grain_ssse3.obj \
-+ ipred_ssse3.obj \
-+ itx_ssse3.obj \
-+ loopfilter_ssse3.obj \
-+ looprestoration_ssse3.obj \
-+ mc_ssse3.obj)
-+
-+$(NASM_BLD)/%.obj: src/x86/%.asm
-+ $(NASM) -f $(ASM_ARCH) \
-+ $< -o $@
-+
-+# entry
-+ENTRY_OBJS=$(call any,$(ENTRY_BLD), \
-+ lib.c.o \
-+ thread_task.c.o)
-+$(ENTRY_BLD)/%.c.o: src/%.c
-+ $(CC_CC) -Iinclude -Ibuild/include/dav1d -Isrc/entry $(BLD_INCL) \
-+ -mincoming-stack-boundary=4 -o $@ -c $<
-+
-+# src
-+SRC_OBJS=$(call any,$(SRC_BLD), \
-+ cdf.o \
-+ cpu.o \
-+ data.o \
-+ decode.o \
-+ dequant_tables.o \
-+ getbits.o \
-+ intra_edge.o \
-+ itx_1d.o \
-+ lf_mask.o \
-+ log.o \
-+ msac.o \
-+ obu.o \
-+ picture.o \
-+ qm.o \
-+ ref.o \
-+ ref_mvs.o \
-+ scan.o \
-+ tables.o \
-+ warpmv.o \
-+ wedge.o \
-+ x86/cpu.c.o \
-+ x86/msac_init.c.o)
-+$(SRC_BLD)/%.o: src/%.c
-+ $(CC_CC) $(BLD_INCL) -pthread -o $@ -c $<
-+$(SRC_BLD)/x86/%.c.o: src/x86/%.c
-+ $(CC_CC) $(BLD_INCL) -o $@ -c $<
-+
-+# bits
-+BITS_OBJS= \
-+ cdef_tmpl.o \
-+ cdef_apply_tmpl.o \
-+ fg_apply_tmpl.o \
-+ film_grain_tmpl.o \
-+ ipred_tmpl.o \
-+ ipred_prepare_tmpl.o \
-+ itx_tmpl.o \
-+ lf_apply_tmpl.o \
-+ loopfilter_tmpl.o \
-+ looprestoration_tmpl.o \
-+ lr_apply_tmpl.o \
-+ mc_tmpl.o \
-+ recon_tmpl.o \
-+ x86/cdef_init_tmpl.c.o \
-+ x86/film_grain_init_tmpl.c.o \
-+ x86/ipred_init_tmpl.c.o \
-+ x86/itx_init_tmpl.c.o \
-+ x86/loopfilter_init_tmpl.c.o \
-+ x86/looprestoration_init_tmpl.c.o \
-+ x86/mc_init_tmpl.c.o \
-+
-+BIT8_OBJS=$(call any,$(BIT8_BLD),$(BITS_OBJS))
-+$(BIT8_BLD)/x86/%.c.o: src/x86/%.c
-+ $(CC_CC) $(BLD_INCL) -DBITDEPTH=8 -o $@ -c $<
-+$(BIT8_BLD)/%.o: src/%.c
-+ $(CC_CC) $(BLD_INCL) -DBITDEPTH=8 -o $@ -c $<
-+
-+BIT16_OBJS=$(call any,$(BIT16_BLD),$(BITS_OBJS))
-+$(BIT16_BLD)/x86/%.c.o: src/x86/%.c
-+ $(CC_CC) $(BLD_INCL) -DBITDEPTH=16 -o $@ -c $<
-+$(BIT16_BLD)/%.o: src/%.c
-+ $(CC_CC) $(BLD_INCL) -DBITDEPTH=16 -o $@ -c $<
-+
-+$(BUILD)/config.h:
-+ echo > $@ "#pragma once"
-+ echo >> $@ "#define ARCH_AARCH64 0"
-+ echo >> $@ "#define ARCH_ARM 0"
-+ echo >> $@ "#define ARCH_PPC64LE 0"
-+ echo >> $@ "#define ARCH_X86 1"
-+ echo >> $@ "#define ARCH_X86_32 $(ARCH_X86_32)"
-+ echo >> $@ "#define ARCH_X86_64 $(ARCH_X86_64)"
-+ echo >> $@ "#define CONFIG_16BPC 1"
-+ echo >> $@ "#define CONFIG_8BPC 1"
-+ echo >> $@ "#define CONFIG_LOG 1"
-+ echo >> $@ "#define ENDIANNESS_BIG 0"
-+ echo >> $@ "#define HAVE_ASM 1"
-+ echo >> $@ "#define HAVE_POSIX_MEMALIGN 1"
-+ echo >> $@ "#define HAVE_UNISTD_H 1"
-+ echo >> $@ "#define STACK_ALIGNMENT 64"
-+
-+$(BUILD)/config.asm:
-+ echo > $@ "%define ARCH_X86_32 $(ARCH_X86_32)"
-+ echo >> $@ "%define ARCH_X86_64 $(ARCH_X86_64)"
-+ echo >> $@ "%define PIC 1"
-+ echo >> $@ "%define STACK_ALIGNMENT 64"
-+
-+$(BUILD)/include/vcs_version.h:
-+ mkdir -p $(BUILD)/include
-+ echo > $@ "#define DAV1D_VERSION \"0.6.0\""
-+
-+$(BUILD)/include/dav1d/version.h:
-+ mkdir -p $(BUILD)/include/dav1d
-+ echo > $@ "#ifndef DAV1D_VERSION_H"
-+ echo >> $@ "#define DAV1D_VERSION_H"
-+ echo >> $@ "#define DAV1D_API_VERSION_MAJOR 2"
-+ echo >> $@ "#define DAV1D_API_VERSION_MINOR 0"
-+ echo >> $@ "#define DAV1D_API_VERSION_PATCH 0"
-+ echo >> $@ "#endif /* DAV1D_VERSION_H */"
-+
-+$(TOOLS_BLD)/cli_config.h:
-+ mkdir -p $(TOOLS_BLD)
-+ echo > $@ "#pragma once"
-+ echo >> $@ "#define HAVE_CLOCK_GETTIME 1"
-+
-+.PHONY: meson_data
-+meson_data:
-+ make meson_dirs OBJDIR=$(BUILD)/static
-+ make meson_dirs OBJDIR=$(BUILD)/shared
-+ ln -sf ./include/compat/gcc/stdatomic.h .
-+
-+.PHONY: meson_dirs
-+meson_dirs: $(OBJDIR) \
-+ $(BUILD)/config.h $(BUILD)/config.asm \
-+ $(BUILD)/include/vcs_version.h \
-+ $(BUILD)/include/dav1d/version.h \
-+ $(TOOLS_BLD)/cli_config.h \
-+
-+LIB_OBJS=$(ENTRY_OBJS) $(NASM_OBJS) $(SRC_OBJS) $(BIT8_OBJS) $(BIT16_OBJS)
-+
-+$(STATIC_LIB): DIR?=static
-+$(STATIC_LIB): $(LIB_OBJS)
-+ rm -f $@
-+ gcc-ar csrD $@ $(LIB_OBJS)
-+
-+$(SHARED_LIB): DIR?=shared
-+$(SHARED_LIB): $(LIB_OBJS)
-+ rm -f $@
-+ cc -o $@ $(LIB_OBJS) $(SHA_OPTS)
-+
-+# tools
-+DAV1D_OBJS=$(call any,$(TOOLS_BLD),\
-+ dav1d.o \
-+ dav1d_cli_parse.o \
-+ input/annexb.o \
-+ input/ivf.o \
-+ input/input.o \
-+ input/section5.o \
-+ output/md5.o \
-+ output/null.o \
-+ output/output.o \
-+ output/y4m2.o \
-+ output/yuv.o)
-+
-+DAV1DPLAY_OBJS=$(call any,$(TOOLS_BLD),\
-+ ../examples/dav1dplay.o \
-+ input/annexb.o \
-+ input/section5.o \
-+ input/ivf.o \
-+ input/input.o)
-+
-+$(TOOLS_BLD)/%.o: tools/%.c
-+ $(CC_CC) $(TOOLS_INCL) -o $@ -c $<
-+
-+DAV1D=$(TOOLS_BLD)/dav1d
-+$(DAV1D): $(DAV1D_OBJS)
-+ $(CC_CC) -pthread -I$(BUILD) -o $@ $(DAV1D_OBJS) $(STATIC_LIB)
-+
-+DAV1DPLAY=$(TOOLS_BLD)/dav1dplay
-+$(DAV1DPLAY): $(DAV1DPLAY_OBJS)
-+ $(CC_CC) -pthread -o $(TOOLS_BLD)/dav1dplay $(DAV1DPLAY_OBJS) $(STATIC_LIB) -lSDL2
-+
-+TOOLS=$(DAV1D) $(DAV1DPLAY)
-+.PHONY: tools
-+tools: $(TOOLS)
-+
-+# tests
-+TESTS_CHKASM=tests/checkasm
-+TESTS_CHKASM_BLD=$(TESTS_BLD)/checkasm
-+CHKASM_BIT8=$(TESTS_CHKASM_BLD)/bit8
-+CHKASM_BIT16=$(TESTS_CHKASM_BLD)/bit16
-+CHKASM_BITS= \
-+ cdef.o \
-+ ipred.o \
-+ itx.o \
-+ loopfilter.o \
-+ looprestoration.o \
-+ mc.o \
-+
-+CHKASM_BIT8_OBJS=$(call any,$(CHKASM_BIT8),$(CHKASM_BITS))
-+CHKASM_BIT16_OBJS=$(call any,$(CHKASM_BIT16),$(CHKASM_BITS))
-+
-+TESTS_CHKASM_OBJS= \
-+ $(TESTS_CHKASM_BLD)/checkasm.o \
-+ $(TESTS_CHKASM_BLD)/msac.o \
-+ $(CHKASM_BIT8_OBJS) $(CHKASM_BIT16_OBJS) \
-+ $(TESTS_CHKASM_BLD)/x86/checkasm.obj \
-+
-+$(TESTS_CHKASM_BLD)/%.o: $(TESTS_CHKASM)/%.c
-+ $(CC_CC) $(BLD_INCL) -o $@ -c $<
-+$(CHKASM_BIT8)/%.o: $(TESTS_CHKASM)/%.c
-+ $(CC_CC) $(BLD_INCL) -DBITDEPTH=8 -o $@ -c $<
-+$(CHKASM_BIT16)/%.o: $(TESTS_CHKASM)/%.c
-+ $(CC_CC) $(BLD_INCL) -DBITDEPTH=16 -o $@ -c $<
-+$(TESTS_CHKASM_BLD)/x86/%.obj: $(TESTS_CHKASM)/x86/%.asm
-+ @$(NASM) -f $(ASM_ARCH) \
-+ $< -o $@
-+
-+CHECKASM=$(TESTS_BLD)/checkasm/checkasm
-+$(CHECKASM): $(TESTS_CHKASM_OBJS) $(STATIC_LIB)
-+ $(CC_CC) -pthread -o $@ $(TESTS_CHKASM_OBJS) $(STATIC_LIB) -lm
-+
-+TESTS_FUZZER=tests/libfuzzer
-+TESTS_FUZZER_BLD=$(TESTS_BLD)/libfuzzer
-+TESTS_FUZZER_OBJS= \
-+ $(TESTS_FUZZER_BLD)/main.o \
-+ $(TESTS_FUZZER_BLD)/dav1d_fuzzer.o \
-+
-+$(TESTS_FUZZER_BLD)/%.o: $(TESTS_FUZZER)/%.c
-+ $(CC_CC) $(BLD_INCL) -o $@ -c $<
-+
-+DAV1D_FUZZER=$(TESTS_BLD)/dav1d_fuzzer
-+$(DAV1D_FUZZER): $(TESTS_FUZZER_OBJS) $(STATIC_LIB)
-+ $(CC_CC) -pthread -o $@ $(TESTS_FUZZER_OBJS) $(STATIC_LIB)
-+
-+TESTS=$(CHECKASM) $(DAV1D_FUZZER)
-+.PHONY: tests
-+tests: $(TESTS)
-+
-+$(OBJDIR):
-+ mkdir -p $@/include/dav1d \
-+ $(BUILD)/src $(BUILD)/include $(BUILD)/examples \
-+ $(ENTRY_BLD) $(NASM_BLD) \
-+ $(SRC_BLD)/x86 $(BIT8_BLD)/x86 $(BIT16_BLD)/x86 \
-+ $(TOOLS_BLD) $(TOOLS_BLD)/input $(TOOLS_BLD)/output \
-+ $(TESTS_CHKASM_BLD)/bit8 $(TESTS_CHKASM_BLD)/bit16 \
-+ $(TESTS_CHKASM_BLD)/x86 $(TESTS_FUZZER_BLD) \
-+
-+clean:
-+ rm -rf $(BUILD)
-+
-+install:
-+ mkdir -p $(DESTDIR)$(LIBDIR)
-+ cp -a $(STATIC_LIB) $(DESTDIR)$(LIBDIR)
-+ cp -a $(SHARED_LIB) $(DESTDIR)$(LIBDIR)
-+ mkdir -p $(DESTDIR)$(INCDIR)
-+ cp -a include/dav1d $(DESTDIR)$(INCDIR)
-+ rm -f $(DESTDIR)$(INCDIR)/dav1d/meson.build
-+ rm -f $(DESTDIR)$(INCDIR)/dav1d/version.h.in
-+ cp -a $(BUILD)/include/dav1d/version.h $(DESTDIR)$(INCDIR)/version.h
-+
projects / goodguy / cinelerra.git / commitdiff
