Request 2703 (accepted)

xvidcore.changes Changed

xvidcore.spec Changed

xvidcore-1.3.3.tar.bz2/ChangeLog -> xvidcore-1.3.4.tar.bz2/ChangeLog Changed

@@ -1,4 +1,31 @@
-# Note that this ChangeLog covers only changes to the release branch
+# Note that this ChangeLog covers only main changes to the release branch
+
+2015-06-14 21:18 Isibaar
+	* xvidcore/dshow/src/CXvidDecoder.cpp
+	  xvidcore/dshow/src/CXvidDecoder.h
+	  xvidcore/dshow/src/config.c
+	  xvidcore/dshow/src/config.h: Fixed thumbnail creation under 
+	  Windows 10, faster rendering in MediaFoundation, various other 
+	  MFT-specific fixes...
+
+2015-06-11 02:51 Isibaar
+	* xvidcore/src/image/x86_asm/colorspace_rgb_mmx.asm: Attempt at 
+	  fixing a crash in RGB24->YV12 conversions - not yet really 
+	  tested...
+
+2015-06-08 21:15 Isibaar
+	* xvidcore/dshow/src/CXvidDecoder.cpp
+	  xvidcore/dshow/src/CXvidDecoder.h: Changed friendly name of 
+	  MFT to match common conventions.
+
+2014-11-26 00:17 Isibaar
+	* xvidcore/src/encoder.c: Fix for multi-threading bug in case of
+	  input video height <= 16 pixels. Patch by Lukasz Marek.
+
+2014-09-25 19:41 Isibaar
+
+	* xvidcore/build/win32/libxvidcore.vcproj: Enabled multi-threaded
+	  builds in MSVC by default
 
 2014-03-05 08:37  Isibaar

xvidcore-1.3.3.tar.bz2/build/generic/config.guess -> xvidcore-1.3.4.tar.bz2/build/generic/config.guess Changed

@@ -153,16 +153,6 @@
 	;;
 esac
 
-case "${UNAME_MACHINE}" in
-  i?86)
-     test -z "$VENDOR" && VENDOR=pc
-     ;;
-  *)
-     test -z "$VENDOR" && VENDOR=unknown
-     ;;
-esac
-test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
-
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -227,23 +217,23 @@
 	exit ;;
     *:Bitrig:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
-	echo ${UNAME_MACHINE_ARCH}-${VENDOR}-bitrig${UNAME_RELEASE}
+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
 	exit ;;
     *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-${VENDOR}-openbsd${UNAME_RELEASE}
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
 	exit ;;
     *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-ekkobsd${UNAME_RELEASE}
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 	exit ;;
     *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-solidbsd${UNAME_RELEASE}
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
 	exit ;;
     macppc:MirBSD:*:*)
-	echo powerpc-${VENDOR}-mirbsd${UNAME_RELEASE}
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
     *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-mirbsd${UNAME_RELEASE}
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
@@ -311,13 +301,13 @@
 	echo alpha-dec-winnt3.5
 	exit ;;
     Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-${VENDOR}-sysv4
+	echo m68k-unknown-sysv4
 	exit ;;
     *:AamigaOoSs:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-amigaos
+	echo ${UNAME_MACHINE}-unknown-amigaos
 	exit ;;
     *:MmorphOoSs:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-morphos
+	echo ${UNAME_MACHINE}-unknown-morphos
 	exit ;;
     *:OS/390:*:*)
 	echo i370-ibm-openedition
@@ -332,7 +322,7 @@
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit ;;
     arm*:riscos:*:*|arm*:RISCOS:*:*)
-	echo arm-${VENDOR}-riscos
+	echo arm-unknown-riscos
 	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
@@ -440,7 +430,7 @@
 	echo m68k-hades-mint${UNAME_RELEASE}
 	exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-	echo m68k-${VENDOR}-mint${UNAME_RELEASE}
+	echo m68k-unknown-mint${UNAME_RELEASE}
 	exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
@@ -751,9 +741,9 @@
 	exit ;;
     i*86:OSF1:*:*)
 	if  -x /usr/sbin/sysversion  ; then
-	    echo ${UNAME_MACHINE}-${VENDOR}-osf1mk
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
 	else
-	    echo ${UNAME_MACHINE}-${VENDOR}-osf1
+	    echo ${UNAME_MACHINE}-unknown-osf1
 	fi
 	exit ;;
     parisc*:Lites*:*:*)
@@ -813,18 +803,18 @@
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit ;;
     sparc*:BSD/OS:*:*)
-	echo sparc-${VENDOR}-bsdi${UNAME_RELEASE}
+	echo sparc-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-bsdi${UNAME_RELEASE}
+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
 	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	case ${UNAME_PROCESSOR} in
 	    amd64)
-		echo x86_64-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'` ;;
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'` ;;
 	    *)
-		echo ${UNAME_PROCESSOR}-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'` ;;
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'` ;;
 	esac
 	exit ;;
     i*:CYGWIN*:*)
@@ -852,10 +842,10 @@
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
 	    authenticamd | genuineintel | EM64T)
-		echo x86_64-${VENDOR}-interix${UNAME_RELEASE}
+		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	    IA64)
-		echo ia64-${VENDOR}-interix${UNAME_RELEASE}
+		echo ia64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	esac ;;
     34586:Windows_95:* | 34586:Windows_98:* | 34586:Windows_NT:*)
@@ -874,31 +864,31 @@
 	echo ${UNAME_MACHINE}-pc-uwin
 	exit ;;
     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-${VENDOR}-cygwin
+	echo x86_64-unknown-cygwin
 	exit ;;
     p*:CYGWIN*:*)
-	echo powerpcle-${VENDOR}-cygwin
+	echo powerpcle-unknown-cygwin
 	exit ;;
     prep*:SunOS:5.*:*)
-	echo powerpcle-${VENDOR}-solaris2`echo ${UNAME_RELEASE}|sed -e 's/^.*//'`
+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/^.*//'`
 	exit ;;
     *:GNU:*:*)
 	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,-/.*$,,'`-${VENDOR}-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	echo `echo ${UNAME_MACHINE}|sed -e 's,-/.*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-${VENDOR}-`echo ${UNAME_SYSTEM} | sed 's,^^/*/,,' | tr 'A-Z' 'a-z'``echo ${UNAME_RELEASE}|sed -e 's/-(.*//'`-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^^/*/,,' | tr 'A-Z' 'a-z'``echo ${UNAME_RELEASE}|sed -e 's/-(.*//'`-${LIBC}
 	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
     aarch64:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     aarch64_be:Linux:*:*)
 	UNAME_MACHINE=aarch64_be
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in
@@ -912,29 +902,29 @@
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
 	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     arc:Linux:*:* | arceb:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
