}
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))
-diff -ruN a/Makefile b/Makefile
+diff -urN 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 @@
++++ 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.*')
+
+STATIC_LIB=$(BUILD)/src/libdav1d.a
+SHARED_LIB=$(BUILD)/src/libdav1d.so
-+DEFS= -DNDEBUG -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
++DEFS= -DNDEBUG -D_FILE_OFFSET_BITS=64 -D_POSIX_C_SOURCE=200112L
+FUZZ= -DDAV1D_MT_FUZZING
+
+BLD_INCL= $(DEFS) -I. -Isrc -Iinclude/dav1d -Iinclude \
+ -fomit-frame-pointer \
+ -ffast-math \
+ -fPIC \
-+ -mpreferred-stack-boundary=6 \
++ -mpreferred-stack-boundary=5 \
+
+SHA_OPTS=\
+ -shared \
+ -fPIC \
+ -Wl,--start-group \
-+ -Wl,-soname,libdav1d.so.4 \
++ -Wl,-soname,libdav1d.so.2 \
+ -Wl,--end-group \
+ -pthread \
+
+
+# nasm
+NASM_OBJS=$(call any,$(NASM_BLD), \
-+ cpuid.obj \
-+ msac.obj \
+ cdef.obj \
+ film_grain.obj \
+ ipred.obj \
+ itx.obj \
++ cdef_sse.obj \
++ ipred_ssse3.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)
++ loopfilter_ssse3.obj \
++ mc_ssse3.obj \
++ cpuid.obj \
++ msac.obj )
+
+$(NASM_BLD)/%.obj: src/x86/%.asm
+ $(NASM) -f $(ASM_ARCH) \
+ dequant_tables.o \
+ getbits.o \
+ intra_edge.o \
-+ itx_1d.o \
+ lf_mask.o \
+ log.o \
+ msac.o \
+ tables.o \
+ warpmv.o \
+ wedge.o \
-+ x86/cpu.c.o \
-+ x86/msac_init.c.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
+ echo >> $@ "#define HAVE_ASM 1"
+ echo >> $@ "#define HAVE_POSIX_MEMALIGN 1"
+ echo >> $@ "#define HAVE_UNISTD_H 1"
-+ echo >> $@ "#define STACK_ALIGNMENT 64"
++ 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 64"
++ echo >> $@ "%define STACK_ALIGNMENT 32"
+
+$(BUILD)/include/vcs_version.h:
+ mkdir -p $(BUILD)/include
-+ echo > $@ "#define DAV1D_VERSION \"0.6.0\""
++ echo > $@ "#define DAV1D_VERSION \"0.5.0\""
+
+$(BUILD)/include/dav1d/version.h:
+ mkdir -p $(BUILD)/include/dav1d
+ input/annexb.o \
+ input/ivf.o \
+ input/input.o \
-+ input/section5.o \
+ output/md5.o \
+ output/null.o \
+ output/output.o \
+ output/yuv.o)
+
+DAV1DPLAY_OBJS=$(call any,$(TOOLS_BLD),\
-+ ../examples/dav1dplay.o \
++ dav1dplay.o \
+ input/annexb.o \
-+ input/section5.o \
+ input/ivf.o \
+ input/input.o)
+
+
+$(OBJDIR):
+ mkdir -p $@/include/dav1d \
-+ $(BUILD)/src $(BUILD)/include $(BUILD)/examples \
++ $(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 \
projects / goodguy / cinelerra.git / commitdiff
