diff --git a/veejay-current/veejay-server/Makefile.am b/veejay-current/veejay-server/Makefile.am index 5c834acd..bd0932b0 100644 --- a/veejay-current/veejay-server/Makefile.am +++ b/veejay-current/veejay-server/Makefile.am @@ -8,7 +8,7 @@ endif SUBDIRS += aclib SUBDIRS += libOSC libhash libvjmsg libvjmem -SUBDIRS += bio2jack libvevo liblzo libvje libplugger libsample libvjnet libyuv libel libstream libsamplerec +SUBDIRS += bio2jack libvevo liblzo libvje libplugger libsample libvjnet libsubsample libyuv libel libstream libsamplerec SUBDIRS += veejay SUBDIRS += livido-plugins SUBDIRS += man diff --git a/veejay-current/veejay-server/configure.ac b/veejay-current/veejay-server/configure.ac index 6cfa2976..1103e095 100644 --- a/veejay-current/veejay-server/configure.ac +++ b/veejay-current/veejay-server/configure.ac @@ -1,12 +1,12 @@ dnl Process this file with autoconf to produce a configure script. dnl AC_INIT -AC_INIT([veejay],[1.5.34],[http://www.veejayhq.net]) +AC_INIT([veejay],[1.5.35],[http://www.veejayhq.net]) AC_PREREQ(2.57) AC_CONFIG_SRCDIR([veejay/veejay.c]) VEEJAY_MAJOR_VERSION=1 VEEJAY_MINOR_VERSION=5 -VEEJAY_MICRO_VERSION=34 +VEEJAY_MICRO_VERSION=35 VEEJAY_VERSION=$VEEJAY_MAJOR_VERSION.$VEEJAY_MINOR_VERSION.$VEEJAY_MICRO_VERSION VEEJAY_CODENAME="Veejay Classic - build $VEEJAY_MINOR_VERSION $VEEJAY_MICRO_VERSION" AC_CONFIG_HEADERS([config.h]) @@ -37,6 +37,8 @@ AC_CONFIG_MACRO_DIR([m4]) dnl kill CFLAGS CFLAGS="" + + AC_ARG_ENABLE(strict, AC_HELP_STRING([--enable-strict], [Compile in paranoia assertion checking])) @@ -284,8 +286,7 @@ have_ppccpu=false have_ps2=false OP_CFLAGS="" -YUVCFLAGS="-fif-conversion" - +SUBSAMPLE_CFLAGS="" AC_MSG_CHECKING([Architecture]) case $host_cpu in i[[3-7]]86) @@ -296,16 +297,15 @@ case $host_cpu in PROGRAM_NOPIC="-fno-PIC" if test "x$enable_debug" != "xyes" ; then - OP_CFLAGS="-O3" + OP_CFLAGS="-O2" fi AC_SUBST(OP_CFLAGS) - AC_SUBST(YUVCFLAGS) dnl If the host is pentium, align on double word boundary case $host_cpu in i686) - CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $OP_CFLAGS" ;; *) ;; @@ -317,7 +317,13 @@ case $host_cpu in AC_DEFINE(ARCH_X86_64,1, [Compiling for x86-64 architecture CPU]) have_x86cpu=true have_x86_64cpu=true - CFLAGS="$CFLAGS -m64 -fPIC -DPIC" + if test "x$enable_debug" != "xyes" ; then + OP_CFLAGS="-O2" + fi + + AC_SUBST(OP_CFLAGS) + SUBSAMPLE_CFLAGS="-m64 -fPIC -DPIC" + CFLAGS="$CFLAGS -m64 -fPIC -DPIC $OP_CFLAGS" ;; powerpc | powerpc64) AC_DEFINE(HAVE_PPCCPU,1, [Compiling for PowerPC CPU]) @@ -986,7 +992,9 @@ dnl We do this last as it can screw up library detection etc... CFLAGS="$ARCHFLAGS $CFLAGS" CXXFLAGS="$ARCHFLAGS $CXXFLAGS" +SUBSAMPLE_CFLAGS="$ARCHFLAGS $SUBSAMPLE_CFLAGS" +AC_SUBST(SUBSAMPLE_CFLAGS) if test "x${GCC}" != "xyes" ; then enable_compile_warnings=no @@ -1073,6 +1081,7 @@ libvje/Makefile libplugger/Makefile libsample/Makefile libvjnet/Makefile +libsubsample/Makefile libyuv/Makefile libel/Makefile libstream/Makefile @@ -1091,8 +1100,6 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([ Veejay ${VERSION} build configuration :]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([ Compiler flags: $CFLAGS]) -AC_MSG_NOTICE([ $YUVCFLAGS]) -AC_MSG_NOTICE([ $OP_CFLAGS]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([ Architecture: ${host_cpu} ]) AC_MSG_NOTICE([]) diff --git a/veejay-current/veejay-server/libOSC/Makefile.am b/veejay-current/veejay-server/libOSC/Makefile.am index 657a8fc3..c2b96863 100644 --- a/veejay-current/veejay-server/libOSC/Makefile.am +++ b/veejay-current/veejay-server/libOSC/Makefile.am @@ -1,8 +1,6 @@ INCLUDES = -I$(top_srcdir)/libOSC -I$(includedir) -AM_CFLAGS=$(OP_CFLAGS) OSC_LIB_FILE = libOSC.la noinst_LTLIBRARIES = $(OSC_LIB_FILE) -libOSC_la_CFLAGS = $(AM_CFLAGS) libOSC_la_SOURCES = OSC-address-space.c \ OSC-callbacklist.c \ OSC-drop.c \ diff --git a/veejay-current/veejay-server/libel/Makefile.am b/veejay-current/veejay-server/libel/Makefile.am index 18856246..f01cea4e 100644 --- a/veejay-current/veejay-server/libel/Makefile.am +++ b/veejay-current/veejay-server/libel/Makefile.am @@ -1,7 +1,6 @@ # Makefile for veejay MAINTAINERCLEANFILES = Makefile.in -AM_CFLAGS=$(OP_CFLAGS) INCLUDES = -I$(top_srcdir) \ -I$(includedir) \ diff --git a/veejay-current/veejay-server/libhash/Makefile.am b/veejay-current/veejay-server/libhash/Makefile.am index daae4010..c03f9fd7 100644 --- a/veejay-current/veejay-server/libhash/Makefile.am +++ b/veejay-current/veejay-server/libhash/Makefile.am @@ -1,7 +1,6 @@ # Makefile for veejay EXTRA_DIST= hash.h MAINTAINERCLEANFILES=Makefile.in -AM_CFLAGS=$(OP_CFLAGS) INCLUDES = -I$(top_srcdir) -I$(includedir) HASH_LIB_FILE = libhash.la noinst_LTLIBRARIES = $(HASH_LIB_FILE) diff --git a/veejay-current/veejay-server/liblzo/Makefile.am b/veejay-current/veejay-server/liblzo/Makefile.am index d15ddea4..adb172a4 100644 --- a/veejay-current/veejay-server/liblzo/Makefile.am +++ b/veejay-current/veejay-server/liblzo/Makefile.am @@ -1,7 +1,6 @@ # Makefile for veejay MAINTAINERCLEANFILES = Makefile.in -AM_CFLAGS=$(OP_CFLAGS) INCLUDES = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/vjmem \ -I$(top_srcdir)/vjmsg diff --git a/veejay-current/veejay-server/libplugger/Makefile.am b/veejay-current/veejay-server/libplugger/Makefile.am index 423aa1b3..4224e8c6 100644 --- a/veejay-current/veejay-server/libplugger/Makefile.am +++ b/veejay-current/veejay-server/libplugger/Makefile.am @@ -2,8 +2,6 @@ MAINTAINERCLEANFILES = Makefile.in INCLUDES = -I$(top_srcdir)/libplugger -I$(includedir) -I$(top_srcdir)/libhash -I$(top_srcdir)/libvevo ${FFMPEG_CFLAGS} -AM_CFLAGS = $(CFLAGS) $(FREEFRAME_CFLAGS) - LIBVJPLUG_LIB_FILE = libvjplug.la noinst_LTLIBRARIES = $(LIBVJPLUG_LIB_FILE) diff --git a/veejay-current/veejay-server/libsample/Makefile.am b/veejay-current/veejay-server/libsample/Makefile.am index 1f09d5d5..0666e131 100644 --- a/veejay-current/veejay-server/libsample/Makefile.am +++ b/veejay-current/veejay-server/libsample/Makefile.am @@ -9,7 +9,6 @@ endif INCLUDES += $(FFMPEG_CFLAGS) $(XML2_CFLAGS) $(MJPEGTOOLS_CFLAGS) -AM_CFLAGS=$(OP_CFLAGS) SAMPLE_LIB_FILE = libsample.la noinst_LTLIBRARIES = $(SAMPLE_LIB_FILE) libsample_la_SOURCES = sampleadm.c diff --git a/veejay-current/veejay-server/libsample/sampleadm.c b/veejay-current/veejay-server/libsample/sampleadm.c index d9bc59c9..41417c73 100644 --- a/veejay-current/veejay-server/libsample/sampleadm.c +++ b/veejay-current/veejay-server/libsample/sampleadm.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -949,7 +950,7 @@ void sample_del_all() sample_info *si = sample_get(i); if(si->edit_list) { char key[32]; - snprintf(key, "p%p", si->edit_list ); + snprintf(key,sizeof(key), "p%p", si->edit_list ); if( vevo_property_get( port, key, 0, NULL ) == VEVO_ERROR_NOSUCH_PROPERTY ) { vevo_property_set( port, key, VEVO_ATOM_TYPE_VOIDPTR,1,&(si->edit_list)); } diff --git a/veejay-current/veejay-server/libsamplerec/Makefile.am b/veejay-current/veejay-server/libsamplerec/Makefile.am index 099d4a98..e666a109 100644 --- a/veejay-current/veejay-server/libsamplerec/Makefile.am +++ b/veejay-current/veejay-server/libsamplerec/Makefile.am @@ -12,7 +12,6 @@ endif INCLUDES += $(XML2_CFLAGS) $(FFMPEG_CFLAGS) $(MJPEGTOOLS_CFLAGS) -AM_CFLAGS=$(OP_CFLAGS) SAMPLEREC_LIB_FILE = libsamplerec.la noinst_LTLIBRARIES = $(SAMPLEREC_LIB_FILE) libsamplerec_la_SOURCES = samplerecord.c diff --git a/veejay-current/veejay-server/libsamplerec/samplerecord.c b/veejay-current/veejay-server/libsamplerec/samplerecord.c index 5797a847..e16aa85c 100644 --- a/veejay-current/veejay-server/libsamplerec/samplerecord.c +++ b/veejay-current/veejay-server/libsamplerec/samplerecord.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include diff --git a/veejay-current/veejay-server/libstream/Makefile.am b/veejay-current/veejay-server/libstream/Makefile.am index 9d620a78..094e9102 100644 --- a/veejay-current/veejay-server/libstream/Makefile.am +++ b/veejay-current/veejay-server/libstream/Makefile.am @@ -1,6 +1,5 @@ # Makefile for veejay MAINTAINERCLEANFILES = Makefile.in -AM_CFLAGS=$(OP_CFLAGS) INCLUDES = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/vjmem \ -I$(top_srcdir)/vjmsg \ -I$(top_srcdir)/libvjnet/ \ diff --git a/veejay-current/veejay-server/libstream/vj-tag.c b/veejay-current/veejay-server/libstream/vj-tag.c index 74250fb2..ead59554 100644 --- a/veejay-current/veejay-server/libstream/vj-tag.c +++ b/veejay-current/veejay-server/libstream/vj-tag.c @@ -38,6 +38,7 @@ #ifdef SUPPORT_READ_DV2 #include #endif +#include #include #include #include @@ -64,7 +65,6 @@ #include #include - static veejay_t *_tag_info = NULL; static hash_t *TagHash = NULL; static int this_tag_id = 0; diff --git a/veejay-current/veejay-server/libsubsample/Makefile.am b/veejay-current/veejay-server/libsubsample/Makefile.am new file mode 100644 index 00000000..5c657c0b --- /dev/null +++ b/veejay-current/veejay-server/libsubsample/Makefile.am @@ -0,0 +1,10 @@ +# Makefile for veejay +CFLAGS= +AM_CFLAGS=$(SUBSAMPLE_CFLAGS) +MAINTAINERCLEANFILES = Makefile.in +INCLUDES = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/vjmem -I$(top_srcdir)/vjmsg +SUBSAMPLE_LIB_FILE = libsubsample.la +pkginclude_HEADERS=subsample.h +EXTRA_DIST = mmx.h subsample.h mmx_macros.h +noinst_LTLIBRARIES = $(SUBSAMPLE_LIB_FILE) +libsubsample_la_SOURCES = subsample.c diff --git a/veejay-current/veejay-server/libsubsample/mmx.h b/veejay-current/veejay-server/libsubsample/mmx.h new file mode 100644 index 00000000..952d27b4 --- /dev/null +++ b/veejay-current/veejay-server/libsubsample/mmx.h @@ -0,0 +1,265 @@ +/* + * mmx.h + * Copyright (C) 2000-2001 Michel Lespinasse + * Copyright (C) 1999-2000 Aaron Holtzman + * + * This file is part of mpeg2dec, a free MPEG-2 video stream decoder. + * See http://libmpeg2.sourceforge.net/ for updates. + * + * mpeg2dec is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * mpeg2dec is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* + * The type of an value that fits in an MMX register (note that long + * long constant values MUST be suffixed by LL and unsigned long long + * values by ULL, lest they be truncated by the compiler) + */ + +#define ATTR_ALIGN(align) __attribute__ ((__aligned__ (align))) + +typedef union { + long long q; /* Quadword (64-bit) value */ + unsigned long long uq; /* Unsigned Quadword */ + int d[2]; /* 2 Doubleword (32-bit) values */ + unsigned int ud[2]; /* 2 Unsigned Doubleword */ + short w[4]; /* 4 Word (16-bit) values */ + unsigned short uw[4]; /* 4 Unsigned Word */ + char b[8]; /* 8 Byte (8-bit) values */ + unsigned char ub[8]; /* 8 Unsigned Byte */ + float s[2]; /* Single-precision (32-bit) value */ +} ATTR_ALIGN(8) mmx_t; /* On an 8-byte (64-bit) boundary */ + + +#define mmx_i2r(op,imm,reg) \ + __asm__ __volatile__ (#op " %0, %%" #reg \ + : /* nothing */ \ + : "i" (imm) ) + +#define mmx_m2r(op,mem,reg) \ + __asm__ __volatile__ (#op " %0, %%" #reg \ + : /* nothing */ \ + : "m" (mem)) + +#define mmx_r2m(op,reg,mem) \ + __asm__ __volatile__ (#op " %%" #reg ", %0" \ + : "=m" (mem) \ + : /* nothing */ ) + +#define mmx_r2r(op,regs,regd) \ + __asm__ __volatile__ (#op " %" #regs ", %" #regd) + + +#define emms() __asm__ __volatile__ ("emms") + +#define movd_m2r(var,reg) mmx_m2r (movd, var, reg) +#define movd_r2m(reg,var) mmx_r2m (movd, reg, var) +#define movd_v2r(var,reg) __asm__ __volatile__ ("movd %0, %%" #reg \ + : /* nothing */ \ + : "rm" (var)) +#define movd_r2v(reg,var) __asm__ __volatile__ ("movd %%" #reg ", %0" \ + : "=rm" (var) \ + : /* nothing */ ) + +#define movq_m2r(var,reg) mmx_m2r (movq, var, reg) +#define movq_r2m(reg,var) mmx_r2m (movq, reg, var) +#define movq_r2r(regs,regd) mmx_r2r (movq, regs, regd) + +#define packssdw_m2r(var,reg) mmx_m2r (packssdw, var, reg) +#define packssdw_r2r(regs,regd) mmx_r2r (packssdw, regs, regd) +#define packsswb_m2r(var,reg) mmx_m2r (packsswb, var, reg) +#define packsswb_r2r(regs,regd) mmx_r2r (packsswb, regs, regd) + +#define packuswb_m2r(var,reg) mmx_m2r (packuswb, var, reg) +#define packuswb_r2r(regs,regd) mmx_r2r (packuswb, regs, regd) + +#define paddb_m2r(var,reg) mmx_m2r (paddb, var, reg) +#define paddb_r2r(regs,regd) mmx_r2r (paddb, regs, regd) +#define paddd_m2r(var,reg) mmx_m2r (paddd, var, reg) +#define paddd_r2r(regs,regd) mmx_r2r (paddd, regs, regd) +#define paddw_m2r(var,reg) mmx_m2r (paddw, var, reg) +#define paddw_r2r(regs,regd) mmx_r2r (paddw, regs, regd) + +#define paddsb_m2r(var,reg) mmx_m2r (paddsb, var, reg) +#define paddsb_r2r(regs,regd) mmx_r2r (paddsb, regs, regd) +#define paddsw_m2r(var,reg) mmx_m2r (paddsw, var, reg) +#define paddsw_r2r(regs,regd) mmx_r2r (paddsw, regs, regd) + +#define paddusb_m2r(var,reg) mmx_m2r (paddusb, var, reg) +#define paddusb_r2r(regs,regd) mmx_r2r (paddusb, regs, regd) +#define paddusw_m2r(var,reg) mmx_m2r (paddusw, var, reg) +#define paddusw_r2r(regs,regd) mmx_r2r (paddusw, regs, regd) + +#define pand_m2r(var,reg) mmx_m2r (pand, var, reg) +#define pand_r2r(regs,regd) mmx_r2r (pand, regs, regd) + +#define pandn_m2r(var,reg) mmx_m2r (pandn, var, reg) +#define pandn_r2r(regs,regd) mmx_r2r (pandn, regs, regd) + +#define pcmpeqb_m2r(var,reg) mmx_m2r (pcmpeqb, var, reg) +#define pcmpeqb_r2r(regs,regd) mmx_r2r (pcmpeqb, regs, regd) +#define pcmpeqd_m2r(var,reg) mmx_m2r (pcmpeqd, var, reg) +#define pcmpeqd_r2r(regs,regd) mmx_r2r (pcmpeqd, regs, regd) +#define pcmpeqw_m2r(var,reg) mmx_m2r (pcmpeqw, var, reg) +#define pcmpeqw_r2r(regs,regd) mmx_r2r (pcmpeqw, regs, regd) + +#define pcmpgtb_m2r(var,reg) mmx_m2r (pcmpgtb, var, reg) +#define pcmpgtb_r2r(regs,regd) mmx_r2r (pcmpgtb, regs, regd) +#define pcmpgtd_m2r(var,reg) mmx_m2r (pcmpgtd, var, reg) +#define pcmpgtd_r2r(regs,regd) mmx_r2r (pcmpgtd, regs, regd) +#define pcmpgtw_m2r(var,reg) mmx_m2r (pcmpgtw, var, reg) +#define pcmpgtw_r2r(regs,regd) mmx_r2r (pcmpgtw, regs, regd) + +#define pmaddwd_m2r(var,reg) mmx_m2r (pmaddwd, var, reg) +#define pmaddwd_r2r(regs,regd) mmx_r2r (pmaddwd, regs, regd) + +#define pmulhw_m2r(var,reg) mmx_m2r (pmulhw, var, reg) +#define pmulhw_r2r(regs,regd) mmx_r2r (pmulhw, regs, regd) + +#define pmullw_m2r(var,reg) mmx_m2r (pmullw, var, reg) +#define pmullw_r2r(regs,regd) mmx_r2r (pmullw, regs, regd) + +#define por_m2r(var,reg) mmx_m2r (por, var, reg) +#define por_r2r(regs,regd) mmx_r2r (por, regs, regd) + +#define pslld_i2r(imm,reg) mmx_i2r (pslld, imm, reg) +#define pslld_m2r(var,reg) mmx_m2r (pslld, var, reg) +#define pslld_r2r(regs,regd) mmx_r2r (pslld, regs, regd) +#define psllq_i2r(imm,reg) mmx_i2r (psllq, imm, reg) +#define psllq_m2r(var,reg) mmx_m2r (psllq, var, reg) +#define psllq_r2r(regs,regd) mmx_r2r (psllq, regs, regd) +#define psllw_i2r(imm,reg) mmx_i2r (psllw, imm, reg) +#define psllw_m2r(var,reg) mmx_m2r (psllw, var, reg) +#define psllw_r2r(regs,regd) mmx_r2r (psllw, regs, regd) + +#define psrad_i2r(imm,reg) mmx_i2r (psrad, imm, reg) +#define psrad_m2r(var,reg) mmx_m2r (psrad, var, reg) +#define psrad_r2r(regs,regd) mmx_r2r (psrad, regs, regd) +#define psraw_i2r(imm,reg) mmx_i2r (psraw, imm, reg) +#define psraw_m2r(var,reg) mmx_m2r (psraw, var, reg) +#define psraw_r2r(regs,regd) mmx_r2r (psraw, regs, regd) + +#define psrld_i2r(imm,reg) mmx_i2r (psrld, imm, reg) +#define psrld_m2r(var,reg) mmx_m2r (psrld, var, reg) +#define psrld_r2r(regs,regd) mmx_r2r (psrld, regs, regd) +#define psrlq_i2r(imm,reg) mmx_i2r (psrlq, imm, reg) +#define psrlq_m2r(var,reg) mmx_m2r (psrlq, var, reg) +#define psrlq_r2r(regs,regd) mmx_r2r (psrlq, regs, regd) +#define psrlw_i2r(imm,reg) mmx_i2r (psrlw, imm, reg) +#define psrlw_m2r(var,reg) mmx_m2r (psrlw, var, reg) +#define psrlw_r2r(regs,regd) mmx_r2r (psrlw, regs, regd) + +#define psubb_m2r(var,reg) mmx_m2r (psubb, var, reg) +#define psubb_r2r(regs,regd) mmx_r2r (psubb, regs, regd) +#define psubd_m2r(var,reg) mmx_m2r (psubd, var, reg) +#define psubd_r2r(regs,regd) mmx_r2r (psubd, regs, regd) +#define psubw_m2r(var,reg) mmx_m2r (psubw, var, reg) +#define psubw_r2r(regs,regd) mmx_r2r (psubw, regs, regd) + +#define psubsb_m2r(var,reg) mmx_m2r (psubsb, var, reg) +#define psubsb_r2r(regs,regd) mmx_r2r (psubsb, regs, regd) +#define psubsw_m2r(var,reg) mmx_m2r (psubsw, var, reg) +#define psubsw_r2r(regs,regd) mmx_r2r (psubsw, regs, regd) + +#define psubusb_m2r(var,reg) mmx_m2r (psubusb, var, reg) +#define psubusb_r2r(regs,regd) mmx_r2r (psubusb, regs, regd) +#define psubusw_m2r(var,reg) mmx_m2r (psubusw, var, reg) +#define psubusw_r2r(regs,regd) mmx_r2r (psubusw, regs, regd) + +#define punpckhbw_m2r(var,reg) mmx_m2r (punpckhbw, var, reg) +#define punpckhbw_r2r(regs,regd) mmx_r2r (punpckhbw, regs, regd) +#define punpckhdq_m2r(var,reg) mmx_m2r (punpckhdq, var, reg) +#define punpckhdq_r2r(regs,regd) mmx_r2r (punpckhdq, regs, regd) +#define punpckhwd_m2r(var,reg) mmx_m2r (punpckhwd, var, reg) +#define punpckhwd_r2r(regs,regd) mmx_r2r (punpckhwd, regs, regd) + +#define punpcklbw_m2r(var,reg) mmx_m2r (punpcklbw, var, reg) +#define punpcklbw_r2r(regs,regd) mmx_r2r (punpcklbw, regs, regd) +#define punpckldq_m2r(var,reg) mmx_m2r (punpckldq, var, reg) +#define punpckldq_r2r(regs,regd) mmx_r2r (punpckldq, regs, regd) +#define punpcklwd_m2r(var,reg) mmx_m2r (punpcklwd, var, reg) +#define punpcklwd_r2r(regs,regd) mmx_r2r (punpcklwd, regs, regd) + +#define pxor_m2r(var,reg) mmx_m2r (pxor, var, reg) +#define pxor_r2r(regs,regd) mmx_r2r (pxor, regs, regd) + + +/* 3DNOW extensions */ + +#define pavgusb_m2r(var,reg) mmx_m2r (pavgusb, var, reg) +#define pavgusb_r2r(regs,regd) mmx_r2r (pavgusb, regs, regd) + + +/* AMD MMX extensions - also available in intel SSE */ + + +#define mmx_m2ri(op,mem,reg,imm) \ + __asm__ __volatile__ (#op " %1, %0, %%" #reg \ + : /* nothing */ \ + : "m" (mem), "i" (imm)) + +#define mmx_r2ri(op,regs,regd,imm) \ + __asm__ __volatile__ (#op " %0, %%" #regs ", %%" #regd \ + : /* nothing */ \ + : "i" (imm) ) + +#define mmx_fetch(mem,hint) \ + __asm__ __volatile__ ("prefetch" #hint " %0" \ + : /* nothing */ \ + : "m" (mem)) + + +#define maskmovq(regs,maskreg) mmx_r2ri (maskmovq, regs, maskreg) + +#define movntq_r2m(mmreg,var) mmx_r2m (movntq, mmreg, var) + +#define pavgb_m2r(var,reg) mmx_m2r (pavgb, var, reg) +#define pavgb_r2r(regs,regd) mmx_r2r (pavgb, regs, regd) +#define pavgw_m2r(var,reg) mmx_m2r (pavgw, var, reg) +#define pavgw_r2r(regs,regd) mmx_r2r (pavgw, regs, regd) + +#define pextrw_r2r(mmreg,reg,imm) mmx_r2ri (pextrw, mmreg, reg, imm) + +#define pinsrw_r2r(reg,mmreg,imm) mmx_r2ri (pinsrw, reg, mmreg, imm) + +#define pmaxsw_m2r(var,reg) mmx_m2r (pmaxsw, var, reg) +#define pmaxsw_r2r(regs,regd) mmx_r2r (pmaxsw, regs, regd) + +#define pmaxub_m2r(var,reg) mmx_m2r (pmaxub, var, reg) +#define pmaxub_r2r(regs,regd) mmx_r2r (pmaxub, regs, regd) + +#define pminsw_m2r(var,reg) mmx_m2r (pminsw, var, reg) +#define pminsw_r2r(regs,regd) mmx_r2r (pminsw, regs, regd) + +#define pminub_m2r(var,reg) mmx_m2r (pminub, var, reg) +#define pminub_r2r(regs,regd) mmx_r2r (pminub, regs, regd) + +#define pmovmskb(mmreg,reg) \ + __asm__ __volatile__ ("movmskps %" #mmreg ", %" #reg) + +#define pmulhuw_m2r(var,reg) mmx_m2r (pmulhuw, var, reg) +#define pmulhuw_r2r(regs,regd) mmx_r2r (pmulhuw, regs, regd) + +#define prefetcht0(mem) mmx_fetch (mem, t0) +#define prefetcht1(mem) mmx_fetch (mem, t1) +#define prefetcht2(mem) mmx_fetch (mem, t2) +#define prefetchnta(mem) mmx_fetch (mem, nta) + +#define psadbw_m2r(var,reg) mmx_m2r (psadbw, var, reg) +#define psadbw_r2r(regs,regd) mmx_r2r (psadbw, regs, regd) + +#define pshufw_m2r(var,reg,imm) mmx_m2ri(pshufw, var, reg, imm) +#define pshufw_r2r(regs,regd,imm) mmx_r2ri(pshufw, regs, regd, imm) + +#define sfence() __asm__ __volatile__ ("sfence\n\t") diff --git a/veejay-current/veejay-server/libsubsample/mmx_macros.h b/veejay-current/veejay-server/libsubsample/mmx_macros.h new file mode 100644 index 00000000..bd22b2ce --- /dev/null +++ b/veejay-current/veejay-server/libsubsample/mmx_macros.h @@ -0,0 +1,46 @@ +#include /* size_t */ +#include + +/* MMX memcpy stuff taken from MPlayer (http://www.mplayerhq.hu) */ + +#define BLOCK_SIZE 4096 +#define CONFUSION_FACTOR 0 +//Feel free to fine-tune the above 2, it might be possible to get some speedup with them :) + +#undef HAVE_MMX1 +#ifndef MMXEXT +/* means: mmx v.1. Note: Since we added alignment of destinition it speedups + of memory copying on PentMMX, Celeron-1 and P2 upto 12% versus + standard (non MMX-optimized) version. + Note: on K6-2+ it speedups memory copying upto 25% and + on K7 and P3 about 500% (5 times). */ +#define HAVE_MMX1 +#endif + +#undef MMREG_SIZE +#define MMREG_SIZE 64 //8 + +#undef PREFETCH +#undef EMMS + +#ifdef MMXEXT +#define PREFETCH "prefetchnta" +#else +#define PREFETCH "/nop" +#endif + +#define EMMS "emms" + +#undef MOVNTQ +#ifdef MMXEXT +#define MOVNTQ "movntq" +#else +#define MOVNTQ "movq" +#endif + +#undef MIN_LEN +#ifdef HAVE_MMX1 +#define MIN_LEN 0x800 /* 2K blocks */ +#else +#define MIN_LEN 0x40 /* 64-byte blocks */ +#endif diff --git a/veejay-current/veejay-server/libyuv/subsample.c b/veejay-current/veejay-server/libsubsample/subsample.c similarity index 99% rename from veejay-current/veejay-server/libyuv/subsample.c rename to veejay-current/veejay-server/libsubsample/subsample.c index af09fa9d..03cf4f95 100644 --- a/veejay-current/veejay-server/libyuv/subsample.c +++ b/veejay-current/veejay-server/libsubsample/subsample.c @@ -31,7 +31,10 @@ #include #include +#include #include +#include +#include #include #include #include diff --git a/veejay-current/veejay-server/libsubsample/subsample.h b/veejay-current/veejay-server/libsubsample/subsample.h new file mode 100644 index 00000000..926d98c2 --- /dev/null +++ b/veejay-current/veejay-server/libsubsample/subsample.h @@ -0,0 +1,42 @@ +#ifndef SUBSAMPLE_H +#define SUBSAMPLE_H +/* Veejay - A visual instrument and realtime video sampler + * Copyright (C) 2004 Niels Elburg + * + * YUV library for veejay. + * + * Mjpegtools, (C) The Mjpegtools Development Team (http://mjpeg.sourceforge.net) + * Copyright (C) 2001 Matthew J. Marjanovic + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + */ +typedef enum subsample_mode { + SSM_UNKNOWN = 0, + SSM_420_JPEG_TR = 1, + SSM_420_JPEG_BOX = 2, + SSM_420_MPEG2 = 3, + SSM_422_444 = 4, + SSM_420_422 = 5, + SSM_COUNT = 6, +} subsample_mode_t; + +extern const char *ssm_id[SSM_COUNT]; +extern const char *ssm_description[SSM_COUNT]; + +void chroma_subsample(subsample_mode_t mode, VJFrame *frame, uint8_t * ycbcr[] ); +void chroma_subsample_cp(subsample_mode_t mode, VJFrame *frame, uint8_t *ycbcr[], uint8_t *dcbcr[] ); +void chroma_supersample(subsample_mode_t mode, VJFrame *frame, uint8_t * ycbcr[] ); +#endif diff --git a/veejay-current/veejay-server/libvevo/Makefile.am b/veejay-current/veejay-server/libvevo/Makefile.am index 4e7edb0d..abf84aed 100644 --- a/veejay-current/veejay-server/libvevo/Makefile.am +++ b/veejay-current/veejay-server/libvevo/Makefile.am @@ -1,5 +1,4 @@ MAINTAINERCLEANFILES = Makefile.in -AM_CFLAGS=$(OP_CFLAGS) INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)/libvevo -I$(includedir) -I$(top_srcdir)/libhash -I$(top_srcdir)/libvjmem -I$(top_srcdir)/libvjmsg VEVO_LIB_FILE = libvevo.la diff --git a/veejay-current/veejay-server/libvje/Makefile.am b/veejay-current/veejay-server/libvje/Makefile.am index 06d54782..8c6da3d9 100644 --- a/veejay-current/veejay-server/libvje/Makefile.am +++ b/veejay-current/veejay-server/libvje/Makefile.am @@ -3,7 +3,7 @@ MAINTAINERCLEANFILES=Makefile.in INCLUDES = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/vjmem -I$(top_srcdir)/vjmsg $(FFMPEG_CFLAGS) $(GLIB_CFLAGS) -AM_CFLAGS = $(OP_CFLAGS) -freg-struct-return +AM_CFLAGS = $(FREEFRAME_CFLAGS) pkginclude_HEADERS=vje.h diff --git a/veejay-current/veejay-server/libvje/effects/colflash.c b/veejay-current/veejay-server/libvje/effects/colflash.c index 277b9dad..dfcafed1 100644 --- a/veejay-current/veejay-server/libvje/effects/colflash.c +++ b/veejay-current/veejay-server/libvje/effects/colflash.c @@ -70,7 +70,7 @@ void colflash_apply( VJFrame *frame, int width, int height, int f,int r, int g, uint8_t *Cb= frame->data[1]; uint8_t *Cr= frame->data[2]; - uint8_t y,u,v; + uint8_t y=0,u=0,v=0; _rgb2yuv( r,g,b,y,u,v ); diff --git a/veejay-current/veejay-server/libvje/effects/isolate.c b/veejay-current/veejay-server/libvje/effects/isolate.c index 94573196..52f70a58 100644 --- a/veejay-current/veejay-server/libvje/effects/isolate.c +++ b/veejay-current/veejay-server/libvje/effects/isolate.c @@ -83,7 +83,7 @@ void isolate_apply( VJFrame *frame, int width, uint8_t *Y = frame->data[0]; uint8_t *Cb = frame->data[1]; uint8_t *Cr = frame->data[2]; - int iy,iu,iv; + int iy=0,iu=0,iv=0; _rgb2yuv(r,g,b,iy,iu,iv); _y = (float) iy; aa = (float) iu; diff --git a/veejay-current/veejay-server/libvjmem/Makefile.am b/veejay-current/veejay-server/libvjmem/Makefile.am index 7d372d0a..5dda8378 100644 --- a/veejay-current/veejay-server/libvjmem/Makefile.am +++ b/veejay-current/veejay-server/libvjmem/Makefile.am @@ -1,6 +1,5 @@ # Makefile for memory managment / platform specific optimizations INCLUDES = -I$(top_srcdir) -I$(includedir) -I$(top_builddir)/libvjmsg -AM_CFLAGS=$(OP_CFLAGS) VJMEM_LIB_FILE = libvjmem.la pkginclude_HEADERS = vjmem.h noinst_LTLIBRARIES = $(VJMEM_LIB_FILE) diff --git a/veejay-current/veejay-server/libvjnet/Makefile.am b/veejay-current/veejay-server/libvjnet/Makefile.am index 9357a65b..efdc59d2 100644 --- a/veejay-current/veejay-server/libvjnet/Makefile.am +++ b/veejay-current/veejay-server/libvjnet/Makefile.am @@ -1,7 +1,6 @@ # Makefile for veejay MAINTAINERCLEANFILES = Makefile.in -AM_CFLAGS=$(OP_CFLAGS) INCLUDES = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/libyuv -I$(top_srcdir)/liblzo -I$(top_srcdir)/vjmem -I$(top_srcdir)/vjmsg VJNET_LIB_FILE = libvjnet.la EXTRA_DIST= vj-client.h bswap.h cmd.h mcastreceiver.h mcastsender.h packet.h vj-server.h diff --git a/veejay-current/veejay-server/libyuv/Makefile.am b/veejay-current/veejay-server/libyuv/Makefile.am index a4e3d45f..b822535c 100644 --- a/veejay-current/veejay-server/libyuv/Makefile.am +++ b/veejay-current/veejay-server/libyuv/Makefile.am @@ -1,10 +1,9 @@ # Makefile for veejay MAINTAINERCLEANFILES = Makefile.in -AM_CFLAGS=$(YUVCFLAGS) INCLUDES = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/aclib -I$(top_srcdir)/vjmem -I$(top_srcdir)/vjmsg -I$(top_srcdir)/libpostproc -I$(FFMPEG_CFLAGS) YUV_LIB_FILE = libyuv.la pkginclude_HEADERS=yuvconv.h EXTRA_DIST = mmx.h yuvconv.h mmx_macros.h noinst_LTLIBRARIES = $(YUV_LIB_FILE) -libyuv_la_SOURCES = subsample.c yuvconv.c +libyuv_la_SOURCES = yuvconv.c diff --git a/veejay-current/veejay-server/libyuv/yuvconv.h b/veejay-current/veejay-server/libyuv/yuvconv.h index 1d8abfb7..e40766ae 100644 --- a/veejay-current/veejay-server/libyuv/yuvconv.h +++ b/veejay-current/veejay-server/libyuv/yuvconv.h @@ -23,22 +23,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * */ -typedef enum subsample_mode { - SSM_UNKNOWN = 0, - SSM_420_JPEG_TR = 1, - SSM_420_JPEG_BOX = 2, - SSM_420_MPEG2 = 3, - SSM_422_444 = 4, - SSM_420_422 = 5, - SSM_COUNT = 6, -} subsample_mode_t; - -extern const char *ssm_id[SSM_COUNT]; -extern const char *ssm_description[SSM_COUNT]; - -void chroma_subsample(subsample_mode_t mode, VJFrame *frame, uint8_t * ycbcr[] ); -void chroma_subsample_cp(subsample_mode_t mode, VJFrame *frame, uint8_t *ycbcr[], uint8_t *dcbcr[] ); -void chroma_supersample(subsample_mode_t mode, VJFrame *frame, uint8_t * ycbcr[] ); // yuv 4:2:2 packed to yuv 4:2:0 planar void vj_yuy2toyv12( uint8_t *y, uint8_t *u, uint8_t *v, uint8_t *in, int w, int h); diff --git a/veejay-current/veejay-server/mjpegtools/Makefile.am b/veejay-current/veejay-server/mjpegtools/Makefile.am index 2dd5796c..184e8a50 100644 --- a/veejay-current/veejay-server/mjpegtools/Makefile.am +++ b/veejay-current/veejay-server/mjpegtools/Makefile.am @@ -1,8 +1,8 @@ EXTRA_DIST= fastintfns.h mjpeg_logging.h mpegconsts.h videodev_mjpeg.h yuv4mpeg_intern.h format_codes.h \ mjpeg_types.h mpegtimecode.h yuv4mpeg.h MAINTAINERCLEANFILES = Makefile.in -AM_CFLAGS=$(OP_CFLAGS) INCLUDES = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/mjpegtools $(PTHREAD_CFLAGS) MJPEGUTILS_LIB_FILE = libmjpegutils.la noinst_LTLIBRARIES = $(MJPEGUTILS_LIB_FILE) +DISTCLEANFILES = libmjpegutils_la_SOURCES = mjpeg_logging.c mpegconsts.c mpegtimecode.c yuv4mpeg.c yuv4mpeg_ratio.c diff --git a/veejay-current/veejay-server/veejay/Makefile.am b/veejay-current/veejay-server/veejay/Makefile.am index 3abf7b91..be711e28 100644 --- a/veejay-current/veejay-server/veejay/Makefile.am +++ b/veejay-current/veejay-server/veejay/Makefile.am @@ -1,7 +1,6 @@ # Makefile for veejay MAINTAINERCLEANFILES = Makefile.in -AM_CFLAGS=$(OP_CFLAGS) INCLUDES = -I$(top_srcdir) -I$(includedir) \ -DG_LOG_DOMAIN=\"veejay\" -DVEEJAY_VERSION=\"$(VERSION)\" @@ -20,6 +19,7 @@ INCLUDES += -I /usr/X11R6/include -I$(top_srcdir)/libOSC \ -I$(top_srcdir)/libvjnet \ -I$(top_srcdir)/libel \ -I$(top_srcdir)/libstream \ + -I$(top_srcdir)/libsubsample \ -I$(top_scrdir)/libyuv \ -I$(top_srcdir)/libsamplerec \ -I$(top_srcdir)/libvevo \ @@ -57,6 +57,7 @@ libveejay_la_LIBADD = -L$(top_builddir)/libOSC -lOSC \ -L$(top_builddir)/libel -lel \ -L$(top_builddir)/libstream -lstream \ -L$(top_builddir)/aclib -lac \ + -L$(top_builddir)/libsubsample -lsubsample \ -L$(top_builddir)/libyuv -lyuv \ -L$(top_builddir)/libsamplerec -lsamplerec \ -L$(top_builddir)/libvevo -lvevo diff --git a/veejay-current/veejay-server/veejay/liblavplayvj.c b/veejay-current/veejay-server/veejay/liblavplayvj.c index 026434eb..b433e775 100644 --- a/veejay-current/veejay-server/veejay/liblavplayvj.c +++ b/veejay-current/veejay-server/veejay/liblavplayvj.c @@ -69,7 +69,6 @@ #include #endif #include -#include #ifdef HAVE_SYS_SOUNDCARD_H #include #endif @@ -81,6 +80,8 @@ #include #include #include +#include +#include #include #include #include diff --git a/veejay-current/veejay-server/veejay/veejay.c b/veejay-current/veejay-server/veejay/veejay.c index 81a52fc3..219bb5f8 100644 --- a/veejay-current/veejay-server/veejay/veejay.c +++ b/veejay-current/veejay-server/veejay/veejay.c @@ -29,6 +29,8 @@ #include #include #include +#include +#include #include #include #include diff --git a/veejay-current/veejay-server/veejay/vj-composite.c b/veejay-current/veejay-server/veejay/vj-composite.c index e230bee7..7ae89918 100644 --- a/veejay-current/veejay-server/veejay/vj-composite.c +++ b/veejay-current/veejay-server/veejay/vj-composite.c @@ -29,11 +29,12 @@ #include #include #include +#include #include #include #include #include - +#include #ifdef HAVE_XML2 #include #include diff --git a/veejay-current/veejay-server/veejay/vj-event.c b/veejay-current/veejay-server/veejay/vj-event.c index 64dd8c6b..c59fe13c 100644 --- a/veejay-current/veejay-server/veejay/vj-event.c +++ b/veejay-current/veejay-server/veejay/vj-event.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -2935,7 +2936,7 @@ void vj_event_set_play_mode_go(void *ptr, const char format[], va_list ap) void vj_event_set_rgb_parameter_type(void *ptr, const char format[], va_list ap) { - int args[2]; + int args[3]; char *s = NULL; P_A(args,s,format,ap); if(args[0] >= 0 && args[0] <= 3 ) @@ -4177,7 +4178,7 @@ void vj_event_sample_set_loop_type(void *ptr, const char format[], va_list ap) void vj_event_sample_set_position( void *ptr, const char format[], va_list ap ) { - int args[2]; + int args[3]; veejay_t *v = (veejay_t*) ptr; char *s = NULL; P_A(args, s, format, ap); @@ -4196,13 +4197,13 @@ void vj_event_sample_set_position( void *ptr, const char format[], va_list ap ) int cha = sample_get_chain_channel( v->uc->sample_id, entry ); // if( src == VJ_TAG_TYPE_NONE ) { - int pos = sample_get_offset( cha,entry ); + int pos = sample_get_offset( cha,entry ); - pos += args[2]; + pos += args[2]; - sample_set_offset( cha,entry, pos ); + sample_set_offset( cha,entry, pos ); - veejay_msg(VEEJAY_MSG_INFO, "Changed frame position to %d for sample %d on FX entry %d (only)", pos,cha,entry ); + veejay_msg(VEEJAY_MSG_INFO, "Changed frame position to %d for sample %d on FX entry %d (only)", pos,cha,entry ); // } @@ -4434,10 +4435,6 @@ void vj_event_sample_set_marker_clear(void *ptr, const char format[],va_list ap) { veejay_msg(VEEJAY_MSG_INFO, "Sample %d marker cleared", args[0]); } - else - { - veejay_msg(VEEJAY_MSG_ERROR, "Cannot set marker %d-%d for sample %d",args[1],args[2],args[0]); - } } else { @@ -6961,7 +6958,7 @@ void vj_event_v4l_blackframe( void *ptr, const char format[] , va_list ap) veejay_t *v = (veejay_t*) ptr; char *str = NULL; - int args[3]; + int args[4]; P_A(args,str,format,ap); @@ -8528,7 +8525,7 @@ void vj_event_send_sample_info ( void *ptr, const char format[], va_list ap ) void vj_event_get_image_part ( void *ptr, const char format[], va_list ap ) { veejay_t *v = (veejay_t*)ptr; - int args[4]; + int args[5]; char *str = NULL; P_A(args,str,format,ap); @@ -8729,8 +8726,6 @@ void vj_event_get_cali_image ( void *ptr, const char format[], va_list ap ) return; } - vj_tag *tag = vj_tag_get(id); - int total_len = 0; int uv_len = 0; int len = 0; diff --git a/veejay-current/veejay-server/veejay/vj-font.c b/veejay-current/veejay-server/veejay/vj-font.c index 9ef2354b..90806fbe 100644 --- a/veejay-current/veejay-server/veejay/vj-font.c +++ b/veejay-current/veejay-server/veejay/vj-font.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include diff --git a/veejay-current/veejay-server/veejay/vj-misc.c b/veejay-current/veejay-server/veejay/vj-misc.c index 974cddb2..3bd68a8e 100644 --- a/veejay-current/veejay-server/veejay/vj-misc.c +++ b/veejay-current/veejay-server/veejay/vj-misc.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include diff --git a/veejay-current/veejay-server/veejay/vj-osc.c b/veejay-current/veejay-server/veejay/vj-osc.c index 737a9bff..9d745c15 100644 --- a/veejay-current/veejay-server/veejay/vj-osc.c +++ b/veejay-current/veejay-server/veejay/vj-osc.c @@ -31,6 +31,8 @@ #include #include #include +#include +#include #include #include #include diff --git a/veejay-current/veejay-server/veejay/vj-perform.c b/veejay-current/veejay-server/veejay/vj-perform.c index 46429b62..9b7bff23 100644 --- a/veejay-current/veejay-server/veejay/vj-perform.c +++ b/veejay-current/veejay-server/veejay/vj-perform.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -3183,8 +3184,8 @@ static char *vj_perform_osd_status( veejay_t *info ) } MPEG_timecode_t tc; - char timecode[20]; - char tmp[32]; + char timecode[64]; + char tmp[64]; char buf[256]; veejay_memset(&tc,0,sizeof(MPEG_timecode_t)); veejay_memset(&tmp,0,sizeof(tmp)); @@ -3194,7 +3195,7 @@ static char *vj_perform_osd_status( veejay_t *info ) mpeg_timecode(&tc, settings->current_frame_num, n, info->current_edit_list->video_fps ); - snprintf(timecode, 20, "%2d:%2.2d:%2.2d:%2.2d", + snprintf(timecode, sizeof(timecode), "%2d:%2.2d:%2.2d:%2.2d", tc.h, tc.m, tc.s, tc.f ); diff --git a/veejay-current/veejay-server/veejay/vj-sdl.c b/veejay-current/veejay-server/veejay/vj-sdl.c index 4d19fba4..3292a5b0 100644 --- a/veejay-current/veejay-server/veejay/vj-sdl.c +++ b/veejay-current/veejay-server/veejay/vj-sdl.c @@ -25,6 +25,8 @@ #ifdef HAVE_SDL #include #include +#include +#include #include #include #include diff --git a/veejay-current/veejay-server/veejay/vj-splitdisplay.c b/veejay-current/veejay-server/veejay/vj-splitdisplay.c index 5cda70ea..9922fc3e 100644 --- a/veejay-current/veejay-server/veejay/vj-splitdisplay.c +++ b/veejay-current/veejay-server/veejay/vj-splitdisplay.c @@ -3,6 +3,8 @@ #include #include #include +#include +#include #ifdef STRICT_CHECKING #include #endif diff --git a/veejay-current/veejay-server/veejay/vj-task.c b/veejay-current/veejay-server/veejay/vj-task.c index 690f6046..ed030b9b 100644 --- a/veejay-current/veejay-server/veejay/vj-task.c +++ b/veejay-current/veejay-server/veejay/vj-task.c @@ -42,6 +42,7 @@ #include #include #include +#include #include #include #include