-	    echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	else
 	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
 		| grep -q __ARM_PCS_VFP
 	    then
-		echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}eabi
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
 	    else
-		echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}eabihf
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
 	    fi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     cris:Linux:*:*)
 	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
@@ -943,22 +933,22 @@
 	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
     frv:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     hexagon:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     i*86:Linux:*:*)
 	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
 	exit ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -977,63 +967,63 @@
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-${LIBC}"; exit; }
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
     or1k:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     or32:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     padre:Linux:*:*)
-	echo sparc-${VENDOR}-linux-${LIBC}
+	echo sparc-unknown-linux-${LIBC}
 	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-${VENDOR}-linux-${LIBC}
+	echo hppa64-unknown-linux-${LIBC}
 	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu^a-z*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-${VENDOR}-linux-${LIBC} ;;
-	  PA8*) echo hppa2.0-${VENDOR}-linux-${LIBC} ;;
-	  *)    echo hppa-${VENDOR}-linux-${LIBC} ;;
+	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+	  *)    echo hppa-unknown-linux-${LIBC} ;;
 	esac
 	exit ;;
     ppc64:Linux:*:*)
-	echo powerpc64-${VENDOR}-linux-${LIBC}
+	echo powerpc64-unknown-linux-${LIBC}
 	exit ;;
     ppc:Linux:*:*)
-	echo powerpc-${VENDOR}-linux-${LIBC}
+	echo powerpc-unknown-linux-${LIBC}
 	exit ;;
     ppc64le:Linux:*:*)
-	echo powerpc64le-${VENDOR}-linux-${LIBC}
+	echo powerpc64le-unknown-linux-${LIBC}
 	exit ;;
     ppcle:Linux:*:*)
-	echo powerpcle-${VENDOR}-linux-${LIBC}
+	echo powerpcle-unknown-linux-${LIBC}
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
 	exit ;;
     sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     vax:Linux:*:*)
 	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
 	exit ;;
     x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1055,16 +1045,16 @@
 	echo ${UNAME_MACHINE}-pc-os2-emx
 	exit ;;
     i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-${VENDOR}-stop
+	echo ${UNAME_MACHINE}-unknown-stop
 	exit ;;
     i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-atheos
+	echo ${UNAME_MACHINE}-unknown-atheos
 	exit ;;
     i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
 	exit ;;
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.01*:* | i*86:LynxOS:4.02*:*)
-	echo i386-${VENODR}-lynxos${UNAME_RELEASE}
+	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     i*86:*DOS:*:*)
 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
@@ -1084,7 +1074,7 @@
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
 	esac
-	echo ${UNAME_MACHINE}-${VENDOR}-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
 	exit ;;
     i*86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
@@ -1123,7 +1113,7 @@
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
 	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-${VENODR}-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
 	fi
 	exit ;;
     mini*:CTIX:SYS*5:*)
@@ -1160,19 +1150,19 @@
 	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
 	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-${VENDOR}-lynxos${UNAME_RELEASE}
+	echo m68k-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
 	exit ;;
     TSUNAMI:LynxOS:2.*:*)
-	echo sparc-${VENDOR}-lynxos${UNAME_RELEASE}
+	echo sparc-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     rs6000:LynxOS:2.*:*)
-	echo rs6000-${VENDOR}-lynxos${UNAME_RELEASE}
+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.01*:* | PowerPC:LynxOS:4.02*:*)
-	echo powerpc-${VENDOR}-lynxos${UNAME_RELEASE}
+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     SMBES:UNIX_SV:*:*)
 	echo mips-dde-sysv${UNAME_RELEASE}
@@ -1222,7 +1212,7 @@
 	if  -d /usr/nec ; then
 		echo mips-nec-sysv${UNAME_RELEASE}
 	else
-		echo mips-${VENDOR}-sysv${UNAME_RELEASE}
+		echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
 	exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
@@ -1238,7 +1228,7 @@
 	echo i586-pc-haiku
 	exit ;;
     x86_64:Haiku:*:*)
-	echo x86_64-${VENDOR}-haiku
+	echo x86_64-unknown-haiku
 	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
@@ -1321,13 +1311,13 @@
 	else
 	    UNAME_MACHINE="$cputype"
 	fi
-	echo ${UNAME_MACHINE}-${VENDOR}-plan9
+	echo ${UNAME_MACHINE}-unknown-plan9
 	exit ;;
     *:TOPS-10:*:*)
-	echo pdp10-${VENDOR}-tops10
+	echo pdp10-unknown-tops10
 	exit ;;
     *:TENEX:*:*)
-	echo pdp10-${VENDOR}-tenex
+	echo pdp10-unknown-tenex
 	exit ;;
     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
 	echo pdp10-dec-tops20
@@ -1336,16 +1326,16 @@
 	echo pdp10-xkl-tops20
 	exit ;;
     *:TOPS-20:*:*)
-	echo pdp10-${VENDOR}-tops20
+	echo pdp10-unknown-tops20
 	exit ;;
     *:ITS:*:*)
-	echo pdp10-${VENDOR}-its
+	echo pdp10-unknown-its
 	exit ;;
     SEI:*:*:SEIUX)
 	echo mips-sei-seiux${UNAME_RELEASE}
 	exit ;;
     *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'`
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'`
 	exit ;;
     *:*VMS:*:*)
 	UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -1367,7 +1357,7 @@
 	echo ${UNAME_MACHINE}-pc-aros
 	exit ;;
     x86_64:VMkernel:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-esx
+	echo ${UNAME_MACHINE}-unknown-esx
 	exit ;;
 esac

xvidcore-1.3.3.tar.bz2/build/generic/config.sub -> xvidcore-1.3.4.tar.bz2/build/generic/config.sub Changed

xvidcore-1.3.3.tar.bz2/build/generic/configure -> xvidcore-1.3.4.tar.bz2/build/generic/configure Changed

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Xvid 1.3.3.
+# Generated by GNU Autoconf 2.69 for Xvid 1.3.4.
 #
 # Report bugs to <xvid-devel@xvid.org>.
 #
@@ -580,8 +580,8 @@
 # Identity of this package.
 PACKAGE_NAME='Xvid'
 PACKAGE_TARNAME='xvid'
-PACKAGE_VERSION='1.3.3'
-PACKAGE_STRING='Xvid 1.3.3'
+PACKAGE_VERSION='1.3.4'
+PACKAGE_STRING='Xvid 1.3.4'
 PACKAGE_BUGREPORT='xvid-devel@xvid.org'
 PACKAGE_URL=''
 
@@ -1277,7 +1277,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Xvid 1.3.3 to adapt to many kinds of systems.
+\`configure' configures Xvid 1.3.4 to adapt to many kinds of systems.
 
 Usage: $0 OPTION... VAR=VALUE...
 
@@ -1343,7 +1343,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Xvid 1.3.3:";;
+     short | recursive ) echo "Configuration of Xvid 1.3.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1434,7 +1434,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Xvid configure 1.3.3
+Xvid configure 1.3.4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1919,7 +1919,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Xvid $as_me 1.3.3, which was
+It was created by Xvid $as_me 1.3.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -5600,7 +5600,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Xvid $as_me 1.3.3, which was
+This file was extended by Xvid $as_me 1.3.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5653,7 +5653,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/\\""\`\$/\\\\&/g'`"
 ac_cs_version="\\
-Xvid config.status 1.3.3
+Xvid config.status 1.3.4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"

xvidcore-1.3.3.tar.bz2/build/generic/configure.in -> xvidcore-1.3.4.tar.bz2/build/generic/configure.in Changed

xvidcore-1.3.3.tar.bz2/build/win32/libxvidcore.vcproj -> xvidcore-1.3.4.tar.bz2/build/win32/libxvidcore.vcproj Changed

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="9,00"
 	Name="libxvidcore"
 	ProjectGUID="{64954A96-C813-4A92-87AD-DD733A5404AF}"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -51,7 +52,7 @@
 				AdditionalOptions="/Qipo "
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="NDEBUG;ARCH_IS_IA32;WIN32;_WINDOWS;ARCH_IS_32BIT;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="NDEBUG;HAVE_PTHREAD;ARCH_IS_IA32;WIN32;_WINDOWS;ARCH_IS_32BIT;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
@@ -82,6 +83,8 @@
 				ModuleDefinitionFile="..\generic\libxvidcore.def"
 				ProgramDatabaseFile=".\Release/xvidcore.pdb"
 				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="bin\xvidcore.dll.a"
 				TargetMachine="1"
 			/>
@@ -106,9 +109,6 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
@@ -147,7 +147,7 @@
 				AdditionalOptions="/Qipo "
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="NDEBUG;ARCH_IS_X86_64;WIN32;_WINDOWS;ARCH_IS_64BIT;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="NDEBUG;HAVE_PTHREAD;ARCH_IS_X86_64;WIN32;_WINDOWS;ARCH_IS_64BIT;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
@@ -178,6 +178,8 @@
 				ModuleDefinitionFile="..\generic\libxvidcore.def"
 				ProgramDatabaseFile="$(IntDir)/xvidcore.pdb"
 				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="bin\x64\xvidcore.dll.a"
 				TargetMachine="17"
 			/>
@@ -202,9 +204,6 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
@@ -241,7 +240,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;ARCH_IS_32BIT;ARCH_IS_IA32;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="_DEBUG;HAVE_PTHREAD;WIN32;_WINDOWS;ARCH_IS_32BIT;ARCH_IS_IA32;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -274,6 +273,8 @@
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/xvidcore.pdb"
 				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="bin\xvidcore.dll.a"
 				TargetMachine="1"
 			/>
@@ -298,9 +299,6 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
@@ -337,7 +335,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;ARCH_IS_64BIT;ARCH_IS_X86_64;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="_DEBUG;HAVE_PTHREAD;WIN32;_WINDOWS;ARCH_IS_64BIT;ARCH_IS_X86_64;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -370,6 +368,8 @@
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(IntDir)\xvidcore.pdb"
 				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="bin\x64\xvidcore.dll.a"
 				TargetMachine="17"
 			/>
@@ -394,9 +394,6 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
@@ -428,11 +425,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\README"
+				RelativePath="..\..\doc\README"
 				>
 			</File>
 			<File
-				RelativePath="..\..\doc\README"
+				RelativePath="..\..\README"
 				>
 			</File>
 			<File
@@ -3455,10 +3452,6 @@
 					/>
 				</FileConfiguration>
 			</File>
- 			<File
-				RelativePath="..\..\src\plugins\plugin_psnrhvsm.c"
-			>
-			</File>
 			<File
 				RelativePath="..\..\src\plugins\plugin_psnr.c"
 				>
@@ -3496,6 +3489,10 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath="..\..\src\plugins\plugin_psnrhvsm.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\src\plugins\plugin_single.c"
 				>
 				<FileConfiguration

xvidcore-1.3.3.tar.bz2/dshow/src/CXvidDecoder.cpp -> xvidcore-1.3.4.tar.bz2/dshow/src/CXvidDecoder.cpp Changed

@@ -20,7 +20,7 @@
  *  along with this program ; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- * $Id: CXvidDecoder.cpp 2059 2012-02-22 19:00:26Z Isibaar $
+ * $Id: CXvidDecoder.cpp 2116 2015-06-15 13:00:46Z Isibaar $
  *
  ****************************************************************************/
 
@@ -178,7 +178,8 @@
 extern HINSTANCE g_xvid_hInst;
 
 static int GUI_Page = 0;
-static int Tray_Icon = 0;
+static HWND MSG_hwnd = NULL; /* message handler window */
+
 extern "C" void CALLBACK Configure(HWND hWndParent, HINSTANCE hInstParent, LPSTR lpCmdLine, int nCmdShow );
 
 LRESULT CALLBACK msg_proc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
@@ -188,6 +189,7 @@
 	case WM_ICONMESSAGE:
 		switch(lParam)
 		{
+		case WM_LBUTTONUP:
 		case WM_LBUTTONDBLCLK:
 			if (!GUI_Page) {
 				GUI_Page = 1;
@@ -202,14 +204,12 @@
 
 	case WM_DESTROY:
 		NOTIFYICONDATA nid;
-		ZeroMemory(&nid,sizeof(NOTIFYICONDATA));
+		ZeroMemory(&nid, sizeof(NOTIFYICONDATA));
 
-		nid.cbSize = NOTIFYICONDATA_V1_SIZE;
+		nid.cbSize = sizeof(NOTIFYICONDATA);
 		nid.hWnd = hwnd;
 		nid.uID = 1456;
-	
 		Shell_NotifyIcon(NIM_DELETE, &nid);
-		Tray_Icon = 0;
 	default:
 		return DefWindowProc(hwnd, uMsg, wParam, lParam);
 	}
@@ -240,7 +240,7 @@
 	/* Register the MFT decoder */
 	MFTRegister(CLSID_XVID,                          // CLSID
 		        MFT_CATEGORY_VIDEO_DECODER,          // Category
-		        const_cast<LPWSTR>(XVID_NAME_L),     // Friendly name
+				const_cast<LPWSTR>(XVID_NAME_MFT_L), // Friendly name
 		        0,                                   // Flags
 		        inputs_num,                          // Number of input types
 		        mft_bs,                              // Input types
@@ -317,15 +317,20 @@
     xvid_decore_func = NULL; // Hmm, some strange errors appearing if I try to initialize...
     xvid_global_func = NULL; // ...this in constructor's init-list. So, they assigned here.
 
+	m_tray_icon = 0;
+	m_startClock = clock();
+
 #if defined(XVID_USE_MFT)
 	InitializeCriticalSection(&m_mft_lock);
 	m_pInputType = NULL;
 	m_pOutputType = NULL;
+	m_pOutputTypeBPP = 32;
 	m_rtFrame = 0;
 	m_duration = 0;
 	m_discont = 0;
 	m_frameRate.Denominator = 1;
 	m_frameRate.Numerator = 1;
+	m_thread_handle = NULL;
 #endif
 
     LoadRegistryInfo();
@@ -340,10 +345,8 @@
 #else
 		if ((sLen >= 11) && (_strnicmp(&(lpFilenamesLen - 11), TEXT("dllhost.exe"), 11) == 0)) {
 #endif
-			if (Tray_Icon == 0) Tray_Icon = -1; // create no tray icon upon thumbnail generation
+			if (m_tray_icon == 0) m_tray_icon = -1; // create no tray icon upon thumbnail generation
 		}
-		else
-			if (Tray_Icon == -1) Tray_Icon = 0; // can show tray icon
 	}
 
 }
@@ -507,21 +510,31 @@
 {
     DPRINTF("Destructor");
 
-	if (Tray_Icon > 0) { /* Destroy tray icon */
-		NOTIFYICONDATA nid;
-		ZeroMemory(&nid,sizeof(NOTIFYICONDATA));
-
-		nid.cbSize = NOTIFYICONDATA_V1_SIZE;
-		nid.hWnd = MSG_hwnd;
-		nid.uID = 1456;
-	
-		Shell_NotifyIcon(NIM_DELETE, &nid);
-		Tray_Icon = 0;
+	if ((MSG_hwnd != NULL) && (m_tray_icon == 1)) { /* Destroy tray icon */
+		SendMessage(MSG_hwnd, WM_CLOSE, 0, 0);
 	}
-
+	
 	/* Close xvidcore library */
 	CloseLib();
 
+	clock_t endClock = clock();
+	if (((endClock - m_startClock) / CLOCKS_PER_SEC) > 3) {
+		SaveRegistryInfo((endClock - m_startClock) / (CLOCKS_PER_SEC / 10));
+	}
+
+	if ((MSG_hwnd != 0) && (m_tray_icon == 1)) { /* Final clean-up */
+	  MSG_hwnd = 0;
+	  Sleep(200);
+	  m_tray_icon = 0;
+#if defined(XVID_USE_MFT)
+	  if (m_thread_handle) {
+		  TerminateThread(m_thread_handle, 0);
+		  CloseHandle(m_thread_handle);
+		  m_thread_handle = NULL;
+	  }
+#endif
+	}
+
 #if defined(XVID_USE_MFT)
 	DeleteCriticalSection(&m_mft_lock);
 #endif
@@ -822,16 +835,18 @@
 
 
 /* (internal function) change colorspace */
-#define CALC_BI_STRIDE(width,bitcount)  ((((width * bitcount) + 31) & ~31) >> 3)
+#define CALC_BI_STRIDE(width, bitcount)  ((((width * bitcount) + 31) & ~31) >> 3)
 
-HRESULT CXvidDecoder::ChangeColorspace(GUID subtype, GUID formattype, void * format, int noflip)
+HRESULT CXvidDecoder::ChangeColorspace(GUID subtype, GUID formattype, void *format, int *bitdepth, int noflip)
 {
 	DWORD biWidth;
+	*bitdepth = 32;
 
 	if (formattype == FORMAT_VideoInfo)
 	{
 		VIDEOINFOHEADER * vih = (VIDEOINFOHEADER * )format;
 		biWidth = vih->bmiHeader.biWidth;
+		*bitdepth = vih->bmiHeader.biBitCount;
 		out_stride = CALC_BI_STRIDE(vih->bmiHeader.biWidth, vih->bmiHeader.biBitCount);
 		rgb_flip = (vih->bmiHeader.biHeight < 0 ? 0 : XVID_CSP_VFLIP);
 	}
@@ -839,6 +854,7 @@
 	{
 		VIDEOINFOHEADER2 * vih2 = (VIDEOINFOHEADER2 * )format;
 		biWidth = vih2->bmiHeader.biWidth;
+		*bitdepth = vih2->bmiHeader.biBitCount;
 		out_stride = CALC_BI_STRIDE(vih2->bmiHeader.biWidth, vih2->bmiHeader.biBitCount);
 		rgb_flip = (vih2->bmiHeader.biHeight < 0 ? 0 : XVID_CSP_VFLIP);
 	}
@@ -918,11 +934,12 @@
 
 HRESULT CXvidDecoder::SetMediaType(PIN_DIRECTION direction, const CMediaType *pmt)
 {
+	int bitdepth;
 	DPRINTF("SetMediaType");
 	
 	if (direction == PINDIR_OUTPUT)
 	{
-		return ChangeColorspace(*pmt->Subtype(), *pmt->FormatType(), pmt->Format(), 0);
+		return ChangeColorspace(*pmt->Subtype(), *pmt->FormatType(), pmt->Format(), &bitdepth, 0);
 	}
 	
 	return S_OK;
@@ -944,7 +961,7 @@
 {
 	DPRINTF("CompleteConnect");
 
-	if ((direction == PINDIR_OUTPUT) && (Tray_Icon == 0)&& (g_config.bTrayIcon != 0)) 
+	if ((direction == PINDIR_OUTPUT) && (MSG_hwnd == 0) && (m_tray_icon == 0) && (g_config.bTrayIcon != 0))
 	{
 		WNDCLASSEX wc; 
 
@@ -969,18 +986,20 @@
 		NOTIFYICONDATA nid;    
 		ZeroMemory(&nid,sizeof(NOTIFYICONDATA));
 
-		nid.cbSize = NOTIFYICONDATA_V1_SIZE;
+		nid.cbSize = sizeof(NOTIFYICONDATA);
 		nid.hWnd = MSG_hwnd;  
 		nid.uID = 1456;  
+		nid.uVersion = NOTIFYICON_VERSION;
 		nid.uCallbackMessage = WM_ICONMESSAGE;  
 		nid.hIcon = LoadIcon(g_xvid_hInst, MAKEINTRESOURCE(IDI_ICON));  
 		strcpy_s(nid.szTip, 19, "Xvid Video Decoder");  
-		nid.uFlags = NIF_MESSAGE | NIF_ICON | NIF_TIP;
+		nid.uFlags = NIF_MESSAGE | NIF_ICON | NIF_TIP | NIF_SHOWTIP;
 	
 		Shell_NotifyIcon(NIM_ADD, &nid); 
+		Shell_NotifyIcon(NIM_SETVERSION, &nid);
 
 		DestroyIcon(nid.hIcon);
-		Tray_Icon = 1;
+		m_tray_icon = 1;
 	}
 
 	return S_OK;
@@ -1055,9 +1074,10 @@
 	pOut->GetMediaType(&mtOut);
 	if (mtOut != NULL)
 	{
+		int bitdepth;
 		HRESULT result;
 
-		result = ChangeColorspace(mtOut->subtype, mtOut->formattype, mtOut->pbFormat, 0);
+		result = ChangeColorspace(mtOut->subtype, mtOut->formattype, mtOut->pbFormat, &bitdepth, 0);
 		DeleteMediaType(mtOut);
 
 		if (result != S_OK)
@@ -1327,7 +1347,7 @@
 		pStreamInfo->cbAlignment = 0;
 	}
 	else {
-		pStreamInfo->cbSize = m_create.width * abs(m_create.height) * 4; // XXX
+		pStreamInfo->cbSize = (m_create.width * abs(m_create.height) * m_pOutputTypeBPP) >> 3;
 		pStreamInfo->cbAlignment = 1;
 	}
 
@@ -1373,7 +1393,7 @@
 		return MF_E_INVALIDSTREAMNUMBER;
 
 	DWORD i = 0;
-	GUID *bs_guid_table8;
+	GUID *bs_guid_table32;
 
 	bs_guid_tablei++ = (GUID *)&CLSID_XVID;
 	bs_guid_tablei++ = (GUID *)&CLSID_XVID_UC;
@@ -1464,49 +1484,56 @@
 		bitdepth = 4;
 		break;
 }
-	case 1 :
+	case 1:
+if ( USE_YVYU )
+{
+	    csp = MFVideoFormat_YVYU;
+	    bitdepth = 4;
+	    break;
+}
+	case 2 :
 if ( USE_UYVY )
 {
 		csp = MFVideoFormat_UYVY;
 		bitdepth = 4;
 		break;
 }
-	case 2	:
+	case 3	:
 		if ( USE_IYUV )
 {
 		csp = MFVideoFormat_IYUV;
 		bitdepth = 3;
 		break;
 }
-	case 3	:
+	case 4	:
 if ( USE_YV12 )
 {
 		csp = MFVideoFormat_YV12;
 		bitdepth = 3;
 		break;
 }
-	case 4 :
+	case 5 :
 if ( USE_RGB32 )
 {
 		csp = MFVideoFormat_RGB32;
 		bitdepth = 8;
 		break;
 }
-	case 5 :
+	case 6 :
 if ( USE_RGB24 )
 {
 		csp = MFVideoFormat_RGB24;
 		bitdepth = 6;
 		break;
 }
-	case 6 :
+	case 7 :
 if ( USE_RG555 )
 {
 		csp = MFVideoFormat_RGB555;
 		bitdepth = 4;
 		break;
 }
-	case 7 :
+	case 8 :
 if ( USE_RG565 )
 {
 		csp = MFVideoFormat_RGB565;
@@ -1544,11 +1571,11 @@
 	}
 	
 	if (SUCCEEDED(hr)) {
-		hr = pOutputType->SetUINT32(MF_MT_SAMPLE_SIZE, (m_create.height * m_create.width * bitdepth)>>1);
+		hr = pOutputType->SetUINT32(MF_MT_SAMPLE_SIZE, (abs(m_create.height) * m_create.width * bitdepth) >> 1);
 	}
 	
 	if (SUCCEEDED(hr)) {
-		hr = MFSetAttributeSize(pOutputType, MF_MT_FRAME_SIZE, m_create.width, m_create.height);
+		hr = MFSetAttributeSize(pOutputType, MF_MT_FRAME_SIZE, m_create.width, abs(m_create.height));
 	}
 	
 	if (SUCCEEDED(hr)) {
@@ -1596,7 +1623,7 @@
 		hr = MF_E_TRANSFORM_CANNOT_CHANGE_MEDIATYPE_WHILE_PROCESSING;
 
 	if (SUCCEEDED(hr)) { 
-        if (pType) { // /* Check the type */
+        if (pType) { /* Check the type */
             hr = OnCheckInputType(pType);
         }
 	}
@@ -1611,6 +1638,54 @@
 	return hr;
 }
 
+DWORD WINAPI CreateTrayIcon(LPVOID lpParameter)
+{
+	WNDCLASSEX wc;
+
+	wc.cbSize = sizeof(WNDCLASSEX);
+	wc.lpfnWndProc = msg_proc;
+	wc.style = CS_HREDRAW | CS_VREDRAW;
+	wc.cbWndExtra = 0;
+	wc.cbClsExtra = 0;
+	wc.hInstance = (HINSTANCE)g_xvid_hInst;
+	wc.hbrBackground = (HBRUSH)GetStockObject(NULL_BRUSH);
+	wc.lpszMenuName = NULL;
+	wc.lpszClassName = "XVID_MSG_WINDOW";
+	wc.hIcon = NULL;
+	wc.hIconSm = NULL;
+	wc.hCursor = NULL;
+	RegisterClassEx(&wc);
+
+	MSG_hwnd = CreateWindowEx(0, "XVID_MSG_WINDOW", NULL, 0, CW_USEDEFAULT,
+		CW_USEDEFAULT, 0, 0, HWND_MESSAGE, NULL, (HINSTANCE)g_xvid_hInst, NULL);
+
+	/* display the tray icon */
+	NOTIFYICONDATA nid;
+	ZeroMemory(&nid, sizeof(NOTIFYICONDATA));
+
+	nid.cbSize = sizeof(NOTIFYICONDATA);
+	nid.hWnd = MSG_hwnd;
+	nid.uID = 1456;
+	nid.uVersion = NOTIFYICON_VERSION;
+	nid.uCallbackMessage = WM_ICONMESSAGE;
+	nid.hIcon = LoadIcon(g_xvid_hInst, MAKEINTRESOURCE(IDI_ICON));
+	strcpy_s(nid.szTip, 19, "Xvid Video Decoder");
+	nid.uFlags = NIF_MESSAGE | NIF_ICON | NIF_TIP | NIF_SHOWTIP;
+
+	Shell_NotifyIcon(NIM_ADD, &nid);
+	Shell_NotifyIcon(NIM_SETVERSION, &nid);
+
+	DestroyIcon(nid.hIcon);
+	
+	MSG msg;
+	while (MSG_hwnd && GetMessage(&msg, MSG_hwnd, 0, 0)) {
+		TranslateMessage(&msg);
+		DispatchMessage(&msg);
+	}
+	
+	return 0;
+}
+
 HRESULT CXvidDecoder::MFTSetOutputType(DWORD dwOutputStreamID, IMFMediaType *pType, DWORD dwFlags)
 {
 	DPRINTF("(MFT)SetOutputType");
@@ -1632,13 +1707,14 @@
 	if (HasPendingOutput())
 		hr = MF_E_TRANSFORM_CANNOT_CHANGE_MEDIATYPE_WHILE_PROCESSING;
 
+	int bitdepth;
 	if (SUCCEEDED(hr)) { 
 		if (pType) { /* Check the type */
 			AM_MEDIA_TYPE *am;
 			hr = MFCreateAMMediaTypeFromMFMediaType(pType, GUID_NULL, &am);
 			
 			if (SUCCEEDED(hr)) {
-				if (FAILED(ChangeColorspace(am->subtype, am->formattype, am->pbFormat, 1))) {
+				if (FAILED(ChangeColorspace(am->subtype, am->formattype, am->pbFormat, &bitdepth, 1))) {
 					DPRINTF("(MFT)InternalCheckOutputType (MF_E_INVALIDTYPE)");
 					return MF_E_INVALIDTYPE;
 				}
@@ -1651,50 +1727,20 @@
 	
 	if (SUCCEEDED(hr)) {
 		if (bReallySet) { /* Set the type if needed */
-			hr = OnSetOutputType(pType);
+			hr = OnSetOutputType(pType, bitdepth);
 		}
 	}
 
-	if (SUCCEEDED(hr) && (Tray_Icon == 0) && (g_config.bTrayIcon != 0))  /* Create message passing window */
+	if (SUCCEEDED(hr) && (MSG_hwnd == 0) && (m_tray_icon == 0) && (g_config.bTrayIcon != 0))  
 	{
-		WNDCLASSEX wc; 
+		m_thread_handle = CreateThread(NULL, 0, CreateTrayIcon, NULL, 0, NULL);  /* Create message passing window */
 
-		wc.cbSize = sizeof(WNDCLASSEX);
-		wc.lpfnWndProc = msg_proc;
-		wc.style = CS_HREDRAW | CS_VREDRAW;
-		wc.cbWndExtra = 0;
-		wc.cbClsExtra = 0;
-		wc.hInstance = (HINSTANCE) g_xvid_hInst;
-		wc.hbrBackground = (HBRUSH) GetStockObject(NULL_BRUSH);
-		wc.lpszMenuName = NULL;
-		wc.lpszClassName = "XVID_MSG_WINDOW";
-		wc.hIcon = NULL;
-		wc.hIconSm = NULL;
-		wc.hCursor = NULL;
-		RegisterClassEx(&wc);
-
-		MSG_hwnd = CreateWindowEx(0, "XVID_MSG_WINDOW", NULL, 0, CW_USEDEFAULT, 
-                                  CW_USEDEFAULT, 0, 0, HWND_MESSAGE, NULL, (HINSTANCE) g_xvid_hInst, NULL);
-
-		/* display the tray icon */
-		NOTIFYICONDATA nid;    
-		ZeroMemory(&nid,sizeof(NOTIFYICONDATA));
-
-		nid.cbSize = NOTIFYICONDATA_V1_SIZE;
-		nid.hWnd = MSG_hwnd;  
-		nid.uID = 1456;  
-		nid.uCallbackMessage = WM_ICONMESSAGE;  
-		nid.hIcon = LoadIcon(g_xvid_hInst, MAKEINTRESOURCE(IDI_ICON));  
-		strcpy_s(nid.szTip, 19, "Xvid Video Decoder");  
-		nid.uFlags = NIF_MESSAGE | NIF_ICON | NIF_TIP;
-		
-		Shell_NotifyIcon(NIM_ADD, &nid); 
-
-		DestroyIcon(nid.hIcon);
-		Tray_Icon = 1;
+		if (m_thread_handle)
+		    m_tray_icon = 1;
 	}
 
 	LeaveCriticalSection(&m_mft_lock);
+
 	return hr;
 }
 
@@ -1762,7 +1808,7 @@
 	
 	EnterCriticalSection(&m_mft_lock);
 	
-	/* If there's pending output sampels we don't accept new
+	/* If there's pending output samples we don't accept new
 	   input data until ProcessOutput() or Flush() was called */
 	if (!HasPendingOutput()) {
 		*pdwFlags = MFT_INPUT_STATUS_ACCEPT_DATA;
@@ -1999,7 +2045,8 @@
 			}
 
 			ar_x = par_x * stats.data.vol.width;
-			ar_y = par_y * stats.data.vol.height;
+			ar_y = par_y * stats.data.vol.height; /* TODO: Actually set the newly determined AR on the output sample type 
+												           or it'll have no effect at all... */
 		}
 
 		m_frame.bitstream = (BYTE*)m_frame.bitstream + length;
@@ -2061,19 +2108,28 @@
 	
 	BYTE *Dst = NULL;
 	DWORD buffer_size;
-	
+	LONG stride = m_create.width;
 	IMFMediaBuffer *pOutput = NULL;
-	
+	IMF2DBuffer *pOutput2D = NULL;
+
 	if (SUCCEEDED(hr)) {
 		hr = pOutputSamples0.pSample->GetBufferByIndex(0, &pOutput); /* Get output buffer */
 	}
-	
+
 	if (SUCCEEDED(hr)) {
 		hr = pOutput->GetMaxLength(&buffer_size);
 	}
-	
-	if (SUCCEEDED(hr))
+
+	if (SUCCEEDED(hr)) {
+		hr = pOutput->QueryInterface(IID_IMF2DBuffer, (void **)&pOutput2D);
+	}
+
+	if (SUCCEEDED(hr)) {
+		hr = pOutput2D->Lock2D(&Dst, &stride);
+	}
+	else {
 		hr = pOutput->Lock(&Dst, NULL, NULL);
+	}
 
 	if (SUCCEEDED(hr)) {
 		xvid_gbl_convert_t convert;
@@ -2091,7 +2147,7 @@
 
 		convert.output.csp = m_frame.output.csp;
 		convert.output.plane0 = Dst;
-		convert.output.stride0 = out_stride;
+		convert.output.stride0 = stride;
 
 		convert.width = m_create.width;
 		convert.height = m_create.height;
@@ -2100,7 +2156,6 @@
 		if (m_frame.output.plane1 != NULL && Dst != NULL && xvid_global_func != NULL) 
 			if (xvid_global_func(0, XVID_GBL_CONVERT, &convert, NULL) < 0) /* CSP convert into output buffer */
 				hr = E_FAIL;
-
 		m_frame.output.plane1 = NULL;
 	}
 
@@ -2125,14 +2180,20 @@
 		}
 		
 		if (SUCCEEDED(hr))
-			hr = pOutput->SetCurrentLength(m_create.width * abs(m_create.height) * 4); // XXX
+			hr = pOutput->SetCurrentLength((m_create.width * abs(m_create.height) * m_pOutputTypeBPP) >> 3);
 	}
 	
-	if (pOutput) { 
-		pOutput->Unlock(); 
-		pOutput->Release(); 
+	if (pOutput2D) { 
+		pOutput2D->Unlock2D();
+		pOutput2D->Release();
+		if (pOutput)
+		    pOutput->Release(); 
 	}
-	
+	else if (pOutput) {
+		pOutput->Unlock();
+		pOutput->Release();
+	}
+
 	LeaveCriticalSection(&m_mft_lock);
 
 	return hr;
@@ -2246,7 +2307,7 @@
 		CloseLib();
 		hr = MF_E_INVALIDTYPE;
 	}
-	
+
 	/* haali media splitter reports VOL information in the format header */
 	if (SUCCEEDED(hr))
 	{
@@ -2316,13 +2377,14 @@
 	return hr;
 }
 
-HRESULT CXvidDecoder::OnSetOutputType(IMFMediaType *pmt)
+HRESULT CXvidDecoder::OnSetOutputType(IMFMediaType *pmt, int bitdepth)
 {
 	if (m_pOutputType) m_pOutputType->Release();
 	
 	m_pOutputType = pmt;
 	m_pOutputType->AddRef();
-	
+	m_pOutputTypeBPP = bitdepth;
+
 	return S_OK;
 }

xvidcore-1.3.3.tar.bz2/dshow/src/CXvidDecoder.h -> xvidcore-1.3.4.tar.bz2/dshow/src/CXvidDecoder.h Changed

@@ -19,17 +19,19 @@
  *  along with this program ; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- * $Id: CXvidDecoder.h 2059 2012-02-22 19:00:26Z Isibaar $
+ * $Id: CXvidDecoder.h 2114 2015-06-14 19:18:14Z Isibaar $
  *
  ****************************************************************************/
 
 #ifndef _FILTER_H_
 #define _FILTER_H_
 
+#include <time.h>
 #include <xvid.h>
 #include "IXvidDecoder.h"
 
 #define XVID_NAME_L		L"Xvid MPEG-4 Video Decoder"
+#define XVID_NAME_MFT_L	L"Xvid MPEG-4 Video Decoder MFT"
 
 /* --- fourcc --- */
 
@@ -153,7 +155,7 @@
 
 private :
 
-	HRESULT ChangeColorspace(GUID subtype, GUID formattype, void * format, int noflip);
+	HRESULT ChangeColorspace(GUID subtype, GUID formattype, void * format, int *bitdepth, int noflip);
 	HRESULT OpenLib();
 	void CloseLib();
 
@@ -169,6 +171,9 @@
 	int rgb_flip;
 	int out_stride;
 
+	clock_t m_startClock;
+	int m_tray_icon;
+
 	/* mft stuff */
 #if defined(XVID_USE_MFT)
 	BOOL HasPendingOutput() const { return m_frame.output.plane1 != NULL; }
@@ -176,10 +181,11 @@
 	HRESULT OnSetInputType(IMFMediaType *pmt);
 	HRESULT OnCheckInputType(IMFMediaType *pmt);
 
-	HRESULT OnSetOutputType(IMFMediaType *pmt);
+	HRESULT OnSetOutputType(IMFMediaType *pmt, int bitdepth);
 
 	IMFMediaType *m_pInputType;
 	IMFMediaType *m_pOutputType;
+	int m_pOutputTypeBPP;
 
 	CRITICAL_SECTION m_mft_lock;
 	REFERENCE_TIME m_timestamp;
@@ -191,9 +197,9 @@
 	REFERENCE_TIME m_rtFrame;
 	MFRatio m_frameRate;
 	UINT64 m_duration;
-#endif
 
-	HWND MSG_hwnd; /* message handler window */
+	HANDLE m_thread_handle;
+#endif
 };
 #define WM_ICONMESSAGE (WM_USER + 1)

xvidcore-1.3.3.tar.bz2/dshow/src/config.c -> xvidcore-1.3.4.tar.bz2/dshow/src/config.c Changed

@@ -19,7 +19,7 @@
  *  along with this program ; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- * $Id: config.c 2059 2012-02-22 19:00:26Z Isibaar $
+ * $Id: config.c 2114 2015-06-14 19:18:14Z Isibaar $
  *
  ****************************************************************************/
 
@@ -62,7 +62,7 @@
 	RegCloseKey(hKey);
 }
 
-void SaveRegistryInfo()
+void SaveRegistryInfo(int perfCount)
 {
 	HKEY hKey;
 	DWORD dispo;
@@ -82,19 +82,33 @@
 		return;
 	}
 
-	REG_SET_N("Brightness", g_config.nBrightness);
-	REG_SET_N("Deblock_Y",  g_config.nDeblock_Y);
-	REG_SET_N("Deblock_UV", g_config.nDeblock_UV);
-	REG_SET_N("Dering_Y", g_config.nDering_Y);
-	REG_SET_N("Dering_UV", g_config.nDering_UV);
-	REG_SET_N("FilmEffect", g_config.nFilmEffect);
-	REG_SET_N("ForceColorspace", g_config.nForceColorspace);
-	REG_SET_N("FlipVideo", g_config.nFlipVideo);
-	REG_SET_N("Supported_4CC",  g_config.supported_4cc);
-	REG_SET_N("Videoinfo_Compat",  g_config.videoinfo_compat);
-	REG_SET_N("Decoder_Aspect_Ratio", g_config.aspect_ratio);
-	REG_SET_N("num_threads",  g_config.num_threads);
-	REG_SET_N("Tray_Icon", g_config.bTrayIcon);
+	if (perfCount > 0) {
+		unsigned int updateCount = 0;
+		HKEY hKey2 = hKey;
+		DWORD size;
+
+		RegOpenKeyEx(XVID_REG_KEY, XVID_REG_SUBKEY, 0, KEY_READ, &hKey);
+		REG_GET_N("PerfCount", updateCount, 0);
+		RegCloseKey(hKey);
+		hKey = hKey2;
+		updateCount += perfCount;
+		REG_SET_N("PerfCount", updateCount);
+	}
+	else {
+		REG_SET_N("Brightness", g_config.nBrightness);
+		REG_SET_N("Deblock_Y", g_config.nDeblock_Y);
+		REG_SET_N("Deblock_UV", g_config.nDeblock_UV);
+		REG_SET_N("Dering_Y", g_config.nDering_Y);
+		REG_SET_N("Dering_UV", g_config.nDering_UV);
+		REG_SET_N("FilmEffect", g_config.nFilmEffect);
+		REG_SET_N("ForceColorspace", g_config.nForceColorspace);
+		REG_SET_N("FlipVideo", g_config.nFlipVideo);
+		REG_SET_N("Supported_4CC", g_config.supported_4cc);
+		REG_SET_N("Videoinfo_Compat", g_config.videoinfo_compat);
+		REG_SET_N("Decoder_Aspect_Ratio", g_config.aspect_ratio);
+		REG_SET_N("num_threads", g_config.num_threads);
+		REG_SET_N("Tray_Icon", g_config.bTrayIcon);
+	}
 
 	RegCloseKey(hKey);
 }
@@ -125,7 +139,7 @@
 				MessageBox(0, "You have changed the default aspect ratio.\r\nClose the movie and open it for the new aspect ratio to take effect.", "Xvid DShow", MB_TOPMOST);
 			}
 			g_config.aspect_ratio = (int) aspect_ratio;
-			SaveRegistryInfo();
+			SaveRegistryInfo(0);
 		}
 		break;
 
@@ -274,14 +288,14 @@
 
 		EnableWindow(GetDlgItem(hwnd, IDC_USE_AR), !g_config.videoinfo_compat);
 
-		SaveRegistryInfo();
+		SaveRegistryInfo(0);
 		
 
 		break;
 	case WM_NOTIFY:
 		hBrightness = GetDlgItem(hwnd, IDC_BRIGHTNESS);
 		g_config.nBrightness = (int) SendMessage(hBrightness, TBM_GETPOS, (WPARAM)NULL, (LPARAM)NULL);
-		SaveRegistryInfo();
+		SaveRegistryInfo(0);
 		break;
 	default :
 		return FALSE;

xvidcore-1.3.3.tar.bz2/dshow/src/config.h -> xvidcore-1.3.4.tar.bz2/dshow/src/config.h Changed

xvidcore-1.3.3.tar.bz2/dshow/src/xvid.ico -> xvidcore-1.3.4.tar.bz2/dshow/src/xvid.ico Changed

xvidcore-1.3.3.tar.bz2/src/encoder.c -> xvidcore-1.3.4.tar.bz2/src/encoder.c Changed

xvidcore-1.3.3.tar.bz2/src/image/x86_asm/colorspace_rgb_mmx.asm -> xvidcore-1.3.4.tar.bz2/src/image/x86_asm/colorspace_rgb_mmx.asm Changed

@@ -119,8 +119,8 @@
 
   pxor mm4, mm4
   pxor mm5, mm5
-  movd mm0, x_ptr               ; x_ptr0...
-  movd mm2, x_ptr+x_stride           ; x_ptrx_stride...
+  movd mm0, x_ptr             ; x_ptr0...
+  movd mm2, x_ptr+x_stride    ; x_ptrx_stride...
   punpcklbw mm0, mm4            ;   |b |g |r 
   punpcklbw mm2, mm5            ;   |b |g |r 
   movq mm6, mm0                 ; =   |b4|g4|r4
@@ -136,8 +136,15 @@
 
   pxor mm4, mm4
   pxor mm5, mm5
-  movd mm1, x_ptr+%1            ; src%1...
-  movd mm3, x_ptr+x_stride+%1        ; srcx_stride+%1...
+%if %1 == 3     ; BGR (24-bit)
+  movd mm1, x_ptr+2          
+  movd mm3, x_ptr+x_stride+2 
+  psrlq mm1, 8                  ; src%1...
+  psrlq mm3, 8                  ; srcx_stride+%1... 
+%else
+  movd mm1, x_ptr+%1          ; src%1...
+  movd mm3, x_ptr+x_stride+%1 ; srcx_stride+%1...
+%endif
   punpcklbw mm1, mm4            ;   |b |g |r 
   punpcklbw mm3, mm5            ;   |b |g |r 
   paddw mm6, mm1                ; +  |b4|g4|r4
@@ -237,8 +244,15 @@
 
   pxor mm4, mm4
   pxor mm5, mm5
+%if %1 == 3     ; BGR (24-bit)
+  movd mm1, x_ptr+2          
+  movd mm3, x_ptr+x_stride+2 
+  psrlq mm1, 8                  ; src%1...
+  psrlq mm3, 8                  ; srcx_stride+%1... 
+%else
   movd mm1, x_ptr+%1          ; src%1...
   movd mm3, x_ptr+x_stride+%1 ; srcx_stride+%1...
+%endif
   punpcklbw mm1, mm4            ;   |b |g |r 
   punpcklbw mm3, mm5            ;   |b |g |r 
   paddw mm6, mm1                ; +  |b4|g4|r4

xvidcore-1.3.3.tar.bz2/src/xvid.c -> xvidcore-1.3.4.tar.bz2/src/xvid.c Changed

xvidcore-1.3.3.tar.bz2/src/xvid.h -> xvidcore-1.3.4.tar.bz2/src/xvid.h Changed

Overview

Request 2703 (accepted)

Request History