Packman Build Service PMBS

xvidcore.changes Changed

xvidcore.spec Changed

xvidcore-1.2.2.tar.bz2/AUTHORS -> xvidcore-1.3.0.tar.bz2/AUTHORS Changed

xvidcore-1.2.2.tar.bz2/ChangeLog -> xvidcore-1.3.0.tar.bz2/ChangeLog Changed

@@ -1,166 +1,1509 @@
 # Note that this ChangeLog covers only changes to the HEAD branch
 
 ---------------------
-Date: 2009/05/27 14:46:09
+Date: 2011/02/14 17:58:54
+Author: Isibaar
+Branch: release-1_3-branch
+Tag: (none) 
+Log:
+Support for additional third-party FourCCs (based on Jawor's patch with some small fixes)
+
+Members: 
+	dshow/src/CXvidDecoder.cpp:1.25.2.2->1.25.2.3 
+	dshow/src/CXvidDecoder.h:1.9->1.9.2.1 
+	dshow/src/config.c:1.12->1.12.2.1 
+	dshow/src/config.h:1.8->1.8.2.1 
+	dshow/src/resource.h:1.5->1.5.2.1 
+	dshow/src/xvid.ax.rc:1.8->1.8.2.1 
+
+---------------------
+Date: 2011/02/03 16:12:34
+Author: Isibaar
+Branch: release-1_3-branch
+Tag: (none) 
+Log:
+skip possible only for P_VOP (Jawor)
+
+Members: 
+	src/encoder.c:1.135.2.3->1.135.2.4 
+
+---------------------
+Date: 2011/02/03 16:01:06
+Author: Isibaar
+Branch: release-1_3-branch
+Tag: (none) 
+Log:
+auto framerate detection if possible, some other minor cosmetics (derived from Jawor's patches)
+
+Members: 
+	examples/xvid_encraw.c:1.46.2.2->1.46.2.3 
+
+---------------------
+Date: 2011/01/27 14:18:13
+Author: Isibaar
+Branch: release-1_3-branch
+Tag: (none) 
+Log:
+Increased filter merit
+
+Members: 
+	dshow/src/CXvidDecoder.cpp:1.25.2.1->1.25.2.2 
+
+---------------------
+Date: 2011/01/27 14:13:16
+Author: Isibaar
+Branch: release-1_3-branch
+Tag: (none) 
+Log:
+Ensure that colorspace pass-through is enabled really just for FOURCC_YV12
+
+Members: 
+	vfw/src/codec.c:1.30.2.1->1.30.2.2 
+
+---------------------
+Date: 2011/01/11 12:37:52
+Author: Isibaar
+Branch: release-1_3-branch
+Tag: (none) 
+Log:
+don't hardcode "ar" tool (thanks to Bin Tian)
+
+Members: 
+	build/generic/Makefile:1.18->1.18.2.1 
+	build/generic/configure.in:1.33.2.1->1.33.2.2 
+	build/generic/platform.inc.in:1.8->1.8.2.1 
+
+---------------------
+Date: 2011/01/09 14:20:50
+Author: Isibaar
+Branch: release-1_3-branch
+Tag: (none) 
+Log:
+update for macho64
+
+Members: 
+	src/nasm.inc:1.7->1.7.2.1 
+
+---------------------
+Date: 2011/01/06 15:12:29
+Author: Isibaar
+Branch: release-1_3-branch
+Tag: (none) 
+Log:
+patch for darwin 64-bit target (thanks to Bin Tian)
+
+Members: 
+	build/generic/configure.in:1.33->1.33.2.1 
+
+---------------------
+Date: 2011/01/03 09:31:22
+Author: Isibaar
+Branch: release-1_3-branch
+Tag: (none) 
+Log:
+removed absolute logo path (thanks to Brendan Brewster)
+
+Members: 
+	vfw/src/resource.rc:1.30->1.30.2.1 
+
+---------------------
+Date: 2010/12/31 11:20:22
+Author: Isibaar
+Branch: #CVSPS_NO_BRANCH
+Tag: rc1_1_3_0 
+Log:
+fix some typo
+
+Members: 
+	src/encoder.c:1.135.2.2->1.135.2.3 
+
+---------------------
+Date: 2010/12/30 23:59:31
+Author: Isibaar
+Branch: #CVSPS_NO_BRANCH
+Tag: (none) 
+Log:
+CVS corruption again
+
+Members: 
+	vfw/src/hd1080_40.ico:1.1->1.1.2.1 
+	vfw/src/hd720_40.ico:1.1->1.1.2.1 
+	vfw/src/home_40.ico:1.1->1.1.2.1 
+	vfw/src/mobile_40.ico:1.1->1.1.2.1 
+
+---------------------
+Date: 2010/12/30 23:07:43
+Author: Isibaar
+Branch: #CVSPS_NO_BRANCH
+Tag: (none) 
+Log:
+changed num_slice determination logic
+
+Members: 
+	vfw/src/codec.c:1.30->1.30.2.1 
+	vfw/src/config.c:1.45->1.45.2.1 
+	vfw/src/resource.h:1.15->1.15.2.1 
+
+---------------------
+Date: 2010/12/30 12:46:58
+Author: Isibaar
+Branch: #CVSPS_NO_BRANCH
+Tag: (none) 
+Log:
+more bug squashing
+
+Members: 
+	examples/xvid_encraw.c:1.46.2.1->1.46.2.2 
+	src/image/image.c:1.46->1.46.2.1 
+
+---------------------
+Date: 2010/12/29 23:29:51
+Author: Isibaar
+Branch: release-1_3-branch
+Tag: (none) 
+Log:
+bug fixing...
+
+Members: 
+	src/encoder.c:1.135.2.1->1.135.2.2 
+
+---------------------
+Date: 2010/12/29 23:29:44
+Author: Isibaar
+Branch: #CVSPS_NO_BRANCH
+Tag: (none) 
+Log:
+bug fixing...
+
+Members: 
+	src/motion/estimation_bvop.c:1.28->1.28.2.1 
+	src/motion/estimation_rd_based.c:1.16->1.16.2.1 
+
+---------------------
+Date: 2010/12/28 20:19:57
+Author: Isibaar
+Branch: #CVSPS_NO_BRANCH
+Tag: (none) 
+Log:
+get rid off compiler warnings
+
+Members: 
+	build/win32/libxvidcore.vcproj:1.5->1.5.2.1 
+	build/win32/xvid_decraw.vcproj:1.3->1.3.2.1 
+	build/win32/xvid_encraw.vcproj:1.4->1.4.2.1 
+	dshow/dshow.vcproj:1.3->1.3.2.1 
+	dshow/src/CXvidDecoder.cpp:1.25->1.25.2.1 
+	examples/xvid_decraw.c:1.28->1.28.2.1 
+	src/decoder.c:1.86->1.86.2.1 
+	src/bitstream/bitstream.c:1.60->1.60.2.1

xvidcore-1.2.2.tar.bz2/CodingStyle -> xvidcore-1.3.0.tar.bz2/CodingStyle Changed

@@ -3,7 +3,7 @@
 
 
 This is a short document describing the preferred coding style for the
-XviD  core library.   Coding  style  is very  personal,  and we  won't
+Xvid  core library.   Coding  style  is very  personal,  and we  won't
 _force_  our   views  on  anybody.   But  if   everybody  who  submits
 patches/codes to the  CVS respect this coding style,  the whole source
 would be easier to read/understand for all the others developers.
@@ -18,7 +18,7 @@
 
 In short,  8-char indents would have  made things easier  to read, and
 would have the  added benefit of warning you  when you're nesting your
-functions too deep. But because of  some parts of the XviD code source
+functions too deep. But because of  some parts of the Xvid code source
 has to use  lot of if/else/for statements together,  we have chosen to
 set the standard tab length to 4 characters.
 
@@ -94,7 +94,7 @@
 function that counts the number  of active users, you should call that
 "count_active_users()"   or  similar,   you  should   _not_   call  it
 "cntusr()". Try not  to use global variables as  they break reentrancy
-and XviD aims to be (in a long term) a threadable library.
+and Xvid aims to be (in a long term) a threadable library.
 
 
 Encoding the  type of  a function into  the name  (so-called Hungarian
@@ -140,7 +140,7 @@
 and it gets confused.  You know you're brilliant, but maybe you'd like
 to understand what you did 2 weeks from now.
 
-NB :  This chapter does  not apply very  well to some XviD  parts, but
+NB :  This chapter does  not apply very  well to some Xvid  parts, but
 keep this "philosphy" in mind anyway.
 
 
@@ -175,7 +175,7 @@
 file:
 
 (defun xvid-c-mode ()
-  "C mode with adjusted defaults for use with the XviD Sources."
+  "C mode with adjusted defaults for use with the Xvid Sources."
   (interactive)
   (c-mode)
   (message "Loading xvid-c-mode")
@@ -227,7 +227,7 @@
 
 			Chapter 8: Reentrance
 
-Well, at  the moment, XviD is  not a reentrant  library because during
+Well, at  the moment, Xvid is  not a reentrant  library because during
 its development, some mistakes have  been comited. But reentrance is a
 long term aim  for this project so you should not  write code which is
 not reentrant.
@@ -254,7 +254,7 @@
 64bit on 64 bit CPUs (ultra sparc, AMD hammer, Intel Itanium, Motorola
 powerpc64)
 
-But  don't forget  that  the  minimum platform  targeted  by the  XviD
+But  don't forget  that  the  minimum platform  targeted  by the  Xvid
 library is a  32bit cpu. So a  'int' should (never say 'is'  in such a
 case) always be 32bit long (or bigger)
 
@@ -279,4 +279,4 @@
   - *BSD (same archs as GNU/Linux)
   - Solaris.
 
-Last edited: $Date: 2004/03/22 22:36:23 $
+Last edited: $Date: 2010/12/22 16:52:52 $

xvidcore-1.2.2.tar.bz2/README -> xvidcore-1.3.0.tar.bz2/README Changed

xvidcore-1.2.2.tar.bz2/TODO -> xvidcore-1.3.0.tar.bz2/TODO Changed

@@ -6,10 +6,12 @@
 Outstanding items:
 ------------------
 xvidcore
-* MMX MPEG4 quantization precision.
 * update/fix CBR plugin
   - misses target bitrate, bitrate burst in static motion/high motion
     transitions
+* parallel slice decoding (pre-parse for resync marker boundaries)
+* filter/deblock reference frames before ME ("true motion")
+* PSNR-HVS-M adaptive quantization
 
 examples
 * profile/level support within xvid_encraw
@@ -23,15 +25,21 @@
 * user settings management
 
 directshow
-* manual aspect ratio setting (1:1, 4:3, 16:9, Custom)
 * option to display libxvidcore version and bitstream ontop of video
-  hopefuly, using smooth fonts, not image_printf().
+  hopefully, using smooth fonts, not image_printf().
 
 
 
 Completed items:
 ----------------
-
+* clusterable two-pass coding
+* multi-threaded decoder deblocking
+* parallel slice coding
+* multi-threaded motion estimation
+* manual aspect ratio setting (1:1, 4:3, 16:9, Custom)
+* MMX MPEG4 quantization precision.
+* sse3/sse4 SIMD optimizations.
+* x86_64 optimizations for xvidcore.
 * remove divx4 api (ed.gomez)
 * remove VOP_TYPE enumerations (peter)
 * remove HINTed ME stuff (ed.gomez)
@@ -61,4 +69,4 @@
 * video buffer verifier (christoph)
 
 
-Last edited: $Date: 2005/10/09 07:38:33 $
+Last edited: $Date: 2010/12/27 16:39:31 $

xvidcore-1.2.2.tar.bz2/build/generic/Makefile -> xvidcore-1.3.0.tar.bz2/build/generic/Makefile Changed

xvidcore-1.2.2.tar.bz2/build/generic/config.guess -> xvidcore-1.3.0.tar.bz2/build/generic/config.guess Changed

@@ -1,9 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2005-07-08'
+timestamp='2003-06-17'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -17,15 +17,13 @@
 #
 # 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., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-
 # Originally written by Per Bothner <per@bothner.com>.
 # Please send patches to <config-patches@gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
@@ -55,7 +53,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -68,11 +66,11 @@
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
+       echo "$timestamp" ; exit 0 ;;
     --version | -v )
-       echo "$version" ; exit ;;
+       echo "$version" ; exit 0 ;;
     --help | --h* | -h )
-       echo "$usage"; exit ;;
+       echo "$usage"; exit 0 ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -125,7 +123,7 @@
 	;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
+esac ;'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
@@ -138,15 +136,12 @@
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-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
+## for Red Hat Linux
+if test -f /etc/redhat-release ; then
+    VENDOR=redhat ;
+else
+    VENDOR= ;
+fi
 
 # Note: order is significant - the case branches are not exclusive.
 
@@ -208,29 +203,50 @@
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
-	exit ;;
+	exit 0 ;;
+    amiga:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    arc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    hp300:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mac68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    macppc:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme88k:OpenBSD:*:*)
+	echo m88k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvmeppc:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    pmax:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sgi:OpenBSD:*:*)
+	echo mipseb-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sun3:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    wgrisc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     *:OpenBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-	exit ;;
-    *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit ;;
-    macppc:MirBSD:*:*)
-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
+	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     alpha:OSF1:*:*)
-	case $UNAME_RELEASE in
-	*4.0)
+	if test $UNAME_RELEASE = "V4.0"; then
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-		;;
-	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-		;;
-	esac
+	fi
 	# According to Compaq, /usr/sbin/psrinfo has been available on
 	# OSF/1 and Tru64 systems produced since 1995.  I hope that
 	# covers most systems running today.  This code pipes the CPU
@@ -268,49 +284,42 @@
 	    "EV7.9 (21364A)")
 		UNAME_MACHINE="alphaev79" ;;
 	esac
-	# A Pn.n version is a patched version.
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	exit 0 ;;
+    Alpha*:OpenVMS:*:*)
+	echo alpha-hp-vms
+	exit 0 ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
 	# of the specific Alpha model?
 	echo alpha-pc-interix
-	exit ;;
+	exit 0 ;;
     21064:Windows_NT:50:3)
 	echo alpha-dec-winnt3.5
-	exit ;;
+	exit 0 ;;
     Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-unknown-sysv4
-	exit ;;
+	exit 0;;
     *:[Aa]miga[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit ;;
+	exit 0 ;;
     *:[Mm]orph[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-morphos
-	exit ;;
+	exit 0 ;;
     *:OS/390:*:*)
 	echo i370-ibm-openedition
-	exit ;;
-    *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit ;;

xvidcore-1.2.2.tar.bz2/build/generic/config.sub -> xvidcore-1.3.0.tar.bz2/build/generic/config.sub Changed

xvidcore-1.2.2.tar.bz2/build/generic/configure -> xvidcore-1.3.0.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.59 for Xvid 1.2.2.
+# Generated by GNU Autoconf 2.59 for Xvid 1.3.0.
 #
 # Report bugs to <xvid-devel@xvid.org>.
 #
@@ -269,8 +269,8 @@
 # Identity of this package.
 PACKAGE_NAME='Xvid'
 PACKAGE_TARNAME='xvid'
-PACKAGE_VERSION='1.2.2'
-PACKAGE_STRING='Xvid 1.2.2'
+PACKAGE_VERSION='1.3.0'
+PACKAGE_STRING='Xvid 1.3.0'
 PACKAGE_BUGREPORT='xvid-devel@xvid.org'
 
 ac_unique_file="configure.in"
@@ -312,7 +312,7 @@
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB CPP EGREP ac_yasm ac_nasm FEATURES ARCHITECTURE BUS ENDIANNESS SHARED_EXTENSION STATIC_EXTENSION OBJECT_EXTENSION NASM_FORMAT AS AFLAGS ASSEMBLY_EXTENSION GENERIC_SOURCES ASSEMBLY_SOURCES SPECIFIC_LDFLAGS SPECIFIC_CFLAGS DCT_IA64_SOURCES PPC_ALTIVEC_SOURCES API_MAJOR API_MINOR STATIC_LIB PRE_SHARED_LIB SHARED_LIB LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB AR ac_ct_AR CPP EGREP ac_yasm ac_nasm FEATURES ARCHITECTURE BUS ENDIANNESS SHARED_EXTENSION STATIC_EXTENSION OBJECT_EXTENSION NASM_FORMAT AS AFLAGS ASSEMBLY_EXTENSION GENERIC_SOURCES ASSEMBLY_SOURCES SPECIFIC_LDFLAGS SPECIFIC_CFLAGS DCT_IA64_SOURCES PPC_ALTIVEC_SOURCES API_MAJOR API_MINOR STATIC_LIB PRE_SHARED_LIB SHARED_LIB ALTIVEC_CFLAGS LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -781,7 +781,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.2.2 to adapt to many kinds of systems.
+\`configure' configures Xvid 1.3.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -843,7 +843,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Xvid 1.2.2:";;
+     short | recursive ) echo "Configuration of Xvid 1.3.0:";;
    esac
   cat <<\_ACEOF
 
@@ -964,7 +964,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-Xvid configure 1.2.2
+Xvid configure 1.3.0
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -978,7 +978,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.2.2, which was
+It was created by Xvid $as_me 1.3.0, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1317,9 +1317,9 @@
 
 
 API_MAJOR="4"
-API_MINOR="2"
+API_MINOR="3"
 
-minimum_yasm_minor_version=8
+minimum_yasm_major_version=1
 minimum_nasm_minor_version=0
 minimum_nasm_major_version=2
 nasm_prog="nasm"
@@ -2602,6 +2602,86 @@
   RANLIB="$ac_cv_prog_RANLIB"
 fi
 
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ar; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_AR+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AR="${ac_tool_prefix}ar"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  echo "$as_me:$LINENO: result: $AR" >&5
+echo "${ECHO_T}$AR" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_prog_AR"; then
+  ac_ct_AR=$AR
+  # Extract the first word of "ar", so it can be a program name with args.
+set dummy ar; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_AR="ar"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="ar-not-found"
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+  echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+echo "${ECHO_T}$ac_ct_AR" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  AR=$ac_ct_AR
+else
+  AR="$ac_cv_prog_AR"
+fi
+
 
 
 
@@ -3843,6 +3923,7 @@
 echo $ECHO_N "checking for platform specific LDFLAGS/CFLAGS... $ECHO_C" >&6
 SPECIFIC_LDFLAGS=""
 SPECIFIC_CFLAGS=""
+ALTIVEC_CFLAGS=""
 PRE_SHARED_LIB=""
 case "$target_os" in
      linux*|solaris*)
@@ -3977,14 +4058,14 @@
    if test "$ac_yasm" = "yes" ; then
                             echo "$as_me:$LINENO: checking for yasm version" >&5
 echo $ECHO_N "checking for yasm version... $ECHO_C" >&6
-       yasm_minor=`$yasm_prog --version | cut -d '.' -f 2 | cut -d ' ' -f 1`
-       if test -z $yasm_minor ; then
-          yasm_minor=-1
+       yasm_major=`$yasm_prog --version | head -1 | cut -d '.' -f 1 | cut -d ' ' -f 2`
+       if test -z $yasm_major ; then
+          yasm_major=-1
        fi
-       echo "$as_me:$LINENO: result: $yasm_minor" >&5
-echo "${ECHO_T}$yasm_minor" >&6
+       echo "$as_me:$LINENO: result: $yasm_major" >&5
+echo "${ECHO_T}$yasm_major" >&6
 
-                     if test "$yasm_minor" -lt "$minimum_yasm_minor_version" ; then
+                     if test "$yasm_major" -lt "$minimum_yasm_major_version" ; then
          { echo "$as_me:$LINENO: WARNING: yasm version is too old" >&5
 echo "$as_me: WARNING: yasm version is too old" >&2;}
        else
@@ -4102,9 +4183,15 @@
 	       MARK_FUNCS=""
                ;;
            *darwin*)
-               echo "$as_me:$LINENO: result: macho" >&5
-echo "${ECHO_T}macho" >&6
-               NASM_FORMAT="macho"
+               if test "$ARCHITECTURE" = "X86_64" ; then

xvidcore-1.2.2.tar.bz2/build/generic/configure.in -> xvidcore-1.3.0.tar.bz2/build/generic/configure.in Changed

@@ -8,15 +8,15 @@
 
 AC_PREREQ([2.50])
 
-AC_INIT([Xvid], [1.2.2], [xvid-devel@xvid.org])
+AC_INIT([Xvid], [1.3.0], [xvid-devel@xvid.org])
 AC_CONFIG_SRCDIR(configure.in)
 
 dnl Do not forget to increase that when needed.
 API_MAJOR="4"
-API_MINOR="2"
+API_MINOR="3"
 
 dnl NASM/YASM version requirement
-minimum_yasm_minor_version=8
+minimum_yasm_major_version=1
 minimum_nasm_minor_version=0
 minimum_nasm_major_version=2
 nasm_prog="nasm"
@@ -128,6 +128,7 @@
 dnl ==========================================================================
 
 AC_PROG_RANLIB
+AC_CHECK_TOOL([AR], [ar], [ar-not-found])
 
 dnl ==========================================================================
 dnl
@@ -264,6 +265,7 @@
 AC_MSG_CHECKING(for platform specific LDFLAGS/CFLAGS)
 SPECIFIC_LDFLAGS=""
 SPECIFIC_CFLAGS=""
+ALTIVEC_CFLAGS=""
 PRE_SHARED_LIB=""
 case "$target_os" in
      linux*|solaris*)
@@ -354,15 +356,15 @@
        dnl Checking yasm version
        dnl
        AC_MSG_CHECKING([for yasm version])
-       yasm_minor=`$yasm_prog --version | cut -d '.' -f 2 | cut -d ' ' -f 1`
-       if test -z $yasm_minor ; then
-          yasm_minor=-1
+       yasm_major=`$yasm_prog --version | head -1 | cut -d '.' -f 1 | cut -d ' ' -f 2`
+       if test -z $yasm_major ; then
+          yasm_major=-1
        fi
-       AC_MSG_RESULT([$yasm_minor])
+       AC_MSG_RESULT([$yasm_major])
 
        dnl Actually, yasm >= 0.7.99.2161 should be ok
        dnl But I'm too lazy to check also the patch version...
-       if test "$yasm_minor" -lt "$minimum_yasm_minor_version" ; then
+       if test "$yasm_major" -lt "$minimum_yasm_major_version" ; then
          AC_MSG_WARN([yasm version is too old])
        else
          found_nasm_comp_prog="yes"
@@ -427,8 +429,13 @@
 	       MARK_FUNCS=""
                ;;
            *darwin*)
-               AC_MSG_RESULT([macho])
-               NASM_FORMAT="macho"
+               if test "$ARCHITECTURE" = "X86_64" ; then
+                   AC_MSG_RESULT([macho64])
+                   NASM_FORMAT="macho64"
+               else
+                   AC_MSG_RESULT([macho32])
+                   NASM_FORMAT="macho32"
+               fi
                PREFIX="-DPREFIX"
                MARK_FUNCS=""
                ;;
@@ -455,7 +462,7 @@
 dnl and GNU gcc with very slight changes to code which can be sumed up by:
 dnl
 dnl Apple:
-dnl  - compile with the option -arch ppc -faltivec
+dnl  - compile with the option -arch ppc -faltivec 
 dnl  - define vectors with parentheses vec = (0,0,0,0)
 dnl GNU
 dnl  - compile with -maltivec -mabi=altivec
@@ -524,8 +531,9 @@
 EOF
    if $CC $TEMP_ALTIVEC -maltivec -mabi=altivec -c conftest.c 2>/dev/null 1>/dev/null ; then
         AC_MSG_RESULT([yes (GNU)])
-        SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -maltivec -mabi=altivec -DHAVE_ALTIVEC_BRACES_DECL $TEMP_ALTIVEC"
+        SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -DHAVE_ALTIVEC_BRACES_DECL $TEMP_ALTIVEC"
 	PPC_ALTIVEC_SOURCES="SRC_PPC_ALTIVEC"
+        ALTIVEC_CFLAGS="-maltivec -mabi=altivec"
    else
 	AC_MSG_RESULT([no (ppc support won't be compiled in)])
 	dnl Only C code can be compiled :-(
@@ -589,12 +597,8 @@
 	AC_CHECK_LIB(
 		pthread,
 		pthread_create,
-		AC_CHECK_LIB(
-			pthread,
-			pthread_join,
-			SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -DHAVE_PTHREAD"
-			SPECIFIC_LDFLAGS="$SPECIFIC_LDFLAGS -lpthread",
-			AC_MSG_WARN(Pthread not supported. No SMP support)),
+		SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -DHAVE_PTHREAD"
+		SPECIFIC_LDFLAGS="$SPECIFIC_LDFLAGS -lpthread",
 		AC_MSG_WARN(Pthread not supported. No SMP support)),
 	AC_MSG_WARN(Pthread not supported. No SMP support))
 
@@ -691,11 +695,13 @@
 AC_SUBST(DCT_IA64_SOURCES)
 AC_SUBST(PPC_ALTIVEC_SOURCES)
 AC_SUBST(RANLIB)
+AC_SUBST(AR)
 AC_SUBST(API_MAJOR)
 AC_SUBST(API_MINOR)
 AC_SUBST(STATIC_LIB)
 AC_SUBST(PRE_SHARED_LIB)
 AC_SUBST(SHARED_LIB)
+AC_SUBST(ALTIVEC_CFLAGS)
 
 dnl ==========================================================================
 dnl

xvidcore-1.2.2.tar.bz2/build/generic/libxvidcore.def -> xvidcore-1.3.0.tar.bz2/build/generic/libxvidcore.def Changed

xvidcore-1.2.2.tar.bz2/build/generic/libxvidcore.ld -> xvidcore-1.3.0.tar.bz2/build/generic/libxvidcore.ld Changed

xvidcore-1.2.2.tar.bz2/build/generic/platform.inc.in -> xvidcore-1.3.0.tar.bz2/build/generic/platform.inc.in Changed

xvidcore-1.2.2.tar.bz2/build/generic/sources.inc -> xvidcore-1.3.0.tar.bz2/build/generic/sources.inc Changed

xvidcore-1.2.2.tar.bz2/build/win32/libxvidcore.sln -> xvidcore-1.3.0.tar.bz2/build/win32/libxvidcore.sln Changed

xvidcore-1.2.2.tar.bz2/build/win32/libxvidcore.vcproj -> xvidcore-1.3.0.tar.bz2/build/win32/libxvidcore.vcproj Changed

@@ -51,7 +51,7 @@
 				AdditionalOptions="/Qipo "
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="NDEBUG;ARCH_IS_IA32;WIN32;_WINDOWS;ARCH_IS_32BIT"
+				PreprocessorDefinitions="NDEBUG;ARCH_IS_IA32;WIN32;_WINDOWS;ARCH_IS_32BIT;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
@@ -147,7 +147,7 @@
 				AdditionalOptions="/Qipo "
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="NDEBUG;ARCH_IS_X86_64;WIN32;_WINDOWS;ARCH_IS_64BIT"
+				PreprocessorDefinitions="NDEBUG;ARCH_IS_X86_64;WIN32;_WINDOWS;ARCH_IS_64BIT;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
@@ -241,7 +241,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;ARCH_IS_32BIT;ARCH_IS_IA32"
+				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;ARCH_IS_32BIT;ARCH_IS_IA32;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -337,7 +337,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;ARCH_IS_64BIT;ARCH_IS_X86_64"
+				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;ARCH_IS_64BIT;ARCH_IS_X86_64;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -3455,6 +3455,10 @@
 					/>
 				</FileConfiguration>
 			</File>
+ 			<File
+				RelativePath="..\..\src\plugins\plugin_psnrhvsm.c"
+			>
+			</File>
 			<File
 				RelativePath="..\..\src\plugins\plugin_psnr.c"
 				>

xvidcore-1.2.2.tar.bz2/build/win32/xvid_decraw.vcproj -> xvidcore-1.3.0.tar.bz2/build/win32/xvid_decraw.vcproj Changed

@@ -48,7 +48,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\\..\\src"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;ARCH_IS_LITTLE_ENDIAN"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;ARCH_IS_LITTLE_ENDIAN;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
@@ -141,7 +141,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\\..\\src"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;ARCH_IS_LITTLE_ENDIAN"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;ARCH_IS_LITTLE_ENDIAN;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
@@ -232,7 +232,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\\..\\src"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;ARCH_IS_LITTLE_ENDIAN"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;ARCH_IS_LITTLE_ENDIAN;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -326,7 +326,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\\..\\src"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;ARCH_IS_LITTLE_ENDIAN"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;ARCH_IS_LITTLE_ENDIAN;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"

xvidcore-1.2.2.tar.bz2/build/win32/xvid_encraw.vcproj -> xvidcore-1.3.0.tar.bz2/build/win32/xvid_encraw.vcproj Changed

@@ -47,7 +47,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\\..\\src"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;ARCH_IS_LITTLE_ENDIAN"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;ARCH_IS_LITTLE_ENDIAN;ARCH_IS_32BIT;ARCH_IS_IA32;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -141,7 +141,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\\..\\src"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;ARCH_IS_LITTLE_ENDIAN"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;ARCH_IS_LITTLE_ENDIAN;ARCH_IS_64BIT;ARCH_IS_X86_64;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -235,7 +235,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\\..\\src"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;ARCH_IS_LITTLE_ENDIAN"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;ARCH_IS_LITTLE_ENDIAN;ARCH_IS_32BIT;ARCH_IS_IA32;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
@@ -328,7 +328,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\\..\\src"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;ARCH_IS_LITTLE_ENDIAN"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;ARCH_IS_LITTLE_ENDIAN;ARCH_IS_64BIT;ARCH_IS_X86_64;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"

xvidcore-1.2.2.tar.bz2/debian/changelog -> xvidcore-1.3.0.tar.bz2/debian/changelog Changed

xvidcore-1.2.2.tar.bz2/debian/copyright -> xvidcore-1.3.0.tar.bz2/debian/copyright Changed

xvidcore-1.2.2.tar.bz2/doc/INSTALL -> xvidcore-1.3.0.tar.bz2/doc/INSTALL Changed

@@ -31,7 +31,7 @@
    - make (GNU make, BSD make, Solaris make)
    - a C library providing ANSI C functions like malloc/free/realloc
      and some other standard functions.
-   - nasm on ia32 platforms for MMX/SSE optimized code.
+   - yasm or nasm on ia32/x86_64 platforms for MMX/SSE optimized code.
 
  
   1.b/ How to build from a release tarball
@@ -175,7 +175,7 @@
   2.a/ Requirements.
   ------------------
 
-    - MS VisualDev 6 Processor Pack 5 or MS VisualDev 7
+    - MS Visual C++ 2005 or later
     - nasm installed as 'nasm' in the msvc binary search paths.
 
   2.b/ How to build the VFW frontend from a release tarball.
@@ -184,14 +184,16 @@
 Download the latest source distribution from http://www.xvid.org/ and
 uncompress it on your disk. Let's call this directory ${xvidcore}.
 
-    - Open the workspace xvidcore.dsw located in
+    - Make sure your ${xvidcore} directory name does not contain spaces.
+      MS Visual C++ can have issues handling file names with whitespace.
+    - Open the workspace libxvidcore.sln located in
       ${xvidcore}/build/win32.
     - Then choose the libxvidcore project as the Active project of the
       workspace.
     - Make sure the Active configuration is
       'libxvidcore Win32 Release'
     - Build the project (F7)
-    - Open the project vfw.dsp file located in ${xvidcore}/vfw.
+    - Open the project vfw.vcproj file located in ${xvidcore}/vfw.
     - Make sure the Active configuration is
       'vfw Win32 Release'
     - Build the project (F7)
@@ -202,7 +204,7 @@
   2.c/ How to build from CVS.
   ---------------------------
 
-You have first to retrieve the sources from the xvid CVS repository
+You have first to retrieve the sources from the Xvid CVS repository
 using a tool like WinCVS. Then follow the normal steps explained in
 the previous section.
 
@@ -213,4 +215,4 @@
     opening the .dsp file in WordPad and saving it. It should now be
     in cr/lf format.
 
-Last edited: $Date: 2004/03/22 22:36:23 $
+Last edited: $Date: 2010/12/28 16:34:55 $

xvidcore-1.2.2.tar.bz2/doc/README -> xvidcore-1.3.0.tar.bz2/doc/README Changed

xvidcore-1.2.2.tar.bz2/dshow/dshow.vcproj -> xvidcore-1.3.0.tar.bz2/dshow/dshow.vcproj Changed

@@ -52,7 +52,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\src"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
@@ -77,7 +77,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="msvcrt.lib winmm.lib strmbase.lib comctl32.lib"
+				AdditionalDependencies="msvcrt.lib winmm.lib strmbase.lib comctl32.lib Shlwapi.lib mfplat.lib mfuuid.lib"
 				OutputFile="bin\xvid.ax"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -149,7 +149,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\src"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -174,7 +174,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="msvcrt.lib winmm.lib strmbasd.lib comctl32.lib"
+				AdditionalDependencies="msvcrt.lib winmm.lib strmbasd.lib comctl32.lib Shlwapi.lib mfplat.lib mfuuid.lib"
 				OutputFile="bin\xvid.ax"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -249,7 +249,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\src"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
@@ -274,7 +274,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="msvcrt.lib winmm.lib strmbase.lib comctl32.lib"
+				AdditionalDependencies="msvcrt.lib winmm.lib strmbase.lib comctl32.lib Shlwapi.lib mfplat.lib mfuuid.lib"
 				OutputFile="bin\x64\xvid.ax"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -346,7 +346,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\src"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -371,7 +371,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="msvcrt.lib winmm.lib strmbasd.lib comctl32.lib"
+				AdditionalDependencies="msvcrt.lib winmm.lib strmbasd.lib comctl32.lib Shlwapi.lib mfplat.lib mfuuid.lib"
 				OutputFile="bin\xvid.ax"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -693,6 +693,10 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath=".\src\xvid.ico"
+				>
+			</File>
+			<File
 				RelativePath="src\XviD_logo.bmp"
 				>
 			</File>

xvidcore-1.2.2.tar.bz2/dshow/src/CAbout.cpp -> xvidcore-1.3.0.tar.bz2/dshow/src/CAbout.cpp Changed

xvidcore-1.2.2.tar.bz2/dshow/src/CAbout.h -> xvidcore-1.3.0.tar.bz2/dshow/src/CAbout.h Changed

xvidcore-1.2.2.tar.bz2/dshow/src/CXvidDecoder.cpp -> xvidcore-1.3.0.tar.bz2/dshow/src/CXvidDecoder.cpp Changed

@@ -1,9 +1,10 @@
 /*****************************************************************************
  *
  *  XVID MPEG-4 VIDEO CODEC
- *  - XviD Decoder part of the DShow Filter  -
+ *  - Xvid Decoder part of the DShow Filter  -
  *
- *  Copyright(C) 2002-2004 Peter Ross <pross@xvid.org>
+ *  Copyright(C) 2002-2010 Peter Ross <pross@xvid.org>
+ *               2003-2010 Michael Militzer <michael@xvid.org>
  *
  *  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
@@ -19,15 +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,v 1.16.4.1 2009/05/28 15:52:34 Isibaar Exp $
- *
- ****************************************************************************/
-
-/****************************************************************************
- *
- * 2003/12/11 - added some additional options, mainly to make the deblocking
- *              code from xvidcore available. Most of the new code is taken
- *              from Nic's dshow filter, (C) Nic, http://nic.dnsalias.com
+ * $Id: CXvidDecoder.cpp,v 1.25.2.3 2011/02/14 16:58:54 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -43,7 +36,10 @@
 	C:\DX90SDK\Samples\C++\DirectShow\BaseClasses\Debug
 */
 
-
+/*
+#define XVID_USE_MFT
+#define XVID_USE_TRAYICON
+*/
 
 #include <windows.h>
 
@@ -55,7 +51,19 @@
 #endif
 #include <dvdmedia.h>	// VIDEOINFOHEADER2
 
-#include <xvid.h>		// XviD API
+#if defined(XVID_USE_MFT)
+#define MFT_UNIQUE_METHOD_NAMES
+#include <mftransform.h>
+#include <mfapi.h>
+#include <mferror.h>
+#include <shlwapi.h>
+#endif
+
+#include <shellapi.h>
+
+#include <xvid.h>		// Xvid API
+
+#include "resource.h"
 
 #include "IXvidDecoder.h"
 #include "CXvidDecoder.h"
@@ -81,6 +89,22 @@
 	{ &MEDIATYPE_Video, &CLSID_DIVX_UC },
 	{ &MEDIATYPE_Video, &CLSID_DX50 },
 	{ &MEDIATYPE_Video, &CLSID_DX50_UC },
+	{ &MEDIATYPE_Video, &CLSID_3IVX },
+	{ &MEDIATYPE_Video, &CLSID_3IVX_UC },
+	{ &MEDIATYPE_Video, &CLSID_3IV0 },
+	{ &MEDIATYPE_Video, &CLSID_3IV0_UC },
+	{ &MEDIATYPE_Video, &CLSID_3IV1 },
+	{ &MEDIATYPE_Video, &CLSID_3IV1_UC },
+	{ &MEDIATYPE_Video, &CLSID_3IV2 },
+	{ &MEDIATYPE_Video, &CLSID_3IV2_UC },
+	{ &MEDIATYPE_Video, &CLSID_LMP4 },
+	{ &MEDIATYPE_Video, &CLSID_LMP4_UC },
+	{ &MEDIATYPE_Video, &CLSID_RMP4 },
+	{ &MEDIATYPE_Video, &CLSID_RMP4_UC },
+	{ &MEDIATYPE_Video, &CLSID_SMP4 },
+	{ &MEDIATYPE_Video, &CLSID_SMP4_UC },
+	{ &MEDIATYPE_Video, &CLSID_HDX4 },
+	{ &MEDIATYPE_Video, &CLSID_HDX4_UC },
 	{ &MEDIATYPE_Video, &CLSID_MP4V },
   { &MEDIATYPE_Video, &CLSID_MP4V_UC },
 };
@@ -122,7 +146,7 @@
 {
 	&CLSID_XVID,			// Filter CLSID
 	XVID_NAME_L,			// Filter name
-	MERIT_PREFERRED,		// Its merit
+	MERIT_PREFERRED+2,		// Its merit
 	sizeof(psudPins) / sizeof(AMOVIESETUP_PIN),	// Number of pins
 	psudPins				// Pin details
 };
@@ -149,19 +173,98 @@
 
 };
 
-
 /* note: g_cTemplates must be global; used by strmbase.lib(dllentry.cpp,dllsetup.cpp) */
 int g_cTemplates = sizeof(g_Templates) / sizeof(CFactoryTemplate);
 
+#ifdef XVID_USE_TRAYICON
+extern HINSTANCE g_xvid_hInst;
+
+static int GUI_Page = 0;
+static int Tray_Icon = 0;
+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)
+{
+	switch ( uMsg )
+	{
+	case WM_ICONMESSAGE:
+		switch(lParam)
+		{
+		case WM_LBUTTONDBLCLK:
+			if (!GUI_Page) {
+				GUI_Page = 1;
+				Configure(hwnd, g_xvid_hInst, "", 1);
+				GUI_Page = 0;
+			}
+			break;
+		default:
+			return DefWindowProc(hwnd, uMsg, wParam, lParam);
+		};
+		break;
+
+	case WM_DESTROY:
+		NOTIFYICONDATA nid;
+		ZeroMemory(&nid,sizeof(NOTIFYICONDATA));
+
+		nid.cbSize = NOTIFYICONDATA_V1_SIZE;
+		nid.hWnd = hwnd;
+		nid.uID = 1456;
+	
+		Shell_NotifyIcon(NIM_DELETE, &nid);
+		Tray_Icon = 0;
+	default:
+		return DefWindowProc(hwnd, uMsg, wParam, lParam);
+	}
+	
+	return TRUE; /* ok */
+}
+#endif
 
 STDAPI DllRegisterServer()
 {
+#if defined(XVID_USE_MFT)
+	int inputs_num = sizeof(sudInputPinTypes) / sizeof(AMOVIESETUP_MEDIATYPE);
+	int outputs_num = sizeof(sudOutputPinTypes) / sizeof(AMOVIESETUP_MEDIATYPE);
+	MFT_REGISTER_TYPE_INFO * mft_bs = new MFT_REGISTER_TYPE_INFO[inputs_num];
+	MFT_REGISTER_TYPE_INFO * mft_csp = new MFT_REGISTER_TYPE_INFO[outputs_num];
+	
+	{
+		int i;
+		for(i=0;i<inputs_num;i++) {
+			mft_bs[i].guidMajorType = *sudInputPinTypes[i].clsMajorType;
+			mft_bs[i].guidSubtype = *sudInputPinTypes[i].clsMinorType;
+		}
+		for(i=0;i<outputs_num;i++) {
+			mft_csp[i].guidMajorType = *sudOutputPinTypes[i].clsMajorType;
+			mft_csp[i].guidSubtype = *sudOutputPinTypes[i].clsMinorType; // MFT and AM GUIDs really the same?
+		}
+	}
+	
+	/* Register the MFT decoder */
+	MFTRegister(CLSID_XVID,                          // CLSID
+		        MFT_CATEGORY_VIDEO_DECODER,          // Category
+		        const_cast<LPWSTR>(XVID_NAME_L),     // Friendly name
+		        0,                                   // Flags
+		        inputs_num,                          // Number of input types
+		        mft_bs,                              // Input types
+		        outputs_num,                         // Number of output types
+		        mft_csp,                             // Output types
+		        NULL                                 // Attributes (optional)
+		        );
+
+	delete[] mft_bs;
+	delete[] mft_csp;
+#endif /* XVID_USE_MFT */
+
     return AMovieDllRegisterServer2( TRUE );
 }
 
 
 STDAPI DllUnregisterServer()
 {
+#if defined(XVID_USE_MFT)
+	MFTUnregister(CLSID_XVID);
+#endif
     return AMovieDllRegisterServer2( FALSE );
 }
 
@@ -195,6 +298,13 @@
         return GetInterface((ISpecifyPropertyPages *) this, ppv); 
 	} 
 
+#if defined(XVID_USE_MFT)

xvidcore-1.2.2.tar.bz2/dshow/src/CXvidDecoder.h -> xvidcore-1.3.0.tar.bz2/dshow/src/CXvidDecoder.h Changed

@@ -3,7 +3,7 @@
  *  XVID MPEG-4 VIDEO CODEC
  *  - XviD Decoder part of the DShow Filter  -
  *
- *  Copyright(C) 2002-2003 Peter Ross <pross@xvid.org>
+ *  Copyright(C) 2002-2010 Peter Ross <pross@xvid.org>
  *
  *  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
@@ -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: CXvidDecoder.h,v 1.7 2008/11/26 10:11:31 Isibaar Exp $
+ * $Id: CXvidDecoder.h,v 1.9.2.1 2011/02/14 16:58:54 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -29,16 +29,34 @@
 #include <xvid.h>
 #include "IXvidDecoder.h"
 
-
 #define XVID_NAME_L		L"Xvid MPEG-4 Video Decoder"
 
 /* --- fourcc --- */
 
 #define FOURCC_XVID	mmioFOURCC('X','V','I','D')
+#define FOURCC_xvid	mmioFOURCC('x','v','i','d')
 #define FOURCC_DIVX	mmioFOURCC('D','I','V','X')
+#define FOURCC_divx	mmioFOURCC('d','i','v','x')
 #define FOURCC_DX50	mmioFOURCC('D','X','5','0')
+#define FOURCC_dx50	mmioFOURCC('d','x','5','0')
 #define FOURCC_MP4V	mmioFOURCC('M','P','4','V')
 #define FOURCC_mp4v	mmioFOURCC('m','p','4','v')
+#define FOURCC_3IVX	mmioFOURCC('3','I','V','X')
+#define FOURCC_3ivx	mmioFOURCC('3','i','v','x')
+#define FOURCC_3IV0	mmioFOURCC('3','I','V','0')
+#define FOURCC_3iv0	mmioFOURCC('3','i','v','0')
+#define FOURCC_3IV1	mmioFOURCC('3','I','V','1')
+#define FOURCC_3iv1	mmioFOURCC('3','i','v','1')
+#define FOURCC_3IV2	mmioFOURCC('3','I','V','2')
+#define FOURCC_3iv2	mmioFOURCC('3','i','v','2')
+#define FOURCC_LMP4	mmioFOURCC('L','M','P','4')
+#define FOURCC_lmp4	mmioFOURCC('l','m','p','4')
+#define FOURCC_RMP4	mmioFOURCC('R','M','P','4')
+#define FOURCC_rmp4	mmioFOURCC('r','m','p','4')
+#define FOURCC_SMP4	mmioFOURCC('S','M','P','4')
+#define FOURCC_smp4	mmioFOURCC('s','m','p','4')
+#define FOURCC_HDX4	mmioFOURCC('H','D','X','4')
+#define FOURCC_hdx4	mmioFOURCC('h','d','x','4')
 
 /* --- media uids --- */
 
@@ -48,6 +66,22 @@
 DEFINE_GUID(CLSID_DIVX_UC,	mmioFOURCC('D','I','V','X'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
 DEFINE_GUID(CLSID_DX50,		mmioFOURCC('d','x','5','0'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
 DEFINE_GUID(CLSID_DX50_UC,	mmioFOURCC('D','X','5','0'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+DEFINE_GUID(CLSID_3IVX,		mmioFOURCC('3','i','v','x'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+DEFINE_GUID(CLSID_3IVX_UC,	mmioFOURCC('3','I','V','X'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+DEFINE_GUID(CLSID_3IV0,		mmioFOURCC('3','i','v','0'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+DEFINE_GUID(CLSID_3IV0_UC,	mmioFOURCC('3','I','V','0'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+DEFINE_GUID(CLSID_3IV1,		mmioFOURCC('3','i','v','1'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+DEFINE_GUID(CLSID_3IV1_UC,	mmioFOURCC('3','I','V','1'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+DEFINE_GUID(CLSID_3IV2,		mmioFOURCC('3','i','v','2'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+DEFINE_GUID(CLSID_3IV2_UC,	mmioFOURCC('3','I','V','2'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+DEFINE_GUID(CLSID_LMP4,		mmioFOURCC('l','m','p','4'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+DEFINE_GUID(CLSID_LMP4_UC,	mmioFOURCC('L','M','P','4'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+DEFINE_GUID(CLSID_RMP4,		mmioFOURCC('r','m','p','4'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+DEFINE_GUID(CLSID_RMP4_UC,	mmioFOURCC('R','M','P','4'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+DEFINE_GUID(CLSID_SMP4,		mmioFOURCC('s','m','p','4'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+DEFINE_GUID(CLSID_SMP4_UC,	mmioFOURCC('S','M','P','4'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+DEFINE_GUID(CLSID_HDX4,		mmioFOURCC('h','d','x','4'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+DEFINE_GUID(CLSID_HDX4_UC,	mmioFOURCC('H','D','X','4'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
 DEFINE_GUID(CLSID_MP4V,		mmioFOURCC('m','p','4','v'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
 DEFINE_GUID(CLSID_MP4V_UC,		mmioFOURCC('M','P','4','V'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
 
@@ -56,7 +90,13 @@
 DEFINE_GUID(CLSID_MEDIASUBTYPE_IYUV, 0x56555949, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
 
 
-class CXvidDecoder : public CVideoTransformFilter, public IXvidDecoder, public ISpecifyPropertyPages
+class CXvidDecoder : 
+	public CVideoTransformFilter, 
+	public IXvidDecoder, 
+	public ISpecifyPropertyPages
+#if defined(XVID_USE_MFT)
+    ,public IMFTransform
+#endif
 {
 
 public :
@@ -68,6 +108,9 @@
 	CXvidDecoder(LPUNKNOWN punk, HRESULT *phr);
 	~CXvidDecoder();
 
+	HRESULT CompleteConnect(PIN_DIRECTION direction, IPin *pReceivePin);
+	HRESULT BreakConnect(PIN_DIRECTION dir);
+
 	HRESULT CheckInputType(const CMediaType * mtIn);
 	HRESULT GetMediaType(int iPos, CMediaType * pmt);
 	HRESULT SetMediaType(PIN_DIRECTION direction, const CMediaType *pmt);
@@ -80,6 +123,34 @@
 	STDMETHODIMP GetPages(CAUUID * pPages);
 	STDMETHODIMP FreePages(CAUUID * pPages);
 
+  /* IMFTransform */
+#if defined(XVID_USE_MFT) 
+	STDMETHODIMP MFTGetStreamLimits(DWORD *pdwInputMinimum, DWORD *pdwInputMaximum, DWORD *pdwOutputMinimum, DWORD *pdwOutputMaximum);
+	STDMETHODIMP MFTGetStreamCount(DWORD *pcInputStreams, DWORD *pcOutputStreams);
+	STDMETHODIMP MFTGetStreamIDs(DWORD dwInputIDArraySize, DWORD *pdwInputIDs, DWORD dwOutputIDArraySize, DWORD *pdwOutputIDs);
+	STDMETHODIMP MFTGetInputStreamInfo(DWORD dwInputStreamID, MFT_INPUT_STREAM_INFO *pStreamInfo);
+	STDMETHODIMP MFTGetOutputStreamInfo(DWORD dwOutputStreamID, MFT_OUTPUT_STREAM_INFO *pStreamInfo);
+	STDMETHODIMP GetAttributes(IMFAttributes** pAttributes);
+	STDMETHODIMP GetInputStreamAttributes(DWORD dwInputStreamID, IMFAttributes **ppAttributes);
+	STDMETHODIMP GetOutputStreamAttributes(DWORD dwOutputStreamID, IMFAttributes **ppAttributes);
+	STDMETHODIMP MFTDeleteInputStream(DWORD dwStreamID);
+	STDMETHODIMP MFTAddInputStreams(DWORD cStreams, DWORD *adwStreamIDs);
+	STDMETHODIMP MFTGetInputAvailableType(DWORD dwInputStreamID, DWORD dwTypeIndex, IMFMediaType **ppType);
+	STDMETHODIMP MFTGetOutputAvailableType(DWORD dwOutputStreamID, DWORD dwTypeIndex, IMFMediaType **ppType);
+	STDMETHODIMP MFTSetInputType(DWORD dwInputStreamID, IMFMediaType *pType, DWORD dwFlags);
+	STDMETHODIMP MFTSetOutputType(DWORD dwOutputStreamID, IMFMediaType *pType, DWORD dwFlags);
+	STDMETHODIMP MFTGetInputCurrentType(DWORD dwInputStreamID, IMFMediaType **ppType);
+	STDMETHODIMP MFTGetOutputCurrentType(DWORD dwOutputStreamID, IMFMediaType **ppType);
+	STDMETHODIMP MFTGetInputStatus(DWORD dwInputStreamID, DWORD *pdwFlags);
+	STDMETHODIMP MFTGetOutputStatus(DWORD *pdwFlags);
+	STDMETHODIMP MFTSetOutputBounds(LONGLONG hnsLowerBound, LONGLONG hnsUpperBound);
+	STDMETHODIMP MFTProcessEvent(DWORD dwInputStreamID, IMFMediaEvent *pEvent);
+	STDMETHODIMP MFTProcessMessage(MFT_MESSAGE_TYPE eMessage, ULONG_PTR ulParam);
+
+	STDMETHODIMP MFTProcessInput(DWORD dwInputStreamID, IMFSample *pSample, DWORD dwFlags);
+	STDMETHODIMP MFTProcessOutput(DWORD dwFlags, DWORD cOutputBufferCount, MFT_OUTPUT_DATA_BUFFER *pOutputSamples, DWORD *pdwStatus);
+#endif  /* XVID_USE_MFT */
+
 private :
 
 	HRESULT ChangeColorspace(GUID subtype, GUID formattype, void * format);
@@ -96,8 +167,39 @@
 	bool forced_ar;
 
 	int rgb_flip;
+	int out_stride;
+
+	/* mft stuff */
+#if defined(XVID_USE_MFT)
+	BOOL HasPendingOutput() const { return m_frame.output.plane[1] != NULL; }
+
+	HRESULT OnSetInputType(IMFMediaType *pmt);
+	HRESULT OnCheckInputType(IMFMediaType *pmt);
+
+	HRESULT OnSetOutputType(IMFMediaType *pmt);
 
+	IMFMediaType *m_pInputType;
+	IMFMediaType *m_pOutputType;
+
+	CRITICAL_SECTION m_mft_lock;
+	REFERENCE_TIME m_timestamp;
+	REFERENCE_TIME m_timelength;
+
+	int m_discont;
+
+	/* Used to construct or interpolate missing timestamps */
+	REFERENCE_TIME m_rtFrame;
+	MFRatio m_frameRate;
+	UINT64 m_duration;
+#endif
+
+#ifdef XVID_USE_TRAYICON
+	HWND MSG_hwnd; /* message handler window */
+};
+#define WM_ICONMESSAGE (WM_USER + 1)
+#else
 };
+#endif
 
 static const int PARS[][2] = {
 	{1, 1},
@@ -108,5 +210,4 @@
 	{0, 0},
 };
 
-
 #endif /* _FILTER_H_ */

xvidcore-1.2.2.tar.bz2/dshow/src/Configure.cpp -> xvidcore-1.3.0.tar.bz2/dshow/src/Configure.cpp Changed

xvidcore-1.2.2.tar.bz2/dshow/src/config.c -> xvidcore-1.3.0.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,v 1.9.2.1 2008/11/30 16:38:31 Isibaar Exp $
+ * $Id: config.c,v 1.12.2.1 2011/02/14 16:58:54 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -54,6 +54,8 @@
 	REG_GET_N("Supported_4CC",  g_config.supported_4cc, 0)
 	REG_GET_N("Videoinfo_Compat",  g_config.videoinfo_compat, 0)
 	REG_GET_N("Decoder_Aspect_Ratio",  g_config.aspect_ratio, 0)
+	REG_GET_N("num_threads",  g_config.num_threads, 0)
+	REG_GET_N("cpu_flags", g_config.cpu, 0)
 
 	RegCloseKey(hKey);
 }
@@ -89,6 +91,7 @@
 	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);
 
 	RegCloseKey(hKey);
 }
@@ -141,7 +144,7 @@
 		SendMessage(hBrightness, TBM_SETPOS, (WPARAM)TRUE, (LPARAM) g_config.nBrightness);
 
 		// Load Aspect Ratio Box
-		SendMessage(GetDlgItem(hwnd, IDC_USE_AR), CB_ADDSTRING, 0, (LPARAM)"Auto (mpeg-4 first)"); 
+		SendMessage(GetDlgItem(hwnd, IDC_USE_AR), CB_ADDSTRING, 0, (LPARAM)"Auto (MPEG-4 first)"); 
 		SendMessage(GetDlgItem(hwnd, IDC_USE_AR), CB_ADDSTRING, 0, (LPARAM)"Auto (external first)"); 
 		SendMessage(GetDlgItem(hwnd, IDC_USE_AR), CB_ADDSTRING, 0, (LPARAM)"4:3"); 
 		SendMessage(GetDlgItem(hwnd, IDC_USE_AR), CB_ADDSTRING, 0, (LPARAM)"16:9"); 
@@ -161,7 +164,7 @@
 
 		// 4CC checkbuttons
 		SendMessage(GetDlgItem(hwnd, IDC_DIVX), BM_SETCHECK, g_config.supported_4cc & SUPPORT_DIVX, 0);
-		SendMessage(GetDlgItem(hwnd, IDC_DX50), BM_SETCHECK, g_config.supported_4cc & SUPPORT_DX50, 0);
+		SendMessage(GetDlgItem(hwnd, IDC_3IVX), BM_SETCHECK, g_config.supported_4cc & SUPPORT_3IVX, 0);
 		SendMessage(GetDlgItem(hwnd, IDC_MP4V), BM_SETCHECK, g_config.supported_4cc & SUPPORT_MP4V, 0);
 		SendMessage(GetDlgItem(hwnd, IDC_COMPAT), BM_SETCHECK, g_config.videoinfo_compat, 0);
 
@@ -214,8 +217,8 @@
 		case IDC_DIVX:
 			g_config.supported_4cc ^= SUPPORT_DIVX;
 			break;
-		case IDC_DX50:
-			g_config.supported_4cc ^= SUPPORT_DX50;
+		case IDC_3IVX:
+			g_config.supported_4cc ^= SUPPORT_3IVX;
 			break;
 		case IDC_MP4V:
 			g_config.supported_4cc ^= SUPPORT_MP4V;

xvidcore-1.2.2.tar.bz2/dshow/src/config.h -> xvidcore-1.3.0.tar.bz2/dshow/src/config.h Changed

xvidcore-1.2.2.tar.bz2/dshow/src/debug.c -> xvidcore-1.3.0.tar.bz2/dshow/src/debug.c Changed

xvidcore-1.2.2.tar.bz2/dshow/src/resource.h -> xvidcore-1.3.0.tar.bz2/dshow/src/resource.h Changed

@@ -9,6 +9,7 @@
 #define VERSION_RES_MAJOR_VER           8
 #define IDD_ABOUT                       102
 #define IDB_LOGO                        103
+#define IDI_ICON                        104
 #define IDC_BRIGHTNESS                  1002
 #define IDC_DEBLOCK_UV                  1003
 #define IDC_DEBLOCK_Y                   1004
@@ -21,7 +22,7 @@
 #define IDC_DIVX                        1010
 #define IDC_COMPAT                      1011
 #define IDC_MP4V                        1012
-#define IDC_DX50                        1013
+#define IDC_3IVX                        1013
 #define IDC_DERINGUV                    1014
 #define IDC_USE_AR                      1015
 #define VERSION_RES_LANGUAGE            0x409
@@ -32,7 +33,7 @@
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        105
+#define _APS_NEXT_RESOURCE_VALUE        106
 #define _APS_NEXT_COMMAND_VALUE         40001
 #define _APS_NEXT_CONTROL_VALUE         1016
 #define _APS_NEXT_SYMED_VALUE           101

xvidcore-1.2.2.tar.bz2/dshow/src/xvid.ax.rc -> xvidcore-1.3.0.tar.bz2/dshow/src/xvid.ax.rc Changed

@@ -34,7 +34,7 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         IDB_LOGO,IDC_STATIC,"Static",SS_BITMAP,36,7,142,29
-    CTEXT           "XVID MPEG-4 VIDEO CODEC",IDC_STATIC,36,34,142,15,
+    CTEXT           "Xvid MPEG-4 Video Codec",IDC_STATIC,36,34,142,15,
                     SS_CENTERIMAGE | SS_SUNKEN
     GROUPBOX        "Brightness",IDC_STATIC,7,54,202,39
     CONTROL         "Slider1",IDC_BRIGHTNESS,"msctls_trackbar32",
@@ -49,7 +49,7 @@
     CONTROL         "Film Effect",IDC_FILMEFFECT,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,158,109,47,10
     GROUPBOX        "Output",IDC_STATIC,7,141,202,43
-    CONTROL         "Flip video",IDC_FLIPVIDEO,"Button",BS_AUTOCHECKBOX | 
+    CONTROL         "Flip Video",IDC_FLIPVIDEO,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,23,154,46,10
     CONTROL         "Compatibility Renderer",IDC_COMPAT,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,23,167,88,12
@@ -57,10 +57,10 @@
                     WS_VSCROLL | WS_TABSTOP
     CONTROL         "DIVX",IDC_DIVX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,21,
                     198,47,13
-    CONTROL         "DX50",IDC_DX50,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,
+    CONTROL         "3IVX",IDC_3IVX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,
                     198,43,13
-    GROUPBOX        "FourCC support",IDC_STATIC,7,187,202,29
-    CONTROL         "mp4v",IDC_MP4V,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
+    GROUPBOX        "Other MPEG-4 video support",IDC_STATIC,7,187,202,29
+    CONTROL         "Other",IDC_MP4V,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
                     160,198,38,13
     PUSHBUTTON      "Reset",IDC_RESET,79,252,50,12
     LTEXT           "Output Colourspace",IDC_STATIC,136,151,67,9
@@ -81,6 +81,15 @@
 
 IDB_LOGO                BITMAP  DISCARDABLE     "XviD_logo.bmp"
 
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON                ICON    DISCARDABLE     "xvid.ico"
+
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
 //

xvidcore-1.3.0.tar.bz2/dshow/src/xvid.ico Added

xvidcore-1.2.2.tar.bz2/examples/README -> xvidcore-1.3.0.tar.bz2/examples/README Changed

xvidcore-1.2.2.tar.bz2/examples/xvid_bench.c -> xvidcore-1.3.0.tar.bz2/examples/xvid_bench.c Changed

xvidcore-1.2.2.tar.bz2/examples/xvid_decraw.c -> xvidcore-1.3.0.tar.bz2/examples/xvid_decraw.c 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: xvid_decraw.c,v 1.24 2006/02/15 19:16:39 Isibaar Exp $
+ * $Id: xvid_decraw.c,v 1.28.2.1 2010/12/28 19:19:57 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -56,6 +56,7 @@
 
 #define USE_PNM 0
 #define USE_TGA 1
+#define USE_YUV 2
 
 static int XDIM = 0;
 static int YDIM = 0;
@@ -65,6 +66,8 @@
 static int CSP = XVID_CSP_I420;
 static int BPP = 1;
 static int FORMAT = USE_PNM;
+static int POSTPROC = 0;
+static 	int ARG_THREADS = 0;
 
 static char filepath[256] = "./";
 static void *dec_handle = NULL;
@@ -87,9 +90,10 @@
 					xvid_dec_stats_t *xvid_dec_stats);
 static int dec_stop();
 static void usage();
-static int write_image(char *prefix, unsigned char *image);
+static int write_image(char *prefix, unsigned char *image, int filenr);
 static int write_pnm(char *filename, unsigned char *image);
 static int write_tga(char *filename, unsigned char *image);
+static int write_yuv(char *filename, unsigned char *image);
 
 const char * type2str(int type)
 {
@@ -120,7 +124,7 @@
 	long totalsize;
 	int status;
   
-	int use_assembler = 0;
+	int use_assembler = 1;
 	int debug_level = 0;
   
 	char filename[256];
@@ -130,7 +134,7 @@
 	int i;
 
 	printf("xvid_decraw - raw mpeg4 bitstream decoder ");
-	printf("written by Christoph Lampert 2002-2003\n\n");
+	printf("written by Christoph Lampert\n\n");
 
 /*****************************************************************************
  * Command line parsing
@@ -138,8 +142,8 @@
 
 	for (i=1; i< argc; i++) {
  
-		if (strcmp("-asm", argv[i]) == 0 ) {
-			use_assembler = 1;
+		if (strcmp("-noasm", argv[i]) == 0 ) {
+			use_assembler = 0;
 		} else if (strcmp("-debug", argv[i]) == 0 && i < argc - 1 ) {
 			i++;
 			if (sscanf(argv[i], "0x%x", &debug_level) != 1) {
@@ -170,13 +174,23 @@
 				CSP = XVID_CSP_I420;
 				BPP = 1;
 			}
+		} else if (strcmp("-postproc", argv[i]) == 0 && i < argc - 1 ) {
+			i++;
+			POSTPROC = atoi(argv[i]);
+			if (POSTPROC < 0) POSTPROC = 0;
+			if (POSTPROC > 2) POSTPROC = 2;
 		} else if (strcmp("-f", argv[i]) == 0 && i < argc -1) {
 			i++;
 			if (strcmp(argv[i], "tga") == 0) {
 				FORMAT = USE_TGA;
+			} else if (strcmp(argv[i], "yuv") == 0) {
+				FORMAT = USE_YUV;
 			} else {
 				FORMAT = USE_PNM;
 			}
+		} else if (strcmp("-threads", argv[i]) == 0 && i < argc -1) {
+			i++;
+			ARG_THREADS = atoi(argv[i]);
 		} else if (strcmp("-help", argv[i]) == 0) {
 			usage();
 			return(0);
@@ -212,6 +226,9 @@
 	if (BPP != 1 && BPP != 3 && FORMAT == USE_PNM) {
 		FORMAT = USE_TGA;
 	}
+	if (BPP != 1 && FORMAT == USE_YUV) {
+		FORMAT = USE_TGA;
+	}
 
 /*****************************************************************************
  *        Memory allocation
@@ -224,7 +241,7 @@
 		goto free_all_memory;	
     
 /*****************************************************************************
- *        XviD PART  Start
+ *        Xvid PART  Start
  ****************************************************************************/
 
 	status = dec_init(use_assembler, debug_level);
@@ -240,7 +257,7 @@
  ****************************************************************************/
 
 	/* Fill the buffer */
-	useful_bytes = fread(mp4_buffer, 1, BUFFER_SIZE, in_file);
+	useful_bytes = (int) fread(mp4_buffer, 1, BUFFER_SIZE, in_file);
 
 	totaldectime = 0;
 	totalsize = 0;
@@ -257,7 +274,7 @@
 		 * then fill it.
 		 */
 		if (mp4_ptr > mp4_buffer + BUFFER_SIZE/2) {
-			int already_in_buffer = (mp4_buffer + BUFFER_SIZE - mp4_ptr);
+			int already_in_buffer = (int)(mp4_buffer + BUFFER_SIZE - mp4_ptr);
 
 			/* Move data if needed */
 			if (already_in_buffer > 0)
@@ -268,9 +285,9 @@
 
 			/* read new data */
             if(!feof(in_file)) {
-				useful_bytes += fread(mp4_buffer + already_in_buffer,
-									  1, BUFFER_SIZE - already_in_buffer,
-									  in_file);
+				useful_bytes += (int) fread(mp4_buffer + already_in_buffer,
+									        1, BUFFER_SIZE - already_in_buffer,
+									        in_file);
 			}
 		}
 
@@ -368,8 +385,9 @@
 				
 		/* Save output frame if required */
 		if (ARG_SAVEDECOUTPUT) {
-			sprintf(filename, "%sdec%05d", filepath, filenr);
-			if(write_image(filename, out_buffer)) {
+			sprintf(filename, "%sdec", filepath);
+
+			if(write_image(filename, out_buffer, filenr)) {
 				fprintf(stderr,
 						"Error writing decoded frame %s\n",
 						filename);
@@ -416,8 +434,9 @@
 
 		/* Save output frame if required */
 		if (ARG_SAVEDECOUTPUT) {
-			sprintf(filename, "%sdec%05d", filepath, filenr);
-			if(write_image(filename, out_buffer)) {
+			sprintf(filename, "%sdec", filepath);
+
+			if(write_image(filename, out_buffer, filenr)) {
 				fprintf(stderr,
 						"Error writing decoded frame %s\n",
 						filename);
@@ -442,7 +461,7 @@
 	}
 		
 /*****************************************************************************
- *      XviD PART  Stop
+ *      Xvid PART  Stop
  ****************************************************************************/
 
  release_all:
@@ -468,12 +487,14 @@
 
 	fprintf(stderr, "Usage : xvid_decraw [OPTIONS]\n");
 	fprintf(stderr, "Options :\n");
-	fprintf(stderr, " -asm           : use assembly optimizations (default=disabled)\n");
+	fprintf(stderr, " -noasm         : don't use assembly optimizations (default=enabled)\n");
 	fprintf(stderr, " -debug         : debug level (debug=0)\n");
 	fprintf(stderr, " -i string      : input filename (default=stdin)\n");
 	fprintf(stderr, " -d             : save decoder output\n");
 	fprintf(stderr, " -c csp         : choose colorspace output (rgb16, rgb24, rgb32, yv12, i420)\n");
-	fprintf(stderr, " -f format      : choose output file format (tga, pnm, pgm)\n");
+	fprintf(stderr, " -f format      : choose output file format (tga, pnm, pgm, yuv)\n");
+	fprintf(stderr, " -postproc      : postprocessing level (0=off, 1=deblock, 2=deblock+dering)\n");
+	fprintf(stderr, " -threads int   : number of threads\n");
 	fprintf(stderr, " -m             : save mpeg4 raw stream to individual files\n");
 	fprintf(stderr, " -help          : This help message\n");
 	fprintf(stderr, " (* means default)\n");
@@ -503,7 +524,7 @@
  *              output functions
  ****************************************************************************/
 
-static int write_image(char *prefix, unsigned char *image)
+static int write_image(char *prefix, unsigned char *image, int filenr)
 {
 	char filename[1024];
 	char *ext;

xvidcore-1.2.2.tar.bz2/examples/xvid_encraw.c -> xvidcore-1.3.0.tar.bz2/examples/xvid_encraw.c Changed

@@ -6,6 +6,7 @@
  *  Copyright(C) 2002-2003 Christoph Lampert <gruel@web.de>
  *               2002-2003 Edouard Gomez <ed.gomez@free.fr>
  *               2003      Peter Ross <pross@xvid.org>
+ *               2003-2010 Michael Militzer <isibaar@xvid.org>
  *
  *  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
@@ -21,7 +22,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: xvid_encraw.c,v 1.37 2008/11/27 20:17:39 Isibaar Exp $
+ * $Id: xvid_encraw.c,v 1.46.2.3 2011/02/03 15:01:06 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -54,6 +55,7 @@
 #endif
 
 #include "xvid.h"
+#include "portab.h" /* for pthread */
 
 #ifdef XVID_MKV_OUTPUT
 #include "matroska.cpp"
@@ -61,6 +63,8 @@
 
 #undef READ_PNM
 
+//#define USE_APP_LEVEL_THREADING /* Should xvid_encraw app use multi-threading? */
+
 /*****************************************************************************
  *                            Quality presets
  ****************************************************************************/
@@ -121,7 +125,7 @@
  ****************************************************************************/
 
 #define MAX_ZONES   64
-
+#define MAX_ENC_INSTANCES 4
 #define DEFAULT_QUANT 400
 
 typedef struct
@@ -145,6 +149,24 @@
 	int quants[32];
 } frame_stats_t;
 
+typedef struct
+{
+	pthread_t handle;       /* thread's handle */
+
+	int start_num;          /* begin/end of sequence */
+	int stop_num; 
+	
+	char *outfilename;      /* output filename */
+	char *statsfilename1;   /* pass1 statsfile */
+
+	int input_num; 
+
+	int totalsize;          /* encoder stats */
+	double totalenctime; 
+	float totalPSNR[3];
+ 	frame_stats_t framestats[7];
+} enc_sequence_data_t;
+
 /* Maximum number of frames to encode */
 #define ABS_MAXFRAMENR -1 /* no limit */
 
@@ -162,10 +184,12 @@
 
 static zone_t ZONES[MAX_ZONES];
 static 	int NUM_ZONES = 0;
-static 	frame_stats_t framestats[7];
 
+static 	int ARG_NUM_APP_THREADS = 1;
+static 	int ARG_CPU_FLAGS = 0;
 static 	int ARG_STATS = 0;
 static 	int ARG_SSIM = -1;
+static 	int ARG_PSNRHVSM = 0;
 static 	char* ARG_SSIM_PATH = NULL;
 static 	int ARG_DUMP = 0;
 static 	int ARG_LUMIMASKING = 0;
@@ -176,7 +200,7 @@
 static 	char *ARG_PASS2 = 0;
 //static int ARG_QUALITY = ME_ELEMENTS - 1;
 static 	int ARG_QUALITY = 6;
-static 	float ARG_FRAMERATE = 25.00f;
+static 	float ARG_FRAMERATE = 0.f;
 static 	int ARG_DWRATE = 25;
 static 	int ARG_DWSCALE = 1;
 static 	int ARG_MAXFRAMENR = ABS_MAXFRAMENR;
@@ -187,20 +211,8 @@
 static 	int ARG_SAVEMPEGSTREAM = 0;
 static 	int ARG_SAVEINDIVIDUAL = 0;
 static 	char *ARG_OUTPUTFILE = NULL;
-#ifdef XVID_AVI_OUTPUT
 static 	char *ARG_AVIOUTPUTFILE = NULL;
-#endif
-#ifdef XVID_MKV_OUTPUT
 static 	char *ARG_MKVOUTPUTFILE = NULL;
-#endif
-#ifdef XVID_AVI_INPUT
-static 	PAVISTREAM avi_stream = NULL;
-static 	PAVIFILE avi_file = NULL;
-static 	LPBITMAPINFOHEADER info_header = NULL;
-static 	PGETFRAME get_frame = NULL;
-#else
-#define get_frame NULL
-#endif
 static 	char *ARG_TIMECODEFILE = NULL;
 static 	int XDIM = 0;
 static 	int YDIM = 0;
@@ -219,6 +231,7 @@
 static 	int ARG_TURBO = 0;
 static 	int ARG_VHQMODE = 1;
 static 	int ARG_BVHQ = 0;
+static 	int ARG_QMETRIC = 0;
 static 	int ARG_CLOSED_GOP = 1;
 static 	int ARG_CHROMAME = 1;
 static 	int ARG_PAR = 1;
@@ -244,13 +257,13 @@
 static 	int ARG_VBVMAXRATE = 0;
 static 	int ARG_VBVPEAKRATE = 0;
 static 	int ARG_THREADS = 0;
+static 	int ARG_SLICES = 1;
 static 	int ARG_VFR = 0;
 static 	int ARG_PROGRESS = 0;
 static 	int ARG_COLORSPACE = XVID_CSP_YV12;
 	/* the path where to save output */
 static char filepath[256] = "./";
-	/* Internal structures (handles) for encoding and decoding */
-static 	void *enc_handle = NULL;
+
 static 	unsigned char qmatrix_intra[64];
 static 	unsigned char qmatrix_inter[64];
 
@@ -292,17 +305,20 @@
 						unsigned char *image);
 
 /* Encoder related functions */
-static int enc_init(int use_assembler);
-static int enc_info();
-static int enc_stop();
-static int enc_main(unsigned char *image,
-					unsigned char *bitstream,
-					int *key,
-					int *stats_type,
-					int *stats_quant,
-					int *stats_length,
-					int stats[3],
-					int framenum);
+static void enc_gbl(int use_assembler);
+static int  enc_init(void **enc_handle, char *stats_pass1, int start_num);
+static int  enc_info();
+static int  enc_stop(void *enc_handle);
+static int  enc_main(void *enc_handle,
+					 unsigned char *image,
+			 		 unsigned char *bitstream,
+					 int *key,
+					 int *stats_type,
+					 int *stats_quant,
+					 int *stats_length,
+					 int stats[3],
+					 int framenum);
+static void encode_sequence(enc_sequence_data_t *h);
 
 /* Zone Related Functions */
 static void apply_zone_modifiers(xvid_enc_frame_t * frame, int framenum);
@@ -321,60 +337,29 @@
 main(int argc,
 	 char *argv[])
 {
-
-	unsigned char *mp4_buffer = NULL;
-	unsigned char *in_buffer = NULL;
-	unsigned char *out_buffer = NULL;
-
-	double enctime;
 	double totalenctime = 0.;
 	float totalPSNR[3] = {0., 0., 0.};
+
 	FILE *statsfile;
+	frame_stats_t framestats[7];
 
-	int totalsize;
-	int result;
-	int m4v_size;
-	int key;
-	int stats_type;
-	int stats_quant;
-	int stats_length;
+	int input_num = 0;
+	int totalsize = 0;
 	int use_assembler = 1;
-	int fakenvop = 0;
 	int i;
-	int nvop_counter;
-
-	int input_num;
-	int output_num;

xvidcore-1.2.2.tar.bz2/src/bitstream/bitstream.c -> xvidcore-1.3.0.tar.bz2/src/bitstream/bitstream.c 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: bitstream.c,v 1.58 2007/07/24 09:43:10 Isibaar Exp $
+ * $Id: bitstream.c,v 1.60.2.1 2010/12/28 19:19:57 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -1024,6 +1024,11 @@
 						version, build, dec->packed_mode);
 			}
 
+			if ((dec->bs_version == 0) && (build > 0) &&
+				(build != 1393)) { /* non-xvid stream with xvid fourcc */
+				dec->bs_version = 0xffff;
+			}
+
 		} else					/* start_code == ? */
 		{
 			if (BitstreamShowBits(bs, 24) == 0x000001) {
@@ -1067,7 +1072,8 @@
 void
 BitstreamWriteVolHeader(Bitstream * const bs,
 						const MBParam * pParam,
-						const FRAMEINFO * const frame)
+						const FRAMEINFO * const frame,
+						const int num_slices)
 {
 	static const unsigned int vo_id = 0;
 	static const unsigned int vol_id = 0;
@@ -1232,7 +1238,12 @@
 	}
 
 	BitstreamPutBit(bs, 1);		/* complexity_estimation_disable */
-	BitstreamPutBit(bs, 1);		/* resync_marker_disable */
+
+	if (num_slices > 1)
+		BitstreamPutBit(bs, 0);		/* resync_marker_enabled */
+	else
+		BitstreamPutBit(bs, 1);		/* resync_marker_disabled */
+
 	BitstreamPutBit(bs, 0);		/* data_partitioned */
 
 	if (vol_ver_id != 1) {
@@ -1247,7 +1258,7 @@
 	/* divx5 userdata string */
 #define DIVX5_ID ((char *)"DivX503b1393")
   if ((pParam->global_flags & XVID_GLOBAL_DIVX5_USERDATA)) {
-    BitstreamWriteUserData(bs, DIVX5_ID, strlen(DIVX5_ID));
+    BitstreamWriteUserData(bs, DIVX5_ID, (uint32_t) strlen(DIVX5_ID));
   	if (pParam->max_bframes > 0 && (pParam->global_flags & XVID_GLOBAL_PACKED))
       BitstreamPutBits(bs, 'p', 8);
 	}
@@ -1260,7 +1271,7 @@
 				xvid_user_format,
 				XVID_BS_VERSION,
 				(frame->vop_flags & XVID_VOP_CARTOON)?'C':'\0');
-		BitstreamWriteUserData(bs, xvid_user_data, strlen(xvid_user_data));
+		BitstreamWriteUserData(bs, xvid_user_data, (uint32_t) strlen(xvid_user_data));
 	}
 }
 
@@ -1381,7 +1392,7 @@
 						const char *data,
 						const unsigned int length)
 {
-	int i;
+	unsigned int i;
 
 	BitstreamPad(bs);
 	BitstreamPutBits(bs, USERDATA_START_CODE, 32);
@@ -1441,12 +1452,11 @@
 
     if (frame->coding_type == I_VOP)
       nbitsresyncmarker = NUMBITS_VP_RESYNC_MARKER;  /* 16 zeros followed by a 1. */
-    else if (frame->coding_type == P_VOP)
-      nbitsresyncmarker = NUMBITS_VP_RESYNC_MARKER-1 + frame->fcode;
-    else /* B_VOP */
-      nbitsresyncmarker = MAX(NUMBITS_VP_RESYNC_MARKER+1, NUMBITS_VP_RESYNC_MARKER-1 + MAX(frame->fcode, frame->bcode));
+    else if (frame->coding_type == B_VOP) /* B_VOP */
+      nbitsresyncmarker = MAX(NUMBITS_VP_RESYNC_MARKER+1, NUMBITS_VP_RESYNC_MARKER + MAX(frame->fcode, frame->bcode) - 1);
+    else /*(frame->coding_type == P_VOP)*/
+		nbitsresyncmarker = NUMBITS_VP_RESYNC_MARKER + frame->fcode - 1;
 
-    BitstreamPadAlways(bs);
     BitstreamPutBits(bs, RESYNC_MARKER, nbitsresyncmarker);
     BitstreamPutBits(bs, mbnum, mbnum_bits);
     BitstreamPutBits(bs, frame->quant, 5);

xvidcore-1.2.2.tar.bz2/src/bitstream/bitstream.h -> xvidcore-1.3.0.tar.bz2/src/bitstream/bitstream.h Changed

xvidcore-1.2.2.tar.bz2/src/bitstream/mbcoding.c -> xvidcore-1.3.0.tar.bz2/src/bitstream/mbcoding.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: mbcoding.c,v 1.57 2008/11/26 01:04:34 Isibaar Exp $
+ * $Id: mbcoding.c,v 1.59 2010/10/15 16:20:48 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -588,7 +588,7 @@
 			CodeVector(bs, pMB->pmvs[i].x, frame->fcode);
 			CodeVector(bs, pMB->pmvs[i].y, frame->fcode);
 
-#ifdef _DEBUG
+#if 0 /* #ifdef _DEBUG */
 			if (i == 0) /* for simplicity */ {
 				int coded_length = BitstreamPos(bs) - bits;
 				int estimated_length = d_mv_bits(pMB->pmvs[i].x, pMB->pmvs[i].y, zeroMV, frame->fcode, 0);
@@ -1972,7 +1972,7 @@
 	26708, 29545, 29472, 26223, 30580, 29281,  8293, 29545,
 	25632, 29285, 30313, 25701, 26144, 28530,  8301, 26740,
 	 8293, 20039,  8277, 20551,  8268, 30296, 17513, 25376,
-	25711, 25445, 10272, 11825, 11825, 10544,  2606, 28505,
+	25711, 25445, 10272, 11825, 11827, 10544,  2606, 28505,
 	29301, 29472, 26223, 30580, 29281,  8293, 26980, 29811,
 	26994, 30050, 28532,  8306, 24936,  8307, 28532, 26400,
 	30313,  8293, 25441, 25955, 29555, 29728,  8303, 29801,

xvidcore-1.2.2.tar.bz2/src/bitstream/x86_asm/cbp_mmx.asm -> xvidcore-1.3.0.tar.bz2/src/bitstream/x86_asm/cbp_mmx.asm Changed

xvidcore-1.2.2.tar.bz2/src/bitstream/x86_asm/cbp_sse2.asm -> xvidcore-1.3.0.tar.bz2/src/bitstream/x86_asm/cbp_sse2.asm 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: cbp_sse2.asm,v 1.10.2.2 2009/05/28 08:42:37 Isibaar Exp $
+; * $Id: cbp_sse2.asm,v 1.14 2009/09/16 17:07:58 Isibaar Exp $
 ; *
 ; ***************************************************************************/
 
@@ -32,7 +32,7 @@
 
 %macro LOOP_SSE2 2
   movdqa xmm0, [%2+(%1)*128]
-  pand xmm0, xmm7
+  pand xmm0, xmm3
   movdqa xmm1, [%2+(%1)*128+16]
 
   por xmm0, [%2+(%1)*128+32]
@@ -43,7 +43,7 @@
   por xmm1, [%2+(%1)*128+112]
 
   por xmm0, xmm1        ; xmm0 = xmm1 = 128 bits worth of info
-  psadbw xmm0, xmm6     ; contains 2 dwords with sums
+  psadbw xmm0, xmm2     ; contains 2 dwords with sums
   movhlps xmm1, xmm0    ; move high dword from xmm0 to low xmm1
   por xmm0, xmm1        ; combine
   movd ecx, xmm0        ; if ecx set, values were found
@@ -76,10 +76,8 @@
   mov _EDX, prm1           ; coeff[]
   xor _EAX, _EAX           ; cbp = 0
 
-  PUSH_XMM6_XMM7
-  
-  movdqu xmm7, [ignore_dc] ; mask to ignore dc value
-  pxor xmm6, xmm6          ; zero
+  movdqu xmm3, [ignore_dc] ; mask to ignore dc value
+  pxor xmm2, xmm2          ; zero
 
   LOOP_SSE2 0, _EDX
   jz .blk2
@@ -112,12 +110,7 @@
 
 .finished:
  
-  POP_XMM6_XMM7
   ret
 ENDFUNC
 
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK

xvidcore-1.2.2.tar.bz2/src/dct/ia64_asm/fdct_ia64.s -> xvidcore-1.3.0.tar.bz2/src/dct/ia64_asm/fdct_ia64.s Changed

xvidcore-1.2.2.tar.bz2/src/dct/ia64_asm/idct_fini.s -> xvidcore-1.3.0.tar.bz2/src/dct/ia64_asm/idct_fini.s Changed

xvidcore-1.2.2.tar.bz2/src/dct/ia64_asm/idct_ia64_ecc.s -> xvidcore-1.3.0.tar.bz2/src/dct/ia64_asm/idct_ia64_ecc.s Changed

xvidcore-1.2.2.tar.bz2/src/dct/ia64_asm/idct_ia64_gcc.s -> xvidcore-1.3.0.tar.bz2/src/dct/ia64_asm/idct_ia64_gcc.s Changed

xvidcore-1.2.2.tar.bz2/src/dct/ia64_asm/idct_init.s -> xvidcore-1.3.0.tar.bz2/src/dct/ia64_asm/idct_init.s Changed

xvidcore-1.2.2.tar.bz2/src/dct/simple_idct.c -> xvidcore-1.3.0.tar.bz2/src/dct/simple_idct.c Changed

xvidcore-1.2.2.tar.bz2/src/dct/x86_asm/fdct_mmx_ffmpeg.asm -> xvidcore-1.3.0.tar.bz2/src/dct/x86_asm/fdct_mmx_ffmpeg.asm Changed

xvidcore-1.2.2.tar.bz2/src/dct/x86_asm/fdct_mmx_skal.asm -> xvidcore-1.3.0.tar.bz2/src/dct/x86_asm/fdct_mmx_skal.asm Changed

xvidcore-1.2.2.tar.bz2/src/dct/x86_asm/fdct_sse2_skal.asm -> xvidcore-1.3.0.tar.bz2/src/dct/x86_asm/fdct_sse2_skal.asm Changed

xvidcore-1.2.2.tar.bz2/src/dct/x86_asm/idct_3dne.asm -> xvidcore-1.3.0.tar.bz2/src/dct/x86_asm/idct_3dne.asm Changed

xvidcore-1.2.2.tar.bz2/src/dct/x86_asm/idct_mmx.asm -> xvidcore-1.3.0.tar.bz2/src/dct/x86_asm/idct_mmx.asm Changed

xvidcore-1.2.2.tar.bz2/src/dct/x86_asm/idct_sse2_dmitry.asm -> xvidcore-1.3.0.tar.bz2/src/dct/x86_asm/idct_sse2_dmitry.asm Changed

xvidcore-1.2.2.tar.bz2/src/decoder.c -> xvidcore-1.3.0.tar.bz2/src/decoder.c Changed

@@ -4,7 +4,7 @@
  *  - Decoder Module -
  *
  *  Copyright(C) 2002      MinChen <chenm001@163.com>
- *               2002-2004 Peter Ross <pross@xvid.org>
+ *               2002-2010 Peter Ross <pross@xvid.org>
  *
  *  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
@@ -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: decoder.c,v 1.80.2.1 2009/05/28 15:52:34 Isibaar Exp $
+ * $Id: decoder.c,v 1.86.2.1 2010/12/28 19:19:57 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -172,6 +172,8 @@
   dec->width = create->width;
   dec->height = create->height;
 
+  dec->num_threads = MAX(0, create->num_threads);
+
   image_null(&dec->cur);
   image_null(&dec->refn[0]);
   image_null(&dec->refn[1]);
@@ -197,7 +199,13 @@
   dec->time_inc_resolution = 1; /* until VOL header says otherwise */
   dec->ver_id = 1;
 
-  dec->bs_version = 0xffff; /* Initialize to very high value -> assume bugfree stream */
+  if (create->fourcc == ((int)('X')|((int)('V')<<8)| 
+                         ((int)('I')<<16)|((int)('D')<<24))) { /* XVID */
+    dec->bs_version = 0; /* Initially assume oldest xvid version */ 
+  }
+  else {
+	dec->bs_version = 0xffff; /* Initialize to very high value -> assume bugfree stream */
+  }
 
   dec->fixed_dimensions = (dec->width > 0 && dec->height > 0);
 
@@ -1383,17 +1391,6 @@
       MACROBLOCK *last_mb = &dec->last_mbs[y * dec->mb_width + x];
       int intra_dc_threshold; /* fake variable */
 
-      if (check_resync_marker(bs, resync_len)) {
-        int bound = read_video_packet_header(bs, dec, resync_len, &quant,
-                           &fcode_forward, &fcode_backward, &intra_dc_threshold);
-        x = bound % dec->mb_width;
-        y = MIN((bound / dec->mb_width), (dec->mb_height-1));
-        /* reset predicted macroblocks */
-        dec->p_fmv = dec->p_bmv = zeromv;
-        /* update resync len with new fcodes */
-        resync_len = get_resync_len_b(fcode_backward, fcode_forward);
-      }
-
       mv =
       mb->b_mvs[0] = mb->b_mvs[1] = mb->b_mvs[2] = mb->b_mvs[3] =
       mb->mvs[0] = mb->mvs[1] = mb->mvs[2] = mb->mvs[3] = zeromv;
@@ -1412,6 +1409,20 @@
         continue;
       }
 
+      if (check_resync_marker(bs, resync_len)) {
+        int bound = read_video_packet_header(bs, dec, resync_len, &quant,
+                           &fcode_forward, &fcode_backward, &intra_dc_threshold);
+
+		bound = MAX(0, bound-1); /* valid bound must always be >0 */
+        x = bound % dec->mb_width;
+        y = MIN((bound / dec->mb_width), (dec->mb_height-1));
+        /* reset predicted macroblocks */
+        dec->p_fmv = dec->p_bmv = zeromv;
+        /* update resync len with new fcodes */
+        resync_len = get_resync_len_b(fcode_backward, fcode_forward);
+		continue; /* re-init loop */
+	  }
+
       if (!BitstreamGetBit(bs)) { /* modb=='0' */
         const uint8_t modb2 = BitstreamGetBit(bs);
 
@@ -1525,7 +1536,7 @@
     image_copy(&dec->tmp, img, dec->edged_width, dec->height);
     image_postproc(&dec->postproc, &dec->tmp, dec->edged_width,
              mbs, dec->mb_width, dec->mb_height, dec->mb_width,
-             frame->general, brightness, dec->frames, (coding_type == B_VOP));
+             frame->general, brightness, dec->frames, (coding_type == B_VOP), dec->num_threads);
     img = &dec->tmp;
   }
 
@@ -1654,7 +1665,7 @@
     goto repeat;
   }
 
-  dec->p_bmv.x = dec->p_bmv.y = dec->p_fmv.y = dec->p_fmv.y = 0;  /* init pred vector to 0 */
+  dec->p_bmv.x = dec->p_bmv.y = dec->p_fmv.x = dec->p_fmv.y = 0;  /* init pred vector to 0 */
 
   /* packed_mode: special-N_VOP treament */
   if (dec->packed_mode && coding_type == N_VOP) {

xvidcore-1.2.2.tar.bz2/src/decoder.h -> xvidcore-1.3.0.tar.bz2/src/decoder.h Changed

@@ -3,7 +3,7 @@
  *  XVID MPEG-4 VIDEO CODEC
  *  - Decoder related header -
  *
- *  Copyright(C) 2002-2003 Peter Ross <pross@xvid.org>
+ *  Copyright(C) 2002-2010 Peter Ross <pross@xvid.org>
  *
  *  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
@@ -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: decoder.h,v 1.18 2006/03/27 11:21:48 Skal Exp $
+ * $Id: decoder.h,v 1.20 2010/12/18 10:13:30 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -105,7 +105,7 @@
 	int newpred_enable;
 	int reduced_resolution_enable;
 
-	/* The bitstream version if it's a XviD stream */
+	/* The bitstream version if it's a Xvid stream */
 	int bs_version;
 
 	/* image */
@@ -163,6 +163,8 @@
 
 	/* Tells if the reference image is edged or not */
 	int is_edged[2];
+
+	int num_threads;
 }
 DECODER;

xvidcore-1.2.2.tar.bz2/src/encoder.c -> xvidcore-1.3.0.tar.bz2/src/encoder.c Changed

@@ -3,9 +3,9 @@
  *  XVID MPEG-4 VIDEO CODEC
  *  - Encoder main module -
  *
- *  Copyright(C) 2002	  Michael Militzer <isibaar@xvid.org>
- *			   2002-2003 Peter Ross <pross@xvid.org>
- *			   2002	  Daniel Smith <danielsmith@astroboymail.com>
+ *  Copyright(C) 2002-2010 Michael Militzer <isibaar@xvid.org>
+ *               2002-2003 Peter Ross <pross@xvid.org>
+ *               2002      Daniel Smith <danielsmith@astroboymail.com>
  *
  *  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
@@ -21,7 +21,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: encoder.c,v 1.130 2007/02/08 13:10:24 Isibaar Exp $
+ * $Id: encoder.c,v 1.135.2.4 2011/02/03 15:12:34 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -435,7 +435,7 @@
 	/* timestamp stuff */
 
 	pEnc->mbParam.m_stamp = 0;
-	pEnc->m_framenum = 0;
+	pEnc->m_framenum = create->start_frame_num;
 	pEnc->current->stamp = 0;
 	pEnc->reference->stamp = 0;
 
@@ -444,34 +444,67 @@
 	pEnc->iFrameNum = 0;
 	pEnc->fMvPrevSigma = -1;
 
+	/* slices */
+	pEnc->num_slices = MIN(MAX(1, create->num_slices), (int) pEnc->mbParam.mb_height);
+
 	/* multithreaded stuff */
 	if (create->num_threads > 0) {
-		int t = create->num_threads;
-		int rows_per_thread = (pEnc->mbParam.mb_height+t-1)/t;
+		int t = MIN(create->num_threads, (int) (pEnc->mbParam.mb_height>>1)); /* at least two rows per thread */
+		int threads_per_slice = MAX(1, (t / pEnc->num_slices));
+		int rows_per_thread = (pEnc->mbParam.mb_height + threads_per_slice - 1) / threads_per_slice;
+
 		pEnc->num_threads = t;
-		pEnc->motionData = xvid_malloc(t*sizeof(SMPmotionData), CACHE_LINE);
-		if (!pEnc->motionData) 
+		pEnc->smpData = xvid_malloc(t*sizeof(SMPData), CACHE_LINE);
+		if (!pEnc->smpData) 
 			goto xvid_err_nosmp;
-		
+
+		/* tmp bitstream buffer for slice coding */
+		pEnc->smpData[0].tmp_buffer = xvid_malloc(16*pEnc->mbParam.edged_width*pEnc->mbParam.mb_height*sizeof(uint8_t), CACHE_LINE);
+		if (! pEnc->smpData[0].tmp_buffer) goto xvid_err_nosmp;
+
 		for (n = 0; n < t; n++) {
-			pEnc->motionData[n].complete_count_self =
+			int s = MIN(pEnc->num_threads, pEnc->num_slices);
+
+			pEnc->smpData[n].complete_count_self =
 				xvid_malloc(rows_per_thread * sizeof(int), CACHE_LINE);
 
-			if (!pEnc->motionData[n].complete_count_self)
+			if (!pEnc->smpData[n].complete_count_self)
 				goto xvid_err_nosmp;
-		
+
+			if (n > 0 && n < s) {
+				pEnc->smpData[n].bs = (Bitstream *) xvid_malloc(sizeof(Bitstream), CACHE_LINE);
+				if (!pEnc->smpData[n].bs)
+					goto xvid_err_nosmp;
+
+				pEnc->smpData[n].sStat = (Statistics *) xvid_malloc(sizeof(Statistics), CACHE_LINE);
+				if (!pEnc->smpData[n].sStat)
+					goto xvid_err_nosmp;
+
+				pEnc->smpData[n].tmp_buffer = pEnc->smpData[0].tmp_buffer + 16*(((n-1)*pEnc->mbParam.edged_width*pEnc->mbParam.mb_height)/s);
+				BitstreamInit(pEnc->smpData[n].bs, pEnc->smpData[n].tmp_buffer, 0);
+			}
+
 			if (n != 0) 
-				pEnc->motionData[n].complete_count_above = 
-					pEnc->motionData[n-1].complete_count_self;
+				pEnc->smpData[n].complete_count_above = 
+					pEnc->smpData[n-1].complete_count_self;
 		}
-		pEnc->motionData[0].complete_count_above =
-			pEnc->motionData[t-1].complete_count_self - 1;
+		pEnc->smpData[0].complete_count_above =
+			pEnc->smpData[t-1].complete_count_self - 1;
 
 	} else {
   xvid_err_nosmp:
 		/* no SMP */
+		if (pEnc->smpData) {
+			if (pEnc->smpData[0].tmp_buffer) 
+				xvid_free(pEnc->smpData[0].tmp_buffer);
+		}
+		else {
+			pEnc->smpData = xvid_malloc(1*sizeof(SMPData), CACHE_LINE);
+			if (pEnc->smpData == NULL) 
+				goto xvid_err_memory5;
+		}
+
 		create->num_threads = 0;
-		pEnc->motionData = NULL;
 	}
 
 	create->handle = (void *) pEnc;
@@ -687,11 +720,16 @@
 		xvid_free(pEnc->zones);
 
 	if (pEnc->num_threads > 0) {
-		for (i = 0; i < pEnc->num_threads; i++)
-			xvid_free(pEnc->motionData[i].complete_count_self);
+		for (i = 1; i < MAX(1, MIN(pEnc->num_threads, pEnc->num_slices)); i++) {
+			xvid_free(pEnc->smpData[i].bs);
+			xvid_free(pEnc->smpData[i].sStat);
+		}
+		if (pEnc->smpData[0].tmp_buffer) xvid_free(pEnc->smpData[0].tmp_buffer);
 
-		xvid_free(pEnc->motionData);
+		for (i = 0; i < pEnc->num_threads; i++)
+			xvid_free(pEnc->smpData[i].complete_count_self);
 	}
+	xvid_free(pEnc->smpData);
 
 	xvid_free(pEnc);
 
@@ -888,13 +926,13 @@
 					for (k = 0; k < 6; k++) {
 						frame->mbs[j*pEnc->mbParam.mb_width + i].lambda[k] = 
 							(int) ((float)(1<<LAMBDA_EXP) * data.lambda[6 * (j * data.mb_width + i) + k]);
-			}
+					}
 		} else {
 			for (j = 0; j<pEnc->mbParam.mb_height; j++)
 				for (i = 0; i<pEnc->mbParam.mb_width; i++)
 					for (k = 0; k < 6; k++) {
 						frame->mbs[j*pEnc->mbParam.mb_width + i].lambda[k] = 1<<LAMBDA_EXP;
-			}
+					}
 		}
 
 
@@ -997,7 +1035,6 @@
 	return;
 }
 
-
 /*****************************************************************************
  * IPB frame encoder entry point
  *
@@ -1492,10 +1529,8 @@
 
 
 static __inline void
-CodeIntraMB(Encoder * pEnc,
-			MACROBLOCK * pMB)
+CodeIntraMB(MACROBLOCK * pMB)
 {
-
 	pMB->mode = MODE_INTRA;
 
 	/* zero mv statistics */
@@ -1509,20 +1544,111 @@
 	}
 }
 
+static void
+SliceCodeI(SMPData *data)
+{
+	Encoder *pEnc = (Encoder *) data->pEnc;
+	Bitstream *bs = (Bitstream *) data->bs;
+
+	uint16_t x, y;
+	int mb_width = pEnc->mbParam.mb_width;
+	int mb_height = pEnc->mbParam.mb_height;
+
+	int bound = 0, num_slices = pEnc->num_slices;
+	FRAMEINFO *const current = pEnc->current;
+
+	DECLARE_ALIGNED_MATRIX(dct_codes, 6, 64, int16_t, CACHE_LINE);
+	DECLARE_ALIGNED_MATRIX(qcoeff, 6, 64, int16_t, CACHE_LINE);
+
+	if (data->start_y > 0) { /* write resync marker */
+		bound = data->start_y*mb_width;
+		write_video_packet_header(bs, &pEnc->mbParam, current, bound);
+	}
+
+	for (y = data->start_y; y < data->stop_y; y++) {
+		int new_bound = mb_width * ((((y*num_slices) / mb_height) * mb_height + (num_slices-1)) / num_slices);
 
+		if (new_bound > bound) {
+			bound = new_bound;
+			BitstreamPadAlways(bs);
+			write_video_packet_header(bs, &pEnc->mbParam, current, bound);

xvidcore-1.2.2.tar.bz2/src/encoder.h -> xvidcore-1.3.0.tar.bz2/src/encoder.h Changed

@@ -3,7 +3,7 @@
  *  XVID MPEG-4 VIDEO CODEC
  *  - Encoder related header  -
  *
- *  Copyright(C) 2002-2003 Michael Militzer <isibaar@xvid.org>
+ *  Copyright(C) 2002-2010 Michael Militzer <isibaar@xvid.org>
  *               2002-2003 Peter Ross <pross@xvid.org>
  *
  *  This program is free software ; you can redistribute it and/or modify
@@ -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: encoder.h,v 1.32 2006/07/10 08:09:59 syskin Exp $
+ * $Id: encoder.h,v 1.34 2010/12/18 16:02:00 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -99,7 +99,6 @@
 	uint32_t last_quant_initialized_intra; /* needed for mpeg matrices initialization */
 } MBParam;
 
-
 typedef struct
 {
 	int iTextBits;
@@ -112,7 +111,6 @@
 	int iMVBits;
 } Statistics;
 
-
 /* encoding queue */
 typedef struct
 {
@@ -122,7 +120,6 @@
 	IMAGE image;
 } QUEUEINFO;
 
-
 typedef struct
 {
     int frame_num;
@@ -155,7 +152,6 @@
 	int is_edged, is_interpolated;
 } FRAMEINFO;
 
-
 #include "motion/motion_smp.h"
 
 typedef struct
@@ -217,12 +213,14 @@
     QUEUEINFO closed_qframe;	/* qFrame, only valid when >= 0 */
 
 	/* multithreaded stuff */
-	int num_threads;			/* number of additional threads */
-	SMPmotionData * motionData;	/* data structures used to pass all thread-specific data */
+	int num_threads;			/* number of encoder threads */
+	SMPData * smpData;			/* data structures used to pass all thread-specific data */
 
 	int m_framenum; /* debug frame num counter; unlike iFrameNum, does not reset at ivop */
 
 	float fMvPrevSigma;
+
+	int num_slices;			/* number of slices to code */
 } Encoder;
 
 /*****************************************************************************
@@ -257,7 +255,6 @@
 		return 0;
 }
 
-
 /*****************************************************************************
  * Prototypes
  ****************************************************************************/

xvidcore-1.2.2.tar.bz2/src/global.h -> xvidcore-1.3.0.tar.bz2/src/global.h Changed

@@ -3,7 +3,7 @@
  *  XVID MPEG-4 VIDEO CODEC
  *  - Global definitions  -
  *
- *  Copyright(C) 2002 Michael Militzer <isibaar@xvid.org>
+ *  Copyright(C) 2002-2010 Michael Militzer <michael@xvid.org>
  *
  *  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
@@ -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: global.h,v 1.25 2005/12/09 04:45:35 syskin Exp $
+ * $Id: global.h,v 1.27 2010/11/28 15:18:21 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -48,7 +48,6 @@
 #define MODE_DIRECT_NONE_MV	4
 #define MODE_DIRECT_NO4V	5
 
-
 /*
  * vop coding types
  * intra, prediction, backward, sprite, not_coded
@@ -73,7 +72,6 @@
 	return xvid_type - 1;
 }
 
-
 typedef struct
 {
 	int x;
@@ -81,8 +79,6 @@
 }
 VECTOR;
 
-
-
 typedef struct
 {
 	VECTOR duv[3];
@@ -168,7 +164,6 @@
 }
 IMAGE;
 
-
 typedef struct
 {
 	uint32_t bufa;
@@ -182,10 +177,8 @@
 }
 Bitstream;
 
-
 #define MBPRED_SIZE  15
 
-
 typedef struct
 {
 	/* decoder/encoder */
@@ -210,6 +203,9 @@
 	int32_t sad8[4];			/* SAD values for inter4v-VECTORs */
 	int32_t sad16;				/* SAD value for inter-VECTOR */
 
+	int32_t var16;				/* Variance of the 16x16 luma block */
+	int32_t rel_var8[6];		/* Relative variances of the 8x8 sub-blocks */
+
 	int dquant;
 	int cbp;
 
@@ -263,5 +259,20 @@
 #define DIV_DIV(a,b)    (((a)>0) ? ((a)+((b)>>1))/(b) : ((a)-((b)>>1))/(b))
 #define SWAP(_T_,A,B)    { _T_ tmp = A; A = B; B = tmp; }
 
+static __inline uint32_t 
+isqrt(unsigned long n)
+{
+    uint32_t c = 0x8000;
+    uint32_t g = 0x8000;
+
+    for(;;) {
+        if(g*g > n)
+            g ^= c;
+        c >>= 1;
+        if(c == 0)
+            return g;
+        g |= c;
+    }
+}
 
 #endif							/* _GLOBAL_H_ */

xvidcore-1.2.2.tar.bz2/src/image/colorspace.c -> xvidcore-1.3.0.tar.bz2/src/image/colorspace.c Changed

xvidcore-1.2.2.tar.bz2/src/image/ia64_asm/interpolate8x8_ia64.s -> xvidcore-1.3.0.tar.bz2/src/image/ia64_asm/interpolate8x8_ia64.s Changed

xvidcore-1.2.2.tar.bz2/src/image/ia64_asm/interpolate8x8_ia64_exact.s -> xvidcore-1.3.0.tar.bz2/src/image/ia64_asm/interpolate8x8_ia64_exact.s Changed

xvidcore-1.2.2.tar.bz2/src/image/image.c -> xvidcore-1.3.0.tar.bz2/src/image/image.c Changed

@@ -3,7 +3,7 @@
  *  XVID MPEG-4 VIDEO CODEC
  *  - Image management functions -
  *
- *  Copyright(C) 2001-2004 Peter Ross <pross@xvid.org>
+ *  Copyright(C) 2001-2010 Peter Ross <pross@xvid.org>
  *
  *  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
@@ -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: image.c,v 1.43.2.1 2009/05/25 08:31:16 Isibaar Exp $
+ * $Id: image.c,v 1.46.2.1 2010/12/30 11:46:58 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -149,7 +149,7 @@
 
 	/* According to the Standard Clause 7.6.4, padding is done starting at 16
 	 * pixel width and height multiples. This was not respected in old xvids */
-	if (bs_version == 0 || bs_version >= SETEDGES_BUG_BEFORE) {
+	if (bs_version >= SETEDGES_BUG_BEFORE) {
 		width  = (width+15)&~15;
 		height = (height+15)&~15;
 	}
@@ -862,6 +862,98 @@
 	return (sse);
 }
 
+void image_block_variance(IMAGE * orig_image,
+				          uint16_t stride, 
+				          MACROBLOCK *mbs,
+				          uint16_t mb_width, 
+				          uint16_t mb_height)
+{
+	DECLARE_ALIGNED_MATRIX(sums, 1, 4, uint16_t, CACHE_LINE);
+	DECLARE_ALIGNED_MATRIX(squares, 1, 4, uint32_t, CACHE_LINE);
+	
+	int x, y, i, j;
+	uint8_t *orig_y = orig_image->y;
+	uint8_t *orig_u = orig_image->u;
+	uint8_t *orig_v = orig_image->v;
+
+	for (y = 0; y < mb_height; y++) {
+		for (x = 0; x < mb_width; x++) {
+			MACROBLOCK *pMB = &mbs[x + y * mb_width];
+			uint32_t var4[4];
+			uint32_t sum = 0, square = 0;
+
+			/* y-blocks */
+			for (j = 0; j < 2; j++) {
+				for (i = 0; i < 2; i++) {
+					int lsum = blocksum8(orig_y + ((y<<4) + (j<<3))*stride + (x<<4) + (i<<3), 
+										 stride, sums, squares);
+					int lsquare = (squares[0] + squares[1] + squares[2] + squares[3])<<6;
+
+					sum += lsum;
+					square += lsquare;
+
+					var4[0] = (squares[0]<<4) - sums[0]*sums[0];
+					var4[1] = (squares[1]<<4) - sums[1]*sums[1];
+					var4[2] = (squares[2]<<4) - sums[2]*sums[2];
+					var4[3] = (squares[3]<<4) - sums[3]*sums[3];
+
+					pMB->rel_var8[j*2 + i] = lsquare - lsum*lsum;
+					if (pMB->rel_var8[j*2 + i])
+						pMB->rel_var8[j*2 + i] = ((var4[0] + var4[1] + var4[2] + var4[3])<<8) / 
+												 pMB->rel_var8[j*2 + i]; /* 4*(Var(Di)/Var(D)) */
+					else 
+						pMB->rel_var8[j*2 + i] = 64;
+				}
+			}
+
+			/* u */
+			{
+				int lsum = blocksum8(orig_u + (y<<3)*(stride>>1) + (x<<3), 
+									 stride, sums, squares);
+				int lsquare = (squares[0] + squares[1] + squares[2] + squares[3])<<6;
+
+				sum += lsum;
+				square += lsquare;
+
+				var4[0] = (squares[0]<<4) - sums[0]*sums[0];
+				var4[1] = (squares[1]<<4) - sums[1]*sums[1];
+				var4[2] = (squares[2]<<4) - sums[2]*sums[2];
+				var4[3] = (squares[3]<<4) - sums[3]*sums[3];
+
+				pMB->rel_var8[4] = lsquare - lsum*lsum;
+				if (pMB->rel_var8[4])
+					pMB->rel_var8[4] = ((var4[0] + var4[1] + var4[2] + var4[3])<<8) / 
+										 pMB->rel_var8[4]; /* 4*(Var(Di)/Var(D)) */
+				else 
+					pMB->rel_var8[4] = 64;
+			}
+
+			/* v */
+			{
+				int lsum = blocksum8(orig_v + (y<<3)*(stride>>1) + (x<<3), 
+									 stride, sums, squares);
+				int lsquare = (squares[0] + squares[1] + squares[2] + squares[3])<<6;
+
+				sum += lsum;
+				square += lsquare;
+
+				var4[0] = (squares[0]<<4) - sums[0]*sums[0];
+				var4[1] = (squares[1]<<4) - sums[1]*sums[1];
+				var4[2] = (squares[2]<<4) - sums[2]*sums[2];
+				var4[3] = (squares[3]<<4) - sums[3]*sums[3];
+
+				pMB->rel_var8[5] = lsquare - lsum*lsum;
+				if (pMB->rel_var8[5])
+					pMB->rel_var8[5] = ((var4[0] + var4[1] + var4[2] + var4[3])<<8) / 
+										 pMB->rel_var8[5]; /* 4*(Var(Di)/Var(D)) */
+				else 
+					pMB->rel_var8[5] = 64;
+			}
+
+		}
+	}
+}
+
 #if 0
 
 #include <stdio.h>

xvidcore-1.2.2.tar.bz2/src/image/image.h -> xvidcore-1.3.0.tar.bz2/src/image/image.h Changed

@@ -3,7 +3,7 @@
  *  XVID MPEG-4 VIDEO CODEC
  *  - Image related header  -
  *
- *  Copyright(C) 2001-2004 Peter Ross <pross@xvid.org>
+ *  Copyright(C) 2001-2010 Peter Ross <pross@xvid.org>
  *
  *  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
@@ -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: image.h,v 1.17 2006/10/13 07:38:09 Skal Exp $
+ * $Id: image.h,v 1.18 2010/11/28 15:18:21 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -135,8 +135,11 @@
 					int y, int u, int v);
 
 
+void image_block_variance(IMAGE * orig_image, uint16_t stride, MACROBLOCK *mbs,
+				          uint16_t mb_width, uint16_t mb_height);
+
 void
-image_deblock_rrv(IMAGE * img, int edgeg_width,
+image_deblock_rrv(IMAGE * img, int edged_width,
 				const MACROBLOCK * mbs, int mb_width, int mb_height, int mb_stride,
 				int block, int flags);

xvidcore-1.2.2.tar.bz2/src/image/postprocessing.c -> xvidcore-1.3.0.tar.bz2/src/image/postprocessing.c Changed

@@ -3,7 +3,7 @@
  *  XVID MPEG-4 VIDEO CODEC
  *  - Postprocessing  functions -
  *
- *  Copyright(C) 2003-2004 Michael Militzer <isibaar@xvid.org>
+ *  Copyright(C) 2003-2010 Michael Militzer <isibaar@xvid.org>
  *                    2004 Marc Fauconneau
  *
  *  This program is free software ; you can redistribute it and/or modify
@@ -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: postprocessing.c,v 1.5 2008/11/27 00:47:03 Isibaar Exp $
+ * $Id: postprocessing.c,v 1.6 2010/12/18 10:13:38 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -53,56 +53,138 @@
 	init_noise(tbls);
 }
 
-void
-image_postproc(XVID_POSTPROC *tbls, IMAGE * img, int edged_width,
-				const MACROBLOCK * mbs, int mb_width, int mb_height, int mb_stride,
-				int flags, int brightness, int frame_num, int bvop)
+void 
+stripe_deblock_h(SMPDeblock *h)
 {
-	const int edged_width2 = edged_width /2;
+	const int stride = h->stride;
+	const int stride2 = stride /2;
+
 	int i,j;
 	int quant;
-	int dering = flags & XVID_DERINGY;
 
 	/* luma: j,i in block units */
-	if ((flags & XVID_DEBLOCKY))
+	if ((h->flags & XVID_DEBLOCKY))
 	{
-		for (j = 1; j < mb_height*2; j++)		/* horizontal deblocking */
-		for (i = 0; i < mb_width*2; i++)
+		int dering = h->flags & XVID_DERINGY;
+
+		for (j = 1; j < h->stop_y; j++)		/* horizontal luma deblocking */
+		for (i = h->start_x; i < h->stop_x; i++)
 		{
-			quant = mbs[(j+0)/2*mb_stride + (i/2)].quant;
-			deblock8x8_h(tbls, img->y + j*8*edged_width + i*8, edged_width, quant, dering);
+			quant = h->mbs[(j+0)/2*h->mb_stride + (i/2)].quant;
+			deblock8x8_h(h->tbls, h->img->y + j*8*stride + i*8, stride, quant, dering);
 		}
+	}
 
-		for (j = 0; j < mb_height*2; j++)		/* vertical deblocking */
-		for (i = 1; i < mb_width*2; i++)
+	/* chroma */
+	if ((h->flags & XVID_DEBLOCKUV))
+	{
+		int dering = h->flags & XVID_DERINGUV;
+
+		for (j = 1; j < h->stop_y/2; j++)		/* horizontal deblocking */
+		for (i = h->start_x/2; i < h->stop_x/2; i++)
 		{
-			quant = mbs[(j+0)/2*mb_stride + (i/2)].quant;
-			deblock8x8_v(tbls, img->y + j*8*edged_width + i*8, edged_width, quant, dering);
+			quant = h->mbs[(j+0)*h->mb_stride + i].quant;
+			deblock8x8_h(h->tbls, h->img->u + j*8*stride2 + i*8, stride2, quant, dering);
+			deblock8x8_h(h->tbls, h->img->v + j*8*stride2 + i*8, stride2, quant, dering);
 		}
 	}
+}
 
+void 
+stripe_deblock_v(SMPDeblock *h)
+{
+	const int stride = h->stride;
+	const int stride2 = stride /2;
 
-	/* chroma */
-	if ((flags & XVID_DEBLOCKUV))
+	int i,j;
+	int quant;
+
+	/* luma: j,i in block units */
+	if ((h->flags & XVID_DEBLOCKY))
 	{
-		dering = flags & XVID_DERINGUV;
+		int dering = h->flags & XVID_DERINGY;
 
-		for (j = 1; j < mb_height; j++)		/* horizontal deblocking */
-		for (i = 0; i < mb_width; i++)
+		for (j = h->start_y; j < h->stop_y; j++)		/* vertical deblocking */
+		for (i = 1; i < h->stop_x; i++)
 		{
-			quant = mbs[(j+0)*mb_stride + i].quant;
-			deblock8x8_h(tbls, img->u + j*8*edged_width2 + i*8, edged_width2, quant, dering);
-			deblock8x8_h(tbls, img->v + j*8*edged_width2 + i*8, edged_width2, quant, dering);
+			quant = h->mbs[(j+0)/2*h->mb_stride + (i/2)].quant;
+			deblock8x8_v(h->tbls, h->img->y + j*8*stride + i*8, stride, quant, dering);
 		}
+	}
 
-		for (j = 0; j < mb_height; j++)		/* vertical deblocking */	
-		for (i = 1; i < mb_width; i++)
+	/* chroma */
+	if ((h->flags & XVID_DEBLOCKUV))
+	{
+		int dering = h->flags & XVID_DERINGUV;
+
+		for (j = h->start_y/2; j < h->stop_y/2; j++)		/* vertical deblocking */	
+		for (i = 1; i < h->stop_x/2; i++)
 		{
-			quant = mbs[(j+0)*mb_stride + i].quant;
-			deblock8x8_v(tbls, img->u + j*8*edged_width2 + i*8, edged_width2, quant, dering);
-			deblock8x8_v(tbls, img->v + j*8*edged_width2 + i*8, edged_width2, quant, dering);
+			quant = h->mbs[(j+0)*h->mb_stride + i].quant;
+			deblock8x8_v(h->tbls, h->img->u + j*8*stride2 + i*8, stride2, quant, dering);
+			deblock8x8_v(h->tbls, h->img->v + j*8*stride2 + i*8, stride2, quant, dering);
 		}
 	}
+}
+
+void
+image_postproc(XVID_POSTPROC *tbls, IMAGE * img, int edged_width,
+				const MACROBLOCK * mbs, int mb_width, int mb_height, int mb_stride,
+				int flags, int brightness, int frame_num, int bvop, int threads)
+{
+	int k, num_threads = MAX(1, MIN(threads, 4));
+	SMPDeblock data[4];
+	void *status = NULL;
+
+	/* horizontal deblocking, dispatch threads */
+	for (k = 0; k < num_threads; k++) {
+		data[k].flags = flags;
+		data[k].img = img;
+		data[k].mb_stride = mb_stride;
+		data[k].mbs = mbs;
+		data[k].stride = edged_width;
+		data[k].tbls = tbls;
+
+		data[k].start_x = (k*mb_width / num_threads)*2;
+		data[k].stop_x = ((k+1)*mb_width / num_threads)*2;
+
+		data[k].stop_y = mb_height*2;
+	}
+
+	/* create threads */
+	for (k = 1; k < num_threads; k++) {
+		pthread_create(&data[k].handle, NULL, 
+		               (void*)stripe_deblock_h, (void*)&data[k]);
+	}
+
+	stripe_deblock_h(&data[0]);
+
+	/* wait until all threads are finished */
+	for (k = 1; k < num_threads; k++) {
+		pthread_join(data[k].handle, &status);
+	}
+
+
+	/* vertical deblocking, dispatch threads */
+	for (k = 0; k < num_threads; k++) {
+		data[k].start_y = (k*mb_height / num_threads)*2;
+		data[k].stop_y = ((k+1)*mb_height / num_threads)*2;
+		data[k].stop_x = mb_width*2;
+	}
+
+	/* create threads */
+	for (k = 1; k < num_threads; k++) {
+		pthread_create(&data[k].handle, NULL, 
+		               (void*)stripe_deblock_v, (void*)&data[k]);
+	}
+
+	stripe_deblock_v(&data[0]);
+
+	/* wait until all threads are finished */
+	for (k = 1; k < num_threads; k++) {
+		pthread_join(data[k].handle, &status);
+	}
+
 
 	if (!bvop)
 		tbls->prev_quant = mbs->quant;

xvidcore-1.2.2.tar.bz2/src/image/postprocessing.h -> xvidcore-1.3.0.tar.bz2/src/image/postprocessing.h Changed

@@ -3,7 +3,7 @@
  *  XVID MPEG-4 VIDEO CODEC
  *  - Postprocessing header  -
  *
- *  Copyright(C) 2003 Michael Militzer <isibaar@xvid.org>
+ *  Copyright(C) 2003-2010 Michael Militzer <isibaar@xvid.org>
  *
  *  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
@@ -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: postprocessing.h,v 1.6 2004/07/15 10:08:22 suxen_drol Exp $
+ * $Id: postprocessing.h,v 1.7 2010/12/18 10:13:38 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -49,10 +49,27 @@
 	int prev_quant;
 } XVID_POSTPROC;
 
+typedef struct
+{
+	pthread_t handle;		/* thread's handle */
+
+	XVID_POSTPROC *tbls;
+	IMAGE * img;
+	const MACROBLOCK * mbs;
+
+	int stride;
+	int start_x;
+	int stop_x;
+	int start_y;
+	int stop_y; 
+	int mb_stride;
+	int flags;
+} SMPDeblock;
+
 void
 image_postproc(XVID_POSTPROC *tbls, IMAGE * img, int edged_width,
 				const MACROBLOCK * mbs, int mb_width, int mb_height, int mb_stride,
-				int flags, int brightness, int frame_num, int bvop);
+				int flags, int brightness, int frame_num, int bvop, int threads);
 
 void deblock8x8_h(XVID_POSTPROC *tbls, uint8_t *img, int stride, int quant, int dering);
 void deblock8x8_v(XVID_POSTPROC *tbls, uint8_t *img, int stride, int quant, int dering);

xvidcore-1.2.2.tar.bz2/src/image/reduced.c -> xvidcore-1.3.0.tar.bz2/src/image/reduced.c Changed

xvidcore-1.2.2.tar.bz2/src/image/x86_asm/colorspace_mmx.inc -> xvidcore-1.3.0.tar.bz2/src/image/x86_asm/colorspace_mmx.inc Changed

xvidcore-1.2.2.tar.bz2/src/image/x86_asm/colorspace_rgb_mmx.asm -> xvidcore-1.3.0.tar.bz2/src/image/x86_asm/colorspace_rgb_mmx.asm Changed

xvidcore-1.2.2.tar.bz2/src/image/x86_asm/colorspace_yuv_mmx.asm -> xvidcore-1.3.0.tar.bz2/src/image/x86_asm/colorspace_yuv_mmx.asm 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: colorspace_yuv_mmx.asm,v 1.10.2.2 2009/05/28 15:04:35 Isibaar Exp $
+; * $Id: colorspace_yuv_mmx.asm,v 1.15 2009/09/16 17:07:58 Isibaar Exp $
 ; *
 ; ***************************************************************************/
 
@@ -29,6 +29,14 @@
 ; Helper macros
 ;=============================================================================
 
+%macro _MOVQ        3
+%if %1 == 1
+	movntq  %2, %3      ; xmm
+%else
+	movq    %2, %3      ; plain mmx
+%endif
+%endmacro
+
 ;------------------------------------------------------------------------------
 ; PLANE_COPY ( DST, DST_STRIDE, SRC, SRC_STRIDE, WIDTH, HEIGHT, OPT )
 ; DST		dst buffer
@@ -81,25 +89,14 @@
   movq mm7, [SRC + 48]
   movq mm0, [SRC + 56]
 
-%if OPT == 0                ; plain mmx
-  movq [DST     ], mm1      ; write to y_out
-  movq [DST +  8], mm2
-  movq [DST + 16], mm3
-  movq [DST + 24], mm4
-  movq [DST + 32], mm5
-  movq [DST + 40], mm6
-  movq [DST + 48], mm7
-  movq [DST + 56], mm0
-%else
-  movntq [DST     ], mm1    ; write to y_out
-  movntq [DST +  8], mm2
-  movntq [DST + 16], mm3
-  movntq [DST + 24], mm4
-  movntq [DST + 32], mm5
-  movntq [DST + 40], mm6
-  movntq [DST + 48], mm7
-  movntq [DST + 56], mm0
-%endif
+  _MOVQ OPT, [DST     ], mm1      ; write to y_out
+  _MOVQ OPT, [DST +  8], mm2
+  _MOVQ OPT, [DST + 16], mm3
+  _MOVQ OPT, [DST + 24], mm4
+  _MOVQ OPT, [DST + 32], mm5
+  _MOVQ OPT, [DST + 40], mm6
+  _MOVQ OPT, [DST + 48], mm7
+  _MOVQ OPT, [DST + 56], mm0
 
   add SRC, 64
   add DST, 64
@@ -113,13 +110,9 @@
 %%loop16_pc:
   movq mm1, [SRC]
   movq mm2, [SRC + 8]
-%if OPT == 0                ; plain mmx
-  movq [DST], mm1
-  movq [DST + 8], mm2
-%else
-  movntq [DST], mm1
-  movntq [DST + 8], mm2
-%endif
+
+  _MOVQ OPT, [DST], mm1
+  _MOVQ OPT, [DST + 8], mm2
 
   add SRC, 16
   add DST, 16
@@ -190,25 +183,14 @@
 
 %%loop64_pf:
 
-%if OPT == 0                 ; plain mmx
-  movq [DST     ], mm0       ; write to y_out
-  movq [DST +  8], mm0
-  movq [DST + 16], mm0
-  movq [DST + 24], mm0
-  movq [DST + 32], mm0
-  movq [DST + 40], mm0
-  movq [DST + 48], mm0
-  movq [DST + 56], mm0
-%else
-  movntq [DST     ], mm0     ; write to y_out
-  movntq [DST +  8], mm0
-  movntq [DST + 16], mm0
-  movntq [DST + 24], mm0
-  movntq [DST + 32], mm0
-  movntq [DST + 40], mm0
-  movntq [DST + 48], mm0
-  movntq [DST + 56], mm0
-%endif
+  _MOVQ OPT, [DST     ], mm0      ; write to y_out
+  _MOVQ OPT, [DST +  8], mm0
+  _MOVQ OPT, [DST + 16], mm0
+  _MOVQ OPT, [DST + 24], mm0
+  _MOVQ OPT, [DST + 32], mm0
+  _MOVQ OPT, [DST + 40], mm0
+  _MOVQ OPT, [DST + 48], mm0
+  _MOVQ OPT, [DST + 56], mm0
 
   add DST, 64
   loop %%loop64_pf
@@ -219,13 +201,8 @@
   jz %%loop1_start_pf
 
 %%loop16_pf:
-%if OPT == 0                 ; plain mmx
-  movq [DST    ], mm0
-  movq [DST + 8], mm0
-%else
-  movntq [DST    ], mm0
-  movntq [DST + 8], mm0
-%endif
+  _MOVQ OPT, [DST    ], mm0
+  _MOVQ OPT, [DST + 8], mm0
 
   add DST, 16
   loop %%loop16_pf
@@ -474,7 +451,4 @@
 
 MAKE_YV12_TO_YV12	yv12_to_yv12_xmm, 1
 
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK

xvidcore-1.2.2.tar.bz2/src/image/x86_asm/colorspace_yuyv_mmx.asm -> xvidcore-1.3.0.tar.bz2/src/image/x86_asm/colorspace_yuyv_mmx.asm Changed

xvidcore-1.2.2.tar.bz2/src/image/x86_asm/deintl_sse.asm -> xvidcore-1.3.0.tar.bz2/src/image/x86_asm/deintl_sse.asm Changed

@@ -4,9 +4,9 @@
 ; *  - simple de-interlacer
 ; *  Copyright(C) 2006 Pascal Massimino <skal@xvid.org>
 ; *
-; *  This file is part of XviD, a free MPEG-4 video encoder/decoder
+; *  This file is part of Xvid, a free MPEG-4 video encoder/decoder
 ; *
-; *  XviD is free software; you can redistribute it and/or modify it
+; *  Xvid 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.
@@ -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: deintl_sse.asm,v 1.4.2.1 2009/05/28 08:42:37 Isibaar Exp $
+; * $Id: deintl_sse.asm,v 1.7 2010/03/09 10:00:14 Isibaar Exp $
 ; *
 ; *************************************************************************/
 
@@ -131,7 +131,4 @@
 ENDFUNC
 
 ;//////////////////////////////////////////////////////////////////////
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
+NON_EXEC_STACK

xvidcore-1.2.2.tar.bz2/src/image/x86_asm/gmc_mmx.asm -> xvidcore-1.3.0.tar.bz2/src/image/x86_asm/gmc_mmx.asm Changed

@@ -4,9 +4,9 @@
 ; *  - GMC core functions -
 ; *  Copyright(C) 2006 Pascal Massimino <skal@planet-d.net>
 ; *
-; *  This file is part of XviD, a free MPEG-4 video encoder/decoder
+; *  This file is part of Xvid, a free MPEG-4 video encoder/decoder
 ; *
-; *  XviD is free software; you can redistribute it and/or modify it
+; *  Xvid 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.
@@ -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: gmc_mmx.asm,v 1.7.2.3 2009/05/28 08:42:37 Isibaar Exp $
+; * $Id: gmc_mmx.asm,v 1.12 2010/03/09 10:00:14 Isibaar Exp $
 ; *
 ; *************************************************************************/
 
@@ -220,7 +220,4 @@
 ENDFUNC
 
 ;//////////////////////////////////////////////////////////////////////
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
+NON_EXEC_STACK

xvidcore-1.2.2.tar.bz2/src/image/x86_asm/interpolate8x8_3dn.asm -> xvidcore-1.3.0.tar.bz2/src/image/x86_asm/interpolate8x8_3dn.asm Changed

xvidcore-1.2.2.tar.bz2/src/image/x86_asm/interpolate8x8_3dne.asm -> xvidcore-1.3.0.tar.bz2/src/image/x86_asm/interpolate8x8_3dne.asm Changed

xvidcore-1.2.2.tar.bz2/src/image/x86_asm/interpolate8x8_mmx.asm -> xvidcore-1.3.0.tar.bz2/src/image/x86_asm/interpolate8x8_mmx.asm Changed

xvidcore-1.2.2.tar.bz2/src/image/x86_asm/interpolate8x8_xmm.asm -> xvidcore-1.3.0.tar.bz2/src/image/x86_asm/interpolate8x8_xmm.asm Changed

xvidcore-1.2.2.tar.bz2/src/image/x86_asm/postprocessing_mmx.asm -> xvidcore-1.3.0.tar.bz2/src/image/x86_asm/postprocessing_mmx.asm Changed

@@ -5,7 +5,7 @@
 ; *
 ; *  Copyright(C) 2004 Peter Ross <pross@xvid.org>
 ; *
-; *  XviD is free software; you can redistribute it and/or modify it
+; *  Xvid 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.
@@ -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: postprocessing_mmx.asm,v 1.9.2.2 2009/05/28 15:04:35 Isibaar Exp $
+; * $Id: postprocessing_mmx.asm,v 1.14 2010/03/09 10:00:14 Isibaar Exp $
 ; *
 ; *************************************************************************/
 
@@ -104,7 +104,7 @@
 	jl .xloop
 
 	add TMP1, TMP0				; dst += stride
-	sub _EDI, 1
+	dec _EDI
 	jg .yloop
 
 	pop _EDI
@@ -114,7 +114,4 @@
 ENDFUNC
 ;//////////////////////////////////////////////////////////////////////
 
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK

xvidcore-1.2.2.tar.bz2/src/image/x86_asm/postprocessing_sse2.asm -> xvidcore-1.3.0.tar.bz2/src/image/x86_asm/postprocessing_sse2.asm Changed

@@ -6,7 +6,7 @@
 ; *  Copyright(C) 2004 Peter Ross <pross@xvid.org>
 ; *               2004 Dcoder <dcoder@alexandria.cc>
 ; *
-; *  XviD is free software; you can redistribute it and/or modify it
+; *  Xvid 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.
@@ -66,7 +66,6 @@
 
 ALIGN SECTION_ALIGN
 image_brightness_sse2:
-  PUSH_XMM6_XMM7
 %ifdef ARCH_IS_X86_64
   XVID_MOVSXD _EAX, prm5d
 %else
@@ -79,14 +78,14 @@
   push _EDI    ; 8 bytes offset for push
   sub _ESP, 32 ; 32 bytes for local data (16bytes will be used, 16bytes more to align correctly mod 16)
 
-  movdqa xmm6, [xmm_0x80]
+  movdqa xmm2, [xmm_0x80]
 
   ; Create a offset...offset vector
   mov _ESI, _ESP          ; TMP1 will be esp aligned mod 16
   add _ESI, 15            ; TMP1 = esp + 15
   and _ESI, ~15           ; TMP1 = (esp + 15)&(~15)
   CREATE_OFFSET_VECTOR _ESI, al
-  movdqa xmm7, [_ESI]
+  movdqa xmm3, [_ESI]
 
 %ifdef ARCH_IS_X86_64
   mov _ESI, prm3
@@ -103,12 +102,12 @@
   movdqa xmm0, [TMP1 + _EAX]
   movdqa xmm1, [TMP1 + _EAX + 16] ; xmm0 = [dst]
 
-  paddb xmm0, xmm6              ; unsigned -> signed domain
-  paddb xmm1, xmm6
-  paddsb xmm0, xmm7
-  paddsb xmm1, xmm7             ; xmm0 += offset
-  psubb xmm0, xmm6
-  psubb xmm1, xmm6              ; signed -> unsigned domain
+  paddb xmm0, xmm2              ; unsigned -> signed domain
+  paddb xmm1, xmm2
+  paddsb xmm0, xmm3
+  paddsb xmm1, xmm3             ; xmm0 += offset
+  psubb xmm0, xmm2
+  psubb xmm1, xmm2              ; signed -> unsigned domain
 
   movdqa [TMP1 + _EAX], xmm0
   movdqa [TMP1 + _EAX + 16], xmm1 ; [dst] = xmm0
@@ -118,19 +117,15 @@
   jl .xloop
 
   add TMP1, TMP0                  ; dst += stride
-  sub _EDI, 1
+  dec _EDI
   jg .yloop
 
   add _ESP, 32
   pop _EDI
   pop _ESI
 
-  POP_XMM6_XMM7
   ret
 ENDFUNC
 ;//////////////////////////////////////////////////////////////////////
 
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK

xvidcore-1.2.2.tar.bz2/src/image/x86_asm/qpel_mmx.asm -> xvidcore-1.3.0.tar.bz2/src/image/x86_asm/qpel_mmx.asm Changed

@@ -4,9 +4,9 @@
 ; *  - Quarter-pixel interpolation -
 ; *  Copyright(C) 2002 Pascal Massimino <skal@planet-d.net>
 ; *
-; *  This file is part of XviD, a free MPEG-4 video encoder/decoder
+; *  This file is part of Xvid, a free MPEG-4 video encoder/decoder
 ; *
-; *  XviD is free software; you can rDST_PTRstribute it and/or modify it
+; *  Xvid 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.
@@ -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: qpel_mmx.asm,v 1.9.2.1 2009/05/28 08:42:37 Isibaar Exp $
+; * $Id: qpel_mmx.asm,v 1.13 2010/11/28 15:18:21 Isibaar Exp $
 ; *
 ; *************************************************************************/
 
@@ -1149,7 +1149,4 @@
 %undef SRC_PTR
 %undef DST_PTR
 
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK

xvidcore-1.2.2.tar.bz2/src/image/x86_asm/reduced_mmx.asm -> xvidcore-1.3.0.tar.bz2/src/image/x86_asm/reduced_mmx.asm Changed

@@ -5,7 +5,7 @@
 ; *
 ; *  Copyright(C) 2002 Pascal Massimino <skal@planet-d.net>
 ; *
-; *  XviD is free software; you can redistribute it and/or modify it
+; *  Xvid 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.
@@ -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: reduced_mmx.asm,v 1.9.2.1 2009/05/28 08:42:37 Isibaar Exp $
+; * $Id: reduced_mmx.asm,v 1.13 2010/03/09 10:00:14 Isibaar Exp $
 ; *
 ; *************************************************************************/
 
@@ -735,7 +735,7 @@
   packuswb mm1, mm7
   movd [TMP0+_EAX*4], mm0
   movd [TMP1+_EAX*4], mm1
-  add _EAX,1
+  inc _EAX
   jl .Loop
 
   ret
@@ -985,8 +985,4 @@
 
   ; pfeewwww... Never Do That On Stage Again. :)
 
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK

xvidcore-1.2.2.tar.bz2/src/motion/estimation.h -> xvidcore-1.3.0.tar.bz2/src/motion/estimation.h Changed

@@ -4,7 +4,7 @@
  *  - Motion Estimation related header -
  *
  *  Copyright(C) 2002 Christoph Lampert <gruel@web.de>
- *               2002 Michael Militzer <michael@xvid.org>
+ *               2002-2010 Michael Militzer <michael@xvid.org>
  *               2002-2003 Radoslaw Czyz <xvid@syskin.cjb.net>
  *
  *  This program is free software ; you can redistribute it and/or modify
@@ -21,7 +21,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: estimation.h,v 1.13 2005/12/09 04:39:49 syskin Exp $
+ * $Id: estimation.h,v 1.16 2010/12/24 13:21:35 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -30,6 +30,7 @@
 
 #include "../portab.h"
 #include "../global.h"
+#include "sad.h"
 
 /* hard coded motion search parameters */
 
@@ -116,9 +117,19 @@
 	const uint16_t * mpeg_quant_matrices;			/* current MPEG quantization matrices */
 	int lambda[6];				/* R-D lambdas for all 6 blocks */
 	unsigned int quant_sq;		/* quant squared - saves many multiplications in VHQ */
-
+	uint32_t rel_var8[6];		/* relative variances for all 6 sub-blocks */
+	int metric;					/* distortion metric for R-D optimizations, currently: PSNR=0, PSNRHVSM=1 */
 } SearchData;
 
+static __inline uint32_t 
+masked_sseh8_16bit(int16_t * const orig, 
+                   int16_t * const rec,
+                   const uint32_t rel_var8)
+{
+	uint16_t mask = ((isqrt(2*coeff8_energy(orig)*rel_var8) + 48) >> 6);
+	return (5*sseh8_16bit(orig, rec, (uint16_t) mask)) >> 7;
+}
+
 typedef void(CheckFunc)(const int x, const int y,
 						SearchData * const Data,
 						const unsigned int Direction);
@@ -166,7 +177,8 @@
 		const IMAGE * const pCurrent,
 		const IMAGE * const pRef,
 		const IMAGE * const vGMC,
-		const int coding_type);
+		const int coding_type,
+		const int bound);
 
 void
 xvid_me_ModeDecision_Fast(SearchData * const Data,
@@ -180,7 +192,8 @@
 		const IMAGE * const pCurrent,
 		const IMAGE * const pRef,
 		const IMAGE * const vGMC,
-		const int coding_type);
+		const int coding_type,
+		const int bound);
 
 void 
 ModeDecision_BVOP_RD(SearchData * const Data_d,
@@ -192,9 +205,11 @@
 					 VECTOR * f_predMV,
 					 VECTOR * b_predMV,
 					 const uint32_t MotionFlags,
+			 		 const uint32_t VopFlags,
 					 const MBParam * const pParam,
 					 int x, int y,
-					 int best_sad);
+					 int best_sad,
+					 int force_direct);
 
 unsigned int
 getMinFcode(const int MVmax);

xvidcore-1.2.2.tar.bz2/src/motion/estimation_bvop.c -> xvidcore-1.3.0.tar.bz2/src/motion/estimation_bvop.c Changed

@@ -4,7 +4,7 @@
  *  - Motion Estimation for B-VOPs  -
  *
  *  Copyright(C) 2002 Christoph Lampert <gruel@web.de>
- *               2002 Michael Militzer <michael@xvid.org>
+ *               2002-2010 Michael Militzer <michael@xvid.org>
  *               2002-2003 Radoslaw Czyz <xvid@syskin.cjb.net>
  *
  *  This program is free software ; you can redistribute it and/or modify
@@ -21,7 +21,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: estimation_bvop.c,v 1.25 2006/02/25 01:20:41 syskin Exp $
+ * $Id: estimation_bvop.c,v 1.28.2.1 2010/12/29 22:29:44 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -396,28 +396,45 @@
 							const uint32_t iWcount,
 							const MACROBLOCK * const pMB,
 							const uint32_t mode_curr,
-							const VECTOR hint)
+							const VECTOR hint, const int bound)
 {
+	int lx, ly;		/* left */
+	int tx, ty;		/* top */
+	int rtx, rty;	/* top-right */
+	int ltx, lty;	/* top-left */
+	int lpos, tpos, rtpos, ltpos;
+
+	lx  = x - 1;	ly  = y;
+	tx  = x;		ty  = y - 1;
+	rtx = x + 1;	rty = y - 1;
+	ltx = x - 1;	lty = y - 1;
+
+	lpos  =  lx +  ly * iWcount;
+	rtpos = rtx + rty * iWcount;
+	tpos  =  tx +  ty * iWcount;
+	ltpos = ltx + lty * iWcount;
+
+
 	/* [0] is prediction */
 	/* [1] is zero */
 	pmv[1].x = pmv[1].y = 0; 
 
 	pmv[2].x = hint.x; pmv[2].y = hint.y;
 
-	if ((y != 0)&&(x != (int)(iWcount+1))) {			/* [3] top-right neighbour */
+	if (rtpos >= bound && rtx < (int)iWcount) {			/* [3] top-right neighbour */
 		pmv[3] = ChoosePred(pMB+1-iWcount, mode_curr);
 	} else pmv[3].x = pmv[3].y = 0;
 
-	if (y != 0) {
-		pmv[4] = ChoosePred(pMB-iWcount, mode_curr);
+ 	if (tpos >= bound) {
+		pmv[4] = ChoosePred(pMB-iWcount, mode_curr);	/* [4] top */
 	} else pmv[4].x = pmv[4].y = 0;
 
-	if (x != 0) {
-		pmv[5] = ChoosePred(pMB-1, mode_curr);
+	if (lpos >= bound && lx >= 0) {
+		pmv[5] = ChoosePred(pMB-1, mode_curr);			/* [5] left */
 	} else pmv[5].x = pmv[5].y = 0;
 
-	if (x != 0 && y != 0) {
-		pmv[6] = ChoosePred(pMB-1-iWcount, mode_curr);
+	if (ltpos >= bound && ltx >= 0) {
+		pmv[6] = ChoosePred(pMB-1-iWcount, mode_curr);	/* [6] top-left */
 	} else pmv[6].x = pmv[6].y = 0;
 }
 
@@ -432,7 +449,7 @@
 			int32_t * const best_sad,
 			const int32_t mode_current,
 			SearchData * const Data,
-			VECTOR hint)
+			VECTOR hint, const int bound)
 {
 
 	int i;
@@ -451,7 +468,7 @@
 		hint.x /= 2; hint.y /= 2;
 	}
 
-	PreparePredictionsBF(pmv, x, y, pParam->mb_width, pMB, mode_current, hint);
+	PreparePredictionsBF(pmv, x, y, pParam->mb_width, pMB, mode_current, hint, bound);
 
 	Data->currentMV->x = Data->currentMV->y = 0;
 
@@ -800,7 +817,8 @@
 					  MACROBLOCK * const pMB,
 					  const MACROBLOCK * const b_mb,
 					  VECTOR * f_predMV,
-					  VECTOR * b_predMV)
+					  VECTOR * b_predMV, 
+					  int force_direct)
 {
 	int mode = MODE_DIRECT, k;
 	int best_sad, f_sad, b_sad, i_sad;
@@ -812,6 +830,9 @@
 	f_sad = Data_f->iMinSAD[0] + 4*Data_d->lambda16;
 	i_sad = Data_i->iMinSAD[0] + 2*Data_d->lambda16;
 
+	if (force_direct)
+		goto set_mode; /* bypass checks for non-direct modes */
+
 	if (b_sad < best_sad) {
 		mode = MODE_BACKWARD;
 		best_sad = b_sad;
@@ -827,6 +848,7 @@
 		best_sad = i_sad;
 	}
 
+set_mode:
 	pMB->sad16 = best_sad;
 	pMB->mode = mode;
 	pMB->cbp = 63;
@@ -961,7 +983,8 @@
 					 const IMAGE * const b_ref,
 					 const IMAGE * const b_refH,
 					 const IMAGE * const b_refV,
-					 const IMAGE * const b_refHV)
+					 const IMAGE * const b_refHV,
+					 const int num_slices)
 {
 	uint32_t i, j;
 	int32_t best_sad = 256*4096;
@@ -971,6 +994,8 @@
 
 	VECTOR f_predMV, b_predMV;
 
+	int mb_width = pParam->mb_width;
+	int mb_height = pParam->mb_height;
 	int MVmaxF = 0, MVmaxB = 0;
 	const int32_t TRB = time_pp - time_bp;
 	const int32_t TRD = time_pp;
@@ -1000,12 +1025,16 @@
 	Data_b.iFcode = Data_i.bFcode = frame->bcode = b_reference->fcode;
 
 	for (j = 0; j < pParam->mb_height; j++) {
+		int new_bound = mb_width * ((((j*num_slices) / mb_height) * mb_height + (num_slices-1)) / num_slices);
 
 		f_predMV = b_predMV = zeroMV;	/* prediction is reset at left boundary */
 
 		for (i = 0; i < pParam->mb_width; i++) {
 			MACROBLOCK * const pMB = frame->mbs + i + j * pParam->mb_width;
 			const MACROBLOCK * const b_mb = b_mbs + i + j * pParam->mb_width;
+			int force_direct = (((j*mb_width+i)==new_bound) && (j > 0)) ? 1 : 0; /* MTK decoder chipsets do NOT reset predMVs upon resync marker in BVOPs. We workaround this problem 
+																				    by placing the slice border on second MB in a row and then force the first MB to be direct mode */
+
 			pMB->mode = -1;
 
 			initialize_searchData(&Data_d, &Data_f, &Data_b, &Data_i,
@@ -1034,10 +1063,10 @@
 			}
 
 			SearchBF_initial(i, j, frame->motion_flags, frame->fcode, pParam, pMB,
-						&f_predMV, &best_sad, MODE_FORWARD, &Data_f, Data_d.currentMV[1]);
+						&f_predMV, &best_sad, MODE_FORWARD, &Data_f, Data_d.currentMV[1], new_bound);
 
 			SearchBF_initial(i, j, frame->motion_flags, frame->bcode, pParam, pMB,
-						&b_predMV, &best_sad, MODE_BACKWARD, &Data_b, Data_d.currentMV[2]);
+						&b_predMV, &best_sad, MODE_BACKWARD, &Data_b, Data_d.currentMV[2], new_bound);
 
 			if (frame->motion_flags&XVID_ME_BFRAME_EARLYSTOP)
 				fb_thresh = best_sad;
@@ -1081,9 +1110,9 @@
 
 			if (frame->vop_flags & XVID_VOP_RD_BVOP) 
 				ModeDecision_BVOP_RD(&Data_d, &Data_b, &Data_f, &Data_i, 
-					pMB, b_mb, &f_predMV, &b_predMV, frame->motion_flags, pParam, i, j, best_sad);
+					pMB, b_mb, &f_predMV, &b_predMV, frame->motion_flags, frame->vop_flags, pParam, i, j, best_sad, force_direct);
 			else
-				ModeDecision_BVOP_SAD(&Data_d, &Data_b, &Data_f, &Data_i, pMB, b_mb, &f_predMV, &b_predMV);
+				ModeDecision_BVOP_SAD(&Data_d, &Data_b, &Data_f, &Data_i, pMB, b_mb, &f_predMV, &b_predMV, force_direct);
 
 			maxMotionBVOP(&MVmaxF, &MVmaxB, pMB, Data_d.qpel);
 
@@ -1097,27 +1126,33 @@
 
 
 void
-SMPMotionEstimationBVOP(SMPmotionData * h)
+SMPMotionEstimationBVOP(SMPData * h)
 {
-	const MBParam * const pParam = h->pParam;
+	Encoder *pEnc = (Encoder *) h->pEnc;
+
+	const MBParam * const pParam = &pEnc->mbParam;
 	const FRAMEINFO * const frame = h->current;
-	const int32_t time_bp = h->time_bp;
-	const int32_t time_pp = h->time_pp;
+	const int32_t time_bp = (int32_t)(pEnc->current->stamp - frame->stamp);
+	const int32_t time_pp = (int32_t)(pEnc->current->stamp - pEnc->reference->stamp);
 	/* forward (past) reference */
-	const MACROBLOCK * const f_mbs = h->f_mbs;
-	const IMAGE * const f_ref = h->fRef;
-	const IMAGE * const f_refH = h->fRefH;
-	const IMAGE * const f_refV = h->fRefV;

xvidcore-1.2.2.tar.bz2/src/motion/estimation_gmc.c -> xvidcore-1.3.0.tar.bz2/src/motion/estimation_gmc.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: estimation_gmc.c,v 1.5 2004/12/05 04:53:01 syskin Exp $
+ * $Id: estimation_gmc.c,v 1.6 2010/12/18 16:02:00 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -68,14 +68,15 @@
 				const int y,
 				const MBParam * const pParam,
 				MACROBLOCK * const pMBs,
-				SearchData * const Data)
+				SearchData * const Data,
+				const int bound)
 {
 
 	MACROBLOCK * const pMB = &pMBs[x + y * pParam->mb_width];
 
 	Data->iMinSAD[0] = MV_MAX_ERROR;
 
-	Data->predMV = get_pmv2(pMBs, pParam->mb_width, 0, x, y, 0);
+	Data->predMV = get_pmv2(pMBs, pParam->mb_width, bound, x, y, 0);
 
 	get_range(&Data->min_dx, &Data->max_dx, &Data->min_dy, &Data->max_dy, x, y, 4,
 				pParam->width, pParam->height, 16, 1);
@@ -122,12 +123,16 @@
 			const FRAMEINFO * const reference,
 			const IMAGE * const pRefH,
 			const IMAGE * const pRefV,
-			const IMAGE * const pRefHV)
+			const IMAGE * const pRefHV,
+			const int num_slices)
 {
 	uint32_t x, y;
 	MACROBLOCK * const pMBs = current->mbs;
 	const IMAGE * const pCurrent = &current->image;
 	const IMAGE * const pReference = &reference->image;
+	int bound = 0;
+	const uint32_t mb_width = pParam->mb_width;
+	const uint32_t mb_height = pParam->mb_height;
 
 	SearchData Data;
 	memset(&Data, 0, sizeof(SearchData));
@@ -140,8 +145,9 @@
 	if (sadInit) (*sadInit) ();
 
 	for (y = 0; y < pParam->mb_height; y ++) {
+		bound = mb_width * ((((y*num_slices) / mb_height) * mb_height + (num_slices-1))/ num_slices);
 		for (x = 0; x < pParam->mb_width; x ++) {
-			GMEanalyzeMB(pCurrent->y, pReference->y, pRefH->y, pRefV->y, pRefHV->y, x, y, pParam, pMBs, &Data);
+			GMEanalyzeMB(pCurrent->y, pReference->y, pRefH->y, pRefV->y, pRefHV->y, x, y, pParam, pMBs, &Data, bound);
 		}
 	}
 	return;
@@ -154,7 +160,8 @@
 				const FRAMEINFO * const reference,
 				const IMAGE * const pRefH,
 				const IMAGE * const pRefV,
-				const IMAGE * const pRefHV)
+				const IMAGE * const pRefHV,
+				const int num_slices)
 {
 
 	const int deltax=8;		/* upper bound for difference between a MV and it's neighbour MVs */
@@ -178,7 +185,7 @@
 
 	gmc.duv[0].x = gmc.duv[0].y = gmc.duv[1].x = gmc.duv[1].y = gmc.duv[2].x = gmc.duv[2].y = 0;
 
-	GMEanalysis(pParam,current, reference, pRefH, pRefV, pRefHV);
+	GMEanalysis(pParam,current, reference, pRefH, pRefV, pRefHV, num_slices);
 
 	/* block based ME isn't done, yet, so do a quick presearch */

xvidcore-1.2.2.tar.bz2/src/motion/estimation_pvop.c -> xvidcore-1.3.0.tar.bz2/src/motion/estimation_pvop.c Changed

@@ -4,7 +4,7 @@
  *  - Motion Estimation for P- and S- VOPs  -
  *
  *  Copyright(C) 2002 Christoph Lampert <gruel@web.de>
- *               2002 Michael Militzer <michael@xvid.org>
+ *               2002-2010 Michael Militzer <michael@xvid.org>
  *               2002-2003 Radoslaw Czyz <xvid@syskin.cjb.net>
  *
  *  This program is free software ; you can redistribute it and/or modify
@@ -21,7 +21,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: estimation_pvop.c,v 1.22 2006/04/19 15:42:19 syskin Exp $
+ * $Id: estimation_pvop.c,v 1.24.2.1 2010/12/28 19:19:57 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -407,7 +407,8 @@
 		MACROBLOCK * const pMB,
 		const MACROBLOCK * const pMBs,
 		const int block,
-		SearchData * const Data)
+		SearchData * const Data,
+		const int bound)
 {
 	int i = 0;
 	VECTOR vbest_q; int32_t sbest_q;
@@ -416,11 +417,11 @@
 	*Data->currentQMV = *(OldData->currentQMV + 1 + block);
 
 	if(Data->qpel) {
-		Data->predMV = get_qpmv2(pMBs, pParam->mb_width, 0, x/2, y/2, block);
+		Data->predMV = get_qpmv2(pMBs, pParam->mb_width, bound, x/2, y/2, block);
 		if (block != 0)	i = d_mv_bits(	Data->currentQMV->x, Data->currentQMV->y,
 										Data->predMV, Data->iFcode, 0);
 	} else {
-		Data->predMV = get_pmv2(pMBs, pParam->mb_width, 0, x/2, y/2, block);
+		Data->predMV = get_pmv2(pMBs, pParam->mb_width, bound, x/2, y/2, block);
 		if (block != 0)	i = d_mv_bits(	Data->currentMV->x, Data->currentMV->y,
 										Data->predMV, Data->iFcode, 0);
 	}
@@ -523,7 +524,8 @@
 		const MBParam * const pParam,
 		const MACROBLOCK * const pMBs,
 		const MACROBLOCK * const prevMBs,
-		MACROBLOCK * const pMB)
+		MACROBLOCK * const pMB,
+		const int bound)
 {
 
 	int i, threshA;
@@ -534,7 +536,7 @@
 	get_range(&Data->min_dx, &Data->max_dx, &Data->min_dy, &Data->max_dy, x, y, 4,
 						pParam->width, pParam->height, Data->iFcode - Data->qpel, 1);
 
-	get_pmvdata2(pMBs, pParam->mb_width, 0, x, y, pmv, Data->temp);
+	get_pmvdata2(pMBs, pParam->mb_width, bound, x, y, pmv, Data->temp);
 
 	Data->chromaX = Data->chromaY = 0; /* chroma-sad cache */
 	Data->Cur = pCur->y + (x + y * Data->iEdgedWidth) * 16;
@@ -555,7 +557,7 @@
 
 	memset(Data->currentMV, 0, 5*sizeof(VECTOR));
 
-	if (Data->qpel) Data->predMV = get_qpmv2(pMBs, pParam->mb_width, 0, x, y, 0);
+	if (Data->qpel) Data->predMV = get_qpmv2(pMBs, pParam->mb_width, bound, x, y, 0);
 	else Data->predMV = pmv[0];
 
 	i = d_mv_bits(0, 0, Data->predMV, Data->iFcode, 0);
@@ -681,10 +683,10 @@
 		SearchData Data8;
 		memcpy(&Data8, Data, sizeof(SearchData)); /* quick copy of common data */
 
-		Search8(Data, 2*x, 2*y, MotionFlags, pParam, pMB, pMBs, 0, &Data8);
-		Search8(Data, 2*x + 1, 2*y, MotionFlags, pParam, pMB, pMBs, 1, &Data8);
-		Search8(Data, 2*x, 2*y + 1, MotionFlags, pParam, pMB, pMBs, 2, &Data8);
-		Search8(Data, 2*x + 1, 2*y + 1, MotionFlags, pParam, pMB, pMBs, 3, &Data8);
+		Search8(Data, 2*x, 2*y, MotionFlags, pParam, pMB, pMBs, 0, &Data8, bound);
+		Search8(Data, 2*x + 1, 2*y, MotionFlags, pParam, pMB, pMBs, 1, &Data8, bound);
+		Search8(Data, 2*x, 2*y + 1, MotionFlags, pParam, pMB, pMBs, 2, &Data8, bound);
+		Search8(Data, 2*x + 1, 2*y + 1, MotionFlags, pParam, pMB, pMBs, 3, &Data8, bound);
 
 		if ((Data->chroma) && (!(VopFlags & XVID_VOP_MODEDECISION_RD))) {
 			/* chroma is only used for comparison to INTER. if the comparison will be done in RD domain, it will not be used */
@@ -718,7 +720,8 @@
 					 const IMAGE * const pGMC,
 					 const IMAGE * const pCurrent,
 					 const IMAGE * const pRef,
-					 const uint32_t MotionFlags)
+					 const uint32_t MotionFlags,
+					 const int bound)
 {
 	const unsigned int iEdgedWidth = pParam->edged_width;
 
@@ -746,7 +749,7 @@
 		else
 			cmpMV = &staticMV;
 
-		if(x > 0 && y > 0 && x < pParam->mb_width) {
+		if(x > 0 && y > 0 && x < (int) pParam->mb_width) {
 			if(MVequal((&pMBs[(x-1) + y * pParam->mb_width])->mvs[0], *cmpMV) &&
 			   MVequal((&pMBs[x + (y-1) * pParam->mb_width])->mvs[0], *cmpMV) &&
 			   MVequal((&pMBs[(x+1) + (y-1) * pParam->mb_width])->mvs[0], *cmpMV) &&
@@ -792,9 +795,9 @@
 		else if (sad00 < stat_thresh) {
 			VECTOR predMV;
 			if (Data->qpel)
-				predMV = get_qpmv2(current->mbs, pParam->mb_width, 0, x, y, 0);
+				predMV = get_qpmv2(current->mbs, pParam->mb_width, bound, x, y, 0);
 			else
-				predMV = get_pmv2(current->mbs, pParam->mb_width, 0, x, y, 0);
+				predMV = get_pmv2(current->mbs, pParam->mb_width, bound, x, y, 0);
 
 			ZeroMacroblockP(pMB, sad00);
 			pMB->cbp = 0x3f;
@@ -894,7 +897,8 @@
 				 const IMAGE * const pRefV,
 				 const IMAGE * const pRefHV,
 				 const IMAGE * const pGMC,
-				 const uint32_t iLimit)
+				 const uint32_t iLimit,
+				 const int num_slices)
 {
 	MACROBLOCK *const pMBs = current->mbs;
 	const IMAGE *const pCurrent = &current->image;
@@ -904,13 +908,11 @@
 	const uint32_t mb_height = pParam->mb_height;
 	const uint32_t iEdgedWidth = pParam->edged_width;
 	const uint32_t MotionFlags = MakeGoodMotionFlags(current->motion_flags, current->vop_flags, current->vol_flags);
-	int stat_thresh = 0;
+	int bound = 0;
 	int MVmax = 0, mvSum = 0, mvCount = 0;
 
 	uint32_t x, y;
 	int sad00;
-	int skip_thresh = INITIAL_SKIP_THRESH * \
-		(current->vop_flags & XVID_VOP_MODEDECISION_RD ? 2:1);
 	int block = 0;
 
 	/* some pre-initialized thingies for SearchP */
@@ -930,6 +932,9 @@
 	if (sadInit) (*sadInit) ();
 
 	for (y = 0; y < mb_height; y++)	{
+
+		bound = mb_width * ((((y*num_slices) / mb_height) * mb_height + (num_slices-1)) / num_slices);
+
 		for (x = 0; x < mb_width; x++)	{
 			MACROBLOCK *pMB = &pMBs[block];
 			MACROBLOCK *prevMB = &reference->mbs[block];
@@ -953,22 +958,22 @@
 			}
 
 			skip = InitialSkipDecisionP(sad00, pParam, current, pMB, prevMB, x, y, &Data, pGMC, 
-										pCurrent, pRef, MotionFlags);
+										pCurrent, pRef, MotionFlags, bound);
 			if (skip) continue;
 
 			SearchP(pRef, pRefH->y, pRefV->y, pRefHV->y, pCurrent, x,
 					y, MotionFlags, current->vop_flags,
-					&Data, pParam, pMBs, reference->mbs, pMB);
+					&Data, pParam, pMBs, reference->mbs, pMB, bound);
 
 			if (current->vop_flags & XVID_VOP_MODEDECISION_RD)
 				xvid_me_ModeDecision_RD(&Data, pMB, pMBs, x, y, pParam,
 								MotionFlags, current->vop_flags, current->vol_flags,
-								pCurrent, pRef, pGMC, current->coding_type);
+								pCurrent, pRef, pGMC, current->coding_type, bound);
 
 			else if (current->vop_flags & XVID_VOP_FAST_MODEDECISION_RD)
 				xvid_me_ModeDecision_Fast(&Data, pMB, pMBs, x, y, pParam,
 								MotionFlags, current->vop_flags, current->vol_flags,
-								pCurrent, pRef, pGMC, current->coding_type);
+								pCurrent, pRef, pGMC, current->coding_type, bound);
 			else
 				ModeDecision_SAD(&Data, pMB, pMBs, x, y, pParam,
 								MotionFlags, current->vop_flags, current->vol_flags,
@@ -985,15 +990,17 @@
 }
 
 void
-MotionEstimateSMP(SMPmotionData * h)
+MotionEstimateSMP(SMPData * h)
 {
-	const MBParam * const pParam = h->pParam;
-	const FRAMEINFO * const current = h->current;
-	const FRAMEINFO * const reference = h->reference;
-	const IMAGE * const pRefH = h->pRefH;
-	const IMAGE * const pRefV = h->pRefV;
-	const IMAGE * const pRefHV = h->pRefHV;
-	const IMAGE * const pGMC = h->pGMC;
+	Encoder *pEnc = (Encoder *) h->pEnc;
+
+	const MBParam * const pParam = &pEnc->mbParam;
+	const FRAMEINFO * const current = pEnc->current;
+	const FRAMEINFO * const reference = pEnc->reference;
+	const IMAGE * const pRefH = &pEnc->vInterH;
+	const IMAGE * const pRefV = &pEnc->vInterV;
+	const IMAGE * const pRefHV = &pEnc->vInterHV;

xvidcore-1.2.2.tar.bz2/src/motion/estimation_rd_based.c -> xvidcore-1.3.0.tar.bz2/src/motion/estimation_rd_based.c Changed

@@ -4,7 +4,7 @@
  *  - Rate-Distortion Based Motion Estimation for P- and S- VOPs  -
  *
  *  Copyright(C) 2003 Radoslaw Czyz <xvid@syskin.cjb.net>
- *               2003 Michael Militzer <michael@xvid.org>
+ *               2003-2010 Michael Militzer <michael@xvid.org>
  *
  *  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
@@ -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: estimation_rd_based.c,v 1.14 2005/12/09 04:45:35 syskin Exp $
+ * $Id: estimation_rd_based.c,v 1.16.2.1 2010/12/29 22:29:44 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -49,7 +49,7 @@
 #define LAMBDA		( (int)(BITS_MULT*1.0) )
 
 static __inline unsigned int
-Block_CalcBits(	int16_t * const coeff,
+Block_CalcBits( int16_t * const coeff,
 				int16_t * const data,
 				int16_t * const dqcoeff,
 				const uint32_t quant, const int quant_type,
@@ -58,7 +58,9 @@
 				const uint16_t * scan_table,
 				const unsigned int lambda,
 				const uint16_t * mpeg_quant_matrices,
-				const unsigned int quant_sq)
+				const unsigned int quant_sq,
+				const unsigned int rel_var8,
+				const unsigned int metric)
 {
 	int sum;
 	int bits;
@@ -76,7 +78,9 @@
 		if (quant_type) dequant_h263_inter(dqcoeff, coeff, quant, mpeg_quant_matrices);
 		else dequant_mpeg_inter(dqcoeff, coeff, quant, mpeg_quant_matrices);
 
-		distortion = sse8_16bit(data, dqcoeff, 8*sizeof(int16_t));
+		if (metric) distortion = masked_sseh8_16bit(data, dqcoeff, rel_var8);
+		else distortion = sse8_16bit(data, dqcoeff, 8*sizeof(int16_t));
+
 	} else {
 		const static int16_t zero_block[64] =
 			{
@@ -90,9 +94,11 @@
 				0, 0, 0, 0, 0, 0, 0, 0,
 			};
 		bits = 0;
-		distortion = sse8_16bit(data, zero_block, 8*sizeof(int16_t));
-	}
 
+		if (metric) distortion = masked_sseh8_16bit(data, (int16_t * const) zero_block, rel_var8);
+		else distortion = sse8_16bit(data, (int16_t * const) zero_block, 8*sizeof(int16_t));
+
+	}
 
 	return bits + (lambda*distortion)/quant_sq;
 }
@@ -113,7 +119,9 @@
 					unsigned int cbp[2],
 					unsigned int lambda,
 					const uint16_t * mpeg_quant_matrices,
-					const unsigned int quant_sq)
+					const unsigned int quant_sq,
+					const unsigned int metric,
+					const int bound)
 {
 	int direction;
 	int16_t *pCurrent;
@@ -132,7 +140,7 @@
 	}
 
 	predict_acdc(pMB-(x+mb_width*y), x, y, mb_width, block, qcoeff,
-				quant, iDcScaler, predictors, 0);
+				quant, iDcScaler, predictors, bound);
 	
 	direction = pMB->acpred_directions[block];
 	pCurrent = (int16_t*)pMB->pred_values[block];
@@ -171,7 +179,8 @@
 	bits[1] += coded = CodeCoeffIntra_CalcBits(qcoeff, scan_tables[direction]);
 	if (coded > 0) cbp[1] |= 1 << (5 - block);
 
-	distortion = sse8_16bit(coeff, dqcoeff, 8*sizeof(int16_t));
+	if (metric) distortion = masked_sseh8_16bit(coeff, dqcoeff, pMB->rel_var8[block]);
+	else distortion = sse8_16bit(coeff, dqcoeff, 8*sizeof(int16_t));
 
 	return (lambda*distortion)/quant_sq;
 }
@@ -208,7 +217,7 @@
 		transfer_8to16subro(in, data->Cur + s, ptr + s, data->iEdgedWidth);
 		rd += data->temp[i] = Block_CalcBits(coeff, in, data->dctSpace + 128, data->iQuant, 
 								data->quant_type, &cbp, i, data->scan_table, data->lambda[i], 
-								data->mpeg_quant_matrices, data->quant_sq);
+								data->mpeg_quant_matrices, data->quant_sq, data->rel_var8[i], data->metric);
 	}
 
 	rd += t = BITS_MULT * (d_mv_bits(x, y, data->predMV, data->iFcode, data->qpel^data->qpel_precision) - 2);
@@ -235,7 +244,7 @@
 	transfer_8to16subro(in, data->CurU, ptr, data->iEdgedWidth/2);
 	rd += Block_CalcBits(coeff, in, data->dctSpace + 128, data->iQuant, data->quant_type,
 							&cbp, 4, data->scan_table, data->lambda[4], 
-							data->mpeg_quant_matrices, data->quant_sq);
+							data->mpeg_quant_matrices, data->quant_sq, data->rel_var8[4], data->metric);
 	if (rd >= data->iMinSAD[0]) return;
 
 	/* chroma V */
@@ -243,7 +252,7 @@
 	transfer_8to16subro(in, data->CurV, ptr, data->iEdgedWidth/2);
 	rd += Block_CalcBits(coeff, in, data->dctSpace + 128, data->iQuant, data->quant_type,
 							&cbp, 5, data->scan_table, data->lambda[5], 
-							data->mpeg_quant_matrices, data->quant_sq);
+							data->mpeg_quant_matrices, data->quant_sq, data->rel_var8[5], data->metric);
 
 	rd += BITS_MULT * (mcbpc_inter_tab[(MODE_INTER & 7) | ((cbp & 3) << 3)].len - 1); /* one was added before */
 
@@ -279,7 +288,7 @@
 	transfer_8to16subro(in, data->Cur, ptr, data->iEdgedWidth);
 	rd = Block_CalcBits(coeff, in, data->dctSpace + 128, data->iQuant, data->quant_type, 
 						&cbp, 5, data->scan_table, data->lambda[0], 
-						data->mpeg_quant_matrices, data->quant_sq);
+						data->mpeg_quant_matrices, data->quant_sq, data->rel_var8[0], data->metric);
 	/* we took 2 bits into account before */
 	rd += BITS_MULT * (d_mv_bits(x, y, data->predMV, data->iFcode, data->qpel^data->qpel_precision) - 2); 
 
@@ -295,9 +304,9 @@
 
 static int
 findRD_inter(SearchData * const Data,
-			const int x, const int y,
-			const MBParam * const pParam,
-			const uint32_t MotionFlags)
+			 const int x, const int y,
+			 const MBParam * const pParam,
+			 const uint32_t MotionFlags)
 {
 	int i;
 	int32_t bsad[5];
@@ -363,7 +372,7 @@
 				MACROBLOCK * const pMB, const MACROBLOCK * const pMBs,
 				const int x, const int y,
 				const MBParam * const pParam, const uint32_t MotionFlags,
-				const VECTOR * const backup)
+				const VECTOR * const backup, const int bound)
 {
 
 	unsigned int cbp = 0, t = 0, i;
@@ -389,13 +398,14 @@
 		Data8->RefP[3] = Data->RefP[3] + 8*((i&1) + (i>>1)*Data->iEdgedWidth);
 		*Data8->cbp = (Data->cbp[1] & (1<<(5-i))) ? 1:0; /* copy corresponding cbp bit */
 		Data8->lambda[0] = Data->lambda[i];
+		Data8->rel_var8[0] = Data->rel_var8[i];
 
 		if(Data->qpel) {
-			Data8->predMV = get_qpmv2(pMBs, pParam->mb_width, 0, x, y, i);
+			Data8->predMV = get_qpmv2(pMBs, pParam->mb_width, bound, x, y, i);
 			if (i != 0)	t = d_mv_bits(	Data8->currentQMV->x, Data8->currentQMV->y,
 										Data8->predMV, Data8->iFcode, 0) - 2;
 		} else {
-			Data8->predMV = get_pmv2(pMBs, pParam->mb_width, 0, x, y, i);
+			Data8->predMV = get_pmv2(pMBs, pParam->mb_width, bound, x, y, i);
 			if (i != 0)	t = d_mv_bits(	Data8->currentMV->x, Data8->currentMV->y,
 										Data8->predMV, Data8->iFcode, 0) - 2;
 		}
@@ -508,7 +518,7 @@
 	ptr = interpolate8x8_switch2(Data->RefQ + 64, Data->RefP[4], 0, 0, sumx, sumy, Data->iEdgedWidth/2, Data->rounding);
 	transfer_8to16subro(in, Data->CurU, ptr, Data->iEdgedWidth/2);
 	bits += Block_CalcBits(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, 4,
-							Data->scan_table, Data->lambda[4], Data->mpeg_quant_matrices, Data->quant_sq);
+							Data->scan_table, Data->lambda[4], Data->mpeg_quant_matrices, Data->quant_sq, Data->rel_var8[4], Data->metric);
 
 	if (bits >= *Data->iMinSAD) return bits;
 
@@ -516,7 +526,7 @@
 	ptr = interpolate8x8_switch2(Data->RefQ + 64, Data->RefP[5], 0, 0, sumx, sumy, Data->iEdgedWidth/2, Data->rounding);
 	transfer_8to16subro(in, Data->CurV, ptr, Data->iEdgedWidth/2);
 	bits += Block_CalcBits(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, 5,
-							Data->scan_table, Data->lambda[5], Data->mpeg_quant_matrices, Data->quant_sq);
+							Data->scan_table, Data->lambda[5], Data->mpeg_quant_matrices, Data->quant_sq, Data->rel_var8[5], Data->metric);
 
 	bits += BITS_MULT*(mcbpc_inter_tab[(MODE_INTER4V & 7) | ((cbp & 3) << 3)].len - 3); /* 3 were added before */
 
@@ -526,7 +536,7 @@
 
 static int
 findRD_intra(SearchData * const Data, MACROBLOCK * pMB,
-			 const int x, const int y, const int mb_width)
+			 const int x, const int y, const int mb_width, const int bound)
 {
 	unsigned int cbp[2] = {0, 0}, bits[2], i;
 	/* minimum number of bits that WILL be coded in intra - mcbpc 5, cby 2 acdc flag - 1 and DC coeffs - 4*3+2*2 */
@@ -544,7 +554,8 @@
 
 		distortion = Block_CalcBitsIntra(pMB, x, y, mb_width, i, in, coeff, dqcoeff,
 								predictors[i], iQuant, Data->quant_type, bits, cbp, 
-								Data->lambda[i], Data->mpeg_quant_matrices, Data->quant_sq);

xvidcore-1.2.2.tar.bz2/src/motion/estimation_rd_based_bvop.c -> xvidcore-1.3.0.tar.bz2/src/motion/estimation_rd_based_bvop.c Changed

@@ -4,6 +4,7 @@
  *  - Rate-Distortion Based Motion Estimation for B- VOPs  -
  *
  *  Copyright(C) 2004 Radoslaw Czyz <xvid@syskin.cjb.net>
+ *  Copyright(C) 2010 Michael Militzer <michael@xvid.org>
  *
  *  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
@@ -19,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: estimation_rd_based_bvop.c,v 1.10 2005/12/09 04:45:35 syskin Exp $
+ * $Id: estimation_rd_based_bvop.c,v 1.12 2010/12/24 13:21:35 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -45,7 +46,6 @@
 /* rd = BITS_MULT*bits + LAMBDA*distortion */
 #define LAMBDA		( (int)(BITS_MULT*1.0) )
 
-
 static __inline unsigned int
 Block_CalcBits_BVOP(int16_t * const coeff,
 				int16_t * const data,
@@ -57,7 +57,9 @@
 				const unsigned int lambda,
 				const uint16_t * mpeg_quant_matrices,
 				const unsigned int quant_sq,
-				int * const cbpcost)
+				int * const cbpcost,
+				const unsigned int rel_var8,
+				const unsigned int metric)
 {
 	int sum;
 	int bits;
@@ -77,7 +79,9 @@
 		if (quant_type) dequant_h263_inter(dqcoeff, coeff, quant, mpeg_quant_matrices);
 		else dequant_mpeg_inter(dqcoeff, coeff, quant, mpeg_quant_matrices);
 
-		distortion = sse8_16bit(data, dqcoeff, 8*sizeof(int16_t));
+		if (metric) distortion = masked_sseh8_16bit(data, dqcoeff, rel_var8);
+		else distortion = sse8_16bit(data, dqcoeff, 8*sizeof(int16_t));
+
 	} else {
 		const static int16_t zero_block[64] =
 			{
@@ -91,7 +95,10 @@
 				0, 0, 0, 0, 0, 0, 0, 0,
 			};
 		bits = 0;
-		distortion = sse8_16bit(data, zero_block, 8*sizeof(int16_t));
+
+		if (metric) distortion = masked_sseh8_16bit(data, (int16_t * const) zero_block, rel_var8);
+		else distortion = sse8_16bit(data, (int16_t * const) zero_block, 8*sizeof(int16_t));
+
 	}
 
 	return bits + (lambda*distortion)/quant_sq;
@@ -109,7 +116,9 @@
 				const unsigned int lambda,
 				const uint16_t * mpeg_quant_matrices,
 				const unsigned int quant_sq,
-				int * const cbpcost)
+				int * const cbpcost,
+				const unsigned int rel_var8,
+				const unsigned int metric)
 {
 	int sum;
 	int bits;
@@ -129,7 +138,9 @@
 		if (quant_type) dequant_h263_inter(dqcoeff, coeff, quant, mpeg_quant_matrices);
 		else dequant_mpeg_inter(dqcoeff, coeff, quant, mpeg_quant_matrices);
 
-		distortion = sse8_16bit(data, dqcoeff, 8*sizeof(int16_t));
+		if (metric) distortion = masked_sseh8_16bit(data, dqcoeff, rel_var8);
+		else distortion = sse8_16bit(data, dqcoeff, 8*sizeof(int16_t));
+
 	} else {
 		const static int16_t zero_block[64] =
 			{
@@ -143,7 +154,10 @@
 				0, 0, 0, 0, 0, 0, 0, 0,
 			};
 		bits = 0;
-		distortion = sse8_16bit(data, zero_block, 8*sizeof(int16_t));
+
+		if (metric) distortion = masked_sseh8_16bit(data, (int16_t * const) zero_block, rel_var8);
+		else distortion = sse8_16bit(data, (int16_t * const) zero_block, 8*sizeof(int16_t));
+
 	}
 
 	return bits + (lambda*distortion)/quant_sq;
@@ -181,7 +195,7 @@
 		transfer_8to16subro(in, data->Cur + s, ptr + s, data->iEdgedWidth);
 		rd += Block_CalcBits_BVOP(coeff, in, data->dctSpace + 128, data->iQuant, data->quant_type,
 								&cbp, i, data->scan_table, data->lambda[i], data->mpeg_quant_matrices, 
-								data->quant_sq, &cbpcost);
+								data->quant_sq, &cbpcost, data->rel_var8[i], data->metric);
 		if (rd >= data->iMinSAD[0]) return;
 	}
 
@@ -194,7 +208,7 @@
 	transfer_8to16subro(in, data->CurU, ptr, data->iEdgedWidth/2);
 	rd += Block_CalcBits_BVOP(coeff, in, data->dctSpace + 128, data->iQuant, data->quant_type,
 								&cbp, 4, data->scan_table, data->lambda[4], data->mpeg_quant_matrices, 
-								data->quant_sq, &cbpcost);
+								data->quant_sq, &cbpcost, data->rel_var8[4], data->metric);
 	if (rd >= data->iMinSAD[0]) return;
 
 	/* chroma V */
@@ -202,7 +216,7 @@
 	transfer_8to16subro(in, data->CurV, ptr, data->iEdgedWidth/2);
 	rd += Block_CalcBits_BVOP(coeff, in, data->dctSpace + 128, data->iQuant, data->quant_type, 
 								&cbp, 5, data->scan_table, data->lambda[5], data->mpeg_quant_matrices, 
-								data->quant_sq, &cbpcost);
+								data->quant_sq, &cbpcost, data->rel_var8[5], data->metric);
 
 	if (rd < data->iMinSAD[0]) {
 		data->iMinSAD[0] = rd;
@@ -261,7 +275,7 @@
 		transfer_8to16sub2ro(in, data->Cur + s, ReferenceF, ReferenceB, data->iEdgedWidth);
 		rd += Block_CalcBits_BVOP_direct(coeff, in, data->dctSpace + 128, data->iQuant, data->quant_type, 
 										&cbp, k, data->scan_table, data->lambda[k], data->mpeg_quant_matrices, 
-										data->quant_sq, &cbpcost);
+										data->quant_sq, &cbpcost, data->rel_var8[k], data->metric);
 		if (rd > *(data->iMinSAD)) return;
 	}
 	
@@ -277,7 +291,7 @@
 	transfer_8to16sub2ro(in, data->CurU, ReferenceF, ReferenceB, data->iEdgedWidth/2);
 	rd += Block_CalcBits_BVOP_direct(coeff, in, data->dctSpace + 128, data->iQuant, data->quant_type,
 									&cbp, 4, data->scan_table, data->lambda[4], data->mpeg_quant_matrices,
-									data->quant_sq, &cbpcost);
+									data->quant_sq, &cbpcost, data->rel_var8[4], data->metric);
 	if (rd >= data->iMinSAD[0]) return;
 
 	/* chroma V */
@@ -286,7 +300,7 @@
 	transfer_8to16sub2ro(in, data->CurV, ReferenceF, ReferenceB, data->iEdgedWidth/2);
 	rd += Block_CalcBits_BVOP_direct(coeff, in, data->dctSpace + 128, data->iQuant, data->quant_type,
 									&cbp, 5, data->scan_table, data->lambda[5], data->mpeg_quant_matrices,
-									data->quant_sq, &cbpcost);
+									data->quant_sq, &cbpcost, data->rel_var8[5], data->metric);
 
 	if (cbp || x != 0 || y != 0)
 		rd += BITS_MULT * d_mv_bits(x, y, zeroMV, 1, 0);
@@ -351,7 +365,7 @@
 		transfer_8to16sub2ro(in, data->Cur + s, ReferenceF + s, ReferenceB + s, data->iEdgedWidth);
 		rd += Block_CalcBits_BVOP(coeff, in, data->dctSpace + 128, data->iQuant, data->quant_type, &cbp,
 								i, data->scan_table, data->lambda[i], data->mpeg_quant_matrices,
-								data->quant_sq, &cbpcost);
+								data->quant_sq, &cbpcost, data->rel_var8[i], data->metric);
 	}
 
 	/* chroma */
@@ -366,7 +380,7 @@
 	transfer_8to16sub2ro(in, data->CurU, ReferenceF, ReferenceB, data->iEdgedWidth/2);
 	rd += Block_CalcBits_BVOP(coeff, in, data->dctSpace + 128, data->iQuant, data->quant_type, &cbp,
 								4, data->scan_table, data->lambda[4], data->mpeg_quant_matrices, 
-								data->quant_sq, &cbpcost);
+								data->quant_sq, &cbpcost, data->rel_var8[4], data->metric);
 	if (rd >= data->iMinSAD[0]) return;
 
 
@@ -376,7 +390,7 @@
 	transfer_8to16sub2ro(in, data->CurV, ReferenceF, ReferenceB, data->iEdgedWidth/2);
 	rd += Block_CalcBits_BVOP(coeff, in, data->dctSpace + 128, data->iQuant, data->quant_type, &cbp,
 								5, data->scan_table, data->lambda[5], data->mpeg_quant_matrices,
-								data->quant_sq, &cbpcost);
+								data->quant_sq, &cbpcost, data->rel_var8[5], data->metric);
 
 	if (rd < *(data->iMinSAD)) {
 		*data->iMinSAD = rd;
@@ -482,9 +496,11 @@
 					 VECTOR * f_predMV,
 					 VECTOR * b_predMV,
 					 const uint32_t MotionFlags,
+					 const uint32_t VopFlags,
 					 const MBParam * const pParam,
 					 int x, int y,
-					 int best_sad)
+					 int best_sad,
+					 int force_direct)
 {
 	int mode = MODE_DIRECT, k;
 	int f_rd, b_rd, i_rd, d_rd, best_rd;
@@ -496,6 +512,8 @@
 
 	int order[4] = {MODE_DIRECT, MODE_FORWARD, MODE_BACKWARD, MODE_INTERPOLATE};
 
+	Data_d->metric = Data_b->metric = Data_f->metric = Data_i->metric = !!(VopFlags & XVID_VOP_RD_PSNRHVSM);
+
 	Data_d->scan_table = Data_b->scan_table = Data_f->scan_table = Data_i->scan_table 
 		= /*VopFlags & XVID_VOP_ALTERNATESCAN ? scan_tables[2] : */scan_tables[0];
 	*Data_f->cbp = *Data_b->cbp = *Data_i->cbp = *Data_d->cbp = 63;
@@ -510,6 +528,16 @@
 		Data_b->lambda[i] = lam;
 		Data_f->lambda[i] = lam;
 		Data_i->lambda[i] = lam;

xvidcore-1.2.2.tar.bz2/src/motion/gmc.c -> xvidcore-1.3.0.tar.bz2/src/motion/gmc.c Changed

xvidcore-1.2.2.tar.bz2/src/motion/ia64_asm/calc_delta_1.s -> xvidcore-1.3.0.tar.bz2/src/motion/ia64_asm/calc_delta_1.s Changed

xvidcore-1.2.2.tar.bz2/src/motion/ia64_asm/calc_delta_2.s -> xvidcore-1.3.0.tar.bz2/src/motion/ia64_asm/calc_delta_2.s Changed

xvidcore-1.2.2.tar.bz2/src/motion/ia64_asm/calc_delta_3.s -> xvidcore-1.3.0.tar.bz2/src/motion/ia64_asm/calc_delta_3.s Changed

xvidcore-1.2.2.tar.bz2/src/motion/ia64_asm/halfpel8_refine_ia64.s -> xvidcore-1.3.0.tar.bz2/src/motion/ia64_asm/halfpel8_refine_ia64.s Changed

xvidcore-1.2.2.tar.bz2/src/motion/ia64_asm/sad_ia64.s -> xvidcore-1.3.0.tar.bz2/src/motion/ia64_asm/sad_ia64.s Changed

xvidcore-1.2.2.tar.bz2/src/motion/motion.h -> xvidcore-1.3.0.tar.bz2/src/motion/motion.h Changed

@@ -21,7 +21,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: motion.h,v 1.24.2.1 2009/05/25 09:03:47 Isibaar Exp $
+ *  $Id: motion.h,v 1.27.2.1 2010/12/28 19:19:57 Isibaar Exp $
  *
  ***************************************************************************/
 
@@ -54,7 +54,8 @@
 					const IMAGE * const pRefV,
 					const IMAGE * const pRefHV,
 					const IMAGE * const pGMC,
-					const uint32_t iLimit);
+					const uint32_t iLimit,
+					const int num_slices);
 
 void
 MotionEstimationBVOP(MBParam * const pParam,
@@ -70,7 +71,8 @@
 						const IMAGE * const b_ref,
 						const IMAGE * const b_refH,
 						const IMAGE * const b_refV,
-						const IMAGE * const b_refHV);
+						const IMAGE * const b_refHV,
+						const int num_slices);
 
 void
 GMEanalysis(const MBParam * const pParam,
@@ -78,7 +80,8 @@
 			const FRAMEINFO * const reference,
 			const IMAGE * const pRefH,
 			const IMAGE * const pRefV,
-			const IMAGE * const pRefHV);
+			const IMAGE * const pRefHV,
+			const int num_slices);
 
 WARPPOINTS
 GlobalMotionEst(MACROBLOCK * const pMBs,
@@ -87,7 +90,8 @@
 				const FRAMEINFO * const reference,
 				const IMAGE * const pRefH,
 				const IMAGE * const pRefV,
-				const IMAGE * const pRefHV);
+				const IMAGE * const pRefHV,
+				const int num_slices);
 
 int
 GlobalMotionEstRefine(
@@ -139,7 +143,8 @@
 					const uint32_t height,
 					const uint32_t edged_width,
 					const int32_t quarterpel,
-					const int32_t rounding);
+					const int32_t rounding,
+					uint8_t * const tmp);
 
 void
 MBMotionCompensationBVOP(MBParam * pParam,
@@ -155,6 +160,7 @@
 							const IMAGE * const b_refh,
 							const IMAGE * const b_refv,
 							const IMAGE * const b_refhv,
-							int16_t * dct_codes);
+							int16_t * dct_codes,
+							uint8_t * const tmp);
 
 #endif							/* _MOTION_H_ */

xvidcore-1.2.2.tar.bz2/src/motion/motion_comp.c -> xvidcore-1.3.0.tar.bz2/src/motion/motion_comp.c 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: motion_comp.c,v 1.23 2004/12/05 13:01:27 syskin Exp $
+ * $Id: motion_comp.c,v 1.24.2.1 2010/12/28 19:19:57 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -170,13 +170,12 @@
 					const uint32_t height,
 					const uint32_t edged_width,
 					const int32_t quarterpel,
-					const int32_t rounding)
+					const int32_t rounding,
+					uint8_t * const tmp)
 {
 	int32_t dx;
 	int32_t dy;
 
-	uint8_t * const tmp = refv->u;
-
 	if (mb->mode == MODE_NOT_CODED) {	/* quick copy for early SKIP */
 /* early SKIP is only activated in P-VOPs, not in S-VOPs, so mcsel can never be 1 */
 
@@ -269,14 +268,14 @@
 						const IMAGE * const b_refh,
 						const IMAGE * const b_refv,
 						const IMAGE * const b_refhv,
-						int16_t * dct_codes)
+						int16_t * dct_codes,
+						uint8_t * const tmp)
 {
 	const uint32_t edged_width = pParam->edged_width;
 	int32_t dx, dy, b_dx, b_dy, sumx, sumy, b_sumx, b_sumy;
 	int k;
 	const int quarterpel = pParam->vol_flags & XVID_VOL_QUARTERPEL;
 	const uint8_t * ptr1, * ptr2;
-	uint8_t * const tmp = f_refv->u;
 	const VECTOR * const fmvs = (quarterpel ? mb->qmvs : mb->mvs);
 	const VECTOR * const bmvs = (quarterpel ? mb->b_qmvs : mb->b_mvs);

xvidcore-1.2.2.tar.bz2/src/motion/motion_smp.h -> xvidcore-1.3.0.tar.bz2/src/motion/motion_smp.h Changed

@@ -22,74 +22,38 @@
  *  along with this program ; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- * $Id: motion_smp.h,v 1.5 2008/11/26 01:04:34 Isibaar Exp $
+ * $Id: motion_smp.h,v 1.8 2010/12/18 16:02:00 Isibaar Exp $
  *
  ****************************************************************************/
 
 #ifndef SMP_MOTION_H
 #define SMP_MOTION_H
 
-#ifdef WIN32
-
-# include <windows.h>
-# define pthread_t				HANDLE
-# define pthread_create(t,u,f,d) *(t)=CreateThread(NULL,0,f,d,0,NULL)
-# define pthread_join(t,s)		{ WaitForSingleObject(t,INFINITE); \
-									CloseHandle(t); } 
-# define sched_yield()			Sleep(0);
-static __inline int pthread_num_processors_np() 
-{
-	DWORD p_aff, s_aff, r = 0;
-	GetProcessAffinityMask(GetCurrentProcess(), (PDWORD_PTR) &p_aff, (PDWORD_PTR) &s_aff);
-	for(; p_aff != 0; p_aff>>=1) r += p_aff&1;
-	return r;
-}
-
-#elif defined(SYS_BEOS)
-
-# include <kernel/OS.h>
-# define pthread_t				thread_id
-# define pthread_create(t,u,f,d) { *(t)=spawn_thread(f,"",10,d); \
-								resume_thread(*(t)); }
-# define pthread_join(t,s)		wait_for_thread(t,(long*)s)
-# define sched_yield()			snooze(0) /* is this correct? */
-
-#else
-# include <pthread.h>
-#endif
-
 typedef struct
 {
 	pthread_t handle;		/* thread's handle */
-	const MBParam * pParam;
-	const FRAMEINFO * current;
-	const FRAMEINFO * reference;
-	const IMAGE * pRefH;
-	const IMAGE * pRefV;
-	const IMAGE * pRefHV;
-	const IMAGE * pGMC;
+	const FRAMEINFO *current;
 	uint8_t * RefQ;
+	int y_row;
 	int y_step;
 	int start_y;
+	int stop_y;
 	int * complete_count_self;
 	int * complete_count_above;
 	
-	/* bvop stuff */
-	int time_bp, time_pp;
-	const MACROBLOCK * f_mbs;
-	const IMAGE * pRef;
-	const IMAGE * fRef;
-	const IMAGE * fRefH;
-	const IMAGE * fRefV;
-	const IMAGE * fRefHV;
-
 	int MVmax, mvSum, mvCount;		/* out */
 
-	int minfcode, minbcode;
-} SMPmotionData;
+	uint32_t minfcode, minbcode;
+
+	uint8_t *tmp_buffer;
+	Bitstream *bs;
+
+	Statistics *sStat;
+	void *pEnc;
+} SMPData;
 
 
-void MotionEstimateSMP(SMPmotionData * h);
-void SMPMotionEstimationBVOP(SMPmotionData * h);
+void MotionEstimateSMP(SMPData * h);
+void SMPMotionEstimationBVOP(SMPData * h);
 
 #endif /* SMP_MOTION_H */

xvidcore-1.2.2.tar.bz2/src/motion/sad.c -> xvidcore-1.3.0.tar.bz2/src/motion/sad.c Changed

@@ -3,7 +3,8 @@
  *  XVID MPEG-4 VIDEO CODEC
  *  - Sum Of Absolute Difference related code -
  *
- *  Copyright(C) 2001-2003 Peter Ross <pross@xvid.org>
+ *  Copyright(C) 2001-2010 Peter Ross <pross@xvid.org>
+ *               2010      Michael Militzer <michael@xvid.org>
  *
  *  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
@@ -19,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: sad.c,v 1.16 2004/04/12 15:49:56 edgomez Exp $
+ * $Id: sad.c,v 1.17.2.1 2010/12/28 19:19:57 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -38,6 +39,10 @@
 sse8Func_16bitPtr sse8_16bit;
 sse8Func_8bitPtr sse8_8bit;
 
+sseh8Func_16bitPtr sseh8_16bit;
+coeff8_energyFunc_Ptr coeff8_energy;
+blocksum8Func_Ptr blocksum8;
+
 sadInitFuncPtr sadInit;
 
 
@@ -329,3 +334,92 @@
 
 	return(sse);
 }
+
+
+/* PSNR-HVS-M helper functions */
+
+static const int16_t iMask_Coeff[64] = { 
+        0, 29788, 32767, 20479, 13653, 8192, 6425, 5372,
+    27306, 27306, 23405, 17246, 12603, 5650, 5461, 5958,
+    23405, 25205, 20479, 13653,  8192, 5749, 4749, 5851,
+    23405, 19275, 14894, 11299,  6425, 3766, 4096, 5285,
+    18204, 14894,  8856,  5851,  4819, 3006, 3181, 4255,
+    13653,  9362,  5958,  5120,  4045, 3151, 2900, 3562,
+     6687,  5120,  4201,  3766,  3181, 2708, 2730, 3244,
+     4551,  3562,  3449,  3344,  2926, 3277, 3181, 3310
+};
+
+/* Calculate CSF weighted energy of DCT coefficients */
+
+uint32_t 
+coeff8_energy_c(const int16_t * dct)
+{
+	int x, y;
+	uint32_t sum_a = 0;
+
+	for (y = 0; y < 8; y += 2) {
+		for (x = 0; x < 8; x += 2) {
+			int16_t a0 = ((dct[y*8+x]<<4) * iMask_Coeff[y*8+x]) >> 16;
+			int16_t a1 = ((dct[y*8+x+1]<<4) * iMask_Coeff[y*8+x+1]) >> 16;
+			int16_t a2 = ((dct[(y+1)*8+x]<<4) * iMask_Coeff[(y+1)*8+x]) >> 16;
+			int16_t a3 = ((dct[(y+1)*8+x+1]<<4) * iMask_Coeff[(y+1)*8+x+1]) >> 16;
+
+			sum_a += ((a0*a0 + a1*a1 + a2*a2 + a3*a3) >> 3);
+		}
+	}
+
+	return sum_a;
+}
+
+/* Calculate MSE of DCT coeffs reduced by masking effect */
+
+uint32_t 
+sseh8_16bit_c(const int16_t * cur, const int16_t * ref, uint16_t mask)
+{
+	int j, i;
+	uint32_t mse_h = 0;
+
+	for (j = 0; j < 8; j++) {
+		for (i = 0; i < 8; i++) {
+			uint32_t t = (mask * Inv_iMask_Coeff[j*8+i] + 32) >> 7;
+			uint16_t u = abs(cur[j*8+i] - ref[j*8+i]) << 4;
+			uint16_t thresh = (t < 65536) ? t : 65535;
+
+			if (u < thresh)	
+				u = 0; /* The error is not perceivable */
+			else 
+				u -= thresh; 
+
+			u = ((u + iCSF_Round[j*8 + i]) * iCSF_Coeff[j*8 + i]) >> 16;
+
+			mse_h += (uint32_t) (u * u);
+		}
+	}
+
+	return mse_h;
+}
+
+/* Sums all pixels of 8x8 block */
+
+uint32_t
+blocksum8_c(const uint8_t * cur, int stride, uint16_t sums[4], uint32_t squares[4])
+{
+	int i, j;
+	uint32_t sum = 0;
+
+	sums[0] = sums[1] = sums[2] = sums[3] = 0;
+	squares[0] = squares[1] = squares[2] = squares[3] = 0;
+
+	for (j = 0; j < 8; j++) {
+		for (i = 0; i < 8; i++) {
+			uint8_t p = cur[j*stride + i];
+
+			sums[(j>>2)*2 + (i>>2)] += p;
+			squares[(j>>2)*2 + (i>>2)] += p*p;
+
+			sum += p;
+		}
+	}
+
+	return sum;
+}

xvidcore-1.2.2.tar.bz2/src/motion/sad.h -> xvidcore-1.3.0.tar.bz2/src/motion/sad.h Changed

@@ -3,7 +3,7 @@
  *  XVID MPEG-4 VIDEO CODEC
  *  - Sum Of Absolute Difference header  -
  *
- *  Copyright(C) 2001-2003 Peter Ross <pross@xvid.org>
+ *  Copyright(C) 2001-2010 Peter Ross <pross@xvid.org>
  *
  *  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
@@ -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: sad.h,v 1.24 2008/11/26 01:04:34 Isibaar Exp $
+ * $Id: sad.h,v 1.25.2.1 2010/12/28 19:19:57 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -181,4 +181,69 @@
 sse8Func_8bit sse8_8bit_mmx;
 #endif
 
+typedef uint32_t (sseh8Func_16bit)(const int16_t * cur,
+								   const int16_t * ref,
+								   uint16_t mask);
+typedef sseh8Func_16bit *sseh8Func_16bitPtr;
+extern sseh8Func_16bitPtr sseh8_16bit;
+
+sseh8Func_16bit sseh8_16bit_c;
+#if defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64)
+sseh8Func_16bit sseh8_16bit_sse2;
+#endif
+
+typedef uint32_t (coeff8_energyFunc)(const int16_t * cur);
+typedef coeff8_energyFunc *coeff8_energyFunc_Ptr;
+extern coeff8_energyFunc_Ptr coeff8_energy;
+
+coeff8_energyFunc coeff8_energy_c;
+#if defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64)
+coeff8_energyFunc coeff8_energy_sse2;
+#endif
+
+typedef uint32_t (blocksum8Func)(const uint8_t * cur, int stride, 
+								 uint16_t sums[4], uint32_t squares[4]);
+typedef blocksum8Func *blocksum8Func_Ptr;
+extern blocksum8Func_Ptr blocksum8;
+
+blocksum8Func blocksum8_c;
+#if defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64)
+blocksum8Func blocksum8_sse2;
+#endif
+
+/* Coeffs for MSE_H calculation */
+
+static const int16_t Inv_iMask_Coeff[64] = {    
+       0,   155,   128,   328,   737,  2048,  3329,  4763,
+     184,   184,   251,   462,   865,  4306,  4608,  3872,
+     251,   216,   328,   737,  2048,  4159,  6094,  4014,
+     251,   370,   620,  1076,  3329,  9688,  8192,  4920,
+     415,   620,  1752,  4014,  5919, 15207, 13579,  7589,
+     737,  1568,  3872,  5243,  8398, 13844, 16345, 10834,
+    3073,  5243,  7787,  9688, 13579, 18741, 18433, 13057,
+    6636, 10834, 11552, 12294, 16056, 12800, 13579, 12545
+};
+
+static const uint16_t iCSF_Coeff[64] = { 
+	26353, 38331, 42164, 26353, 17568, 10541, 8268, 6912,
+	35137, 35137, 30117, 22192, 16217,  7270, 7027, 7666,
+	30117, 32434, 26353, 17568, 10541,  7397, 6111, 7529,
+	30117, 24803, 19166, 14539,  8268,  4846, 5271, 6801,
+	23425, 19166, 11396,  7529,  6201,  3868, 4094, 5476,
+	17568, 12047,  7666,  6588,  5205,  4054, 3731, 4583,
+	 8605,  6588,  5406,  4846,  4094,  3485, 3514, 4175,
+	 5856,  4583,  4438,  4302,  3765,  4216, 4094, 4259
+};
+
+static const uint16_t iCSF_Round[64] = {  
+	1, 1, 1, 1, 2, 3, 4, 5,
+	1, 1, 1, 1, 2, 5, 5, 4,
+	1, 1, 1, 2, 3, 4, 5, 4,
+	1, 1, 2, 2, 4, 7, 6, 5,
+	1, 2, 3, 4, 5, 8, 8, 6,
+	2, 3, 4, 5, 6, 8, 9, 7,
+	4, 5, 6, 7, 8, 9, 9, 8,
+	6, 7, 7, 8, 9, 8, 8, 8
+};
+
 #endif							/* _ENCODER_SAD_H_ */

xvidcore-1.2.2.tar.bz2/src/motion/x86_asm/sad_3dn.asm -> xvidcore-1.3.0.tar.bz2/src/motion/x86_asm/sad_3dn.asm Changed

xvidcore-1.2.2.tar.bz2/src/motion/x86_asm/sad_3dne.asm -> xvidcore-1.3.0.tar.bz2/src/motion/x86_asm/sad_3dne.asm Changed

xvidcore-1.2.2.tar.bz2/src/motion/x86_asm/sad_mmx.asm -> xvidcore-1.3.0.tar.bz2/src/motion/x86_asm/sad_mmx.asm Changed

xvidcore-1.2.2.tar.bz2/src/motion/x86_asm/sad_sse2.asm -> xvidcore-1.3.0.tar.bz2/src/motion/x86_asm/sad_sse2.asm Changed

@@ -3,7 +3,8 @@
 ; *  XVID MPEG-4 VIDEO CODEC
 ; *  - SSE2 optimized SAD operators -
 ; *
-; *  Copyright(C) 2003 Pascal Massimino <skal@planet-d.net>
+; *  Copyright(C) 2003-2010 Pascal Massimino <skal@planet-d.net>
+; *               2008-2010 Michael Militzer <michael@xvid.org>
 ; *
 ; *
 ; *  This program is free software; you can redistribute it and/or modify it
@@ -20,7 +21,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: sad_sse2.asm,v 1.16.2.2 2009/05/28 08:42:37 Isibaar Exp $
+; * $Id: sad_sse2.asm,v 1.21 2010/11/28 15:18:21 Isibaar Exp $
 ; *
 ; ***************************************************************************/
 
@@ -35,6 +36,61 @@
 ALIGN SECTION_ALIGN
 zero    times 4   dd 0
 
+ALIGN SECTION_ALIGN
+ones    times 8   dw 1
+
+ALIGN SECTION_ALIGN
+round32 times 4   dd 32
+
+;=============================================================================
+; Coeffs for MSE_H calculation
+;=============================================================================
+
+ALIGN SECTION_ALIGN
+iMask_Coeff:
+  dw     0, 29788, 32767, 20479, 13653, 8192, 6425, 5372,
+  dw 27306, 27306, 23405, 17246, 12603, 5650, 5461, 5958,
+  dw 23405, 25205, 20479, 13653,  8192, 5749, 4749, 5851,
+  dw 23405, 19275, 14894, 11299,  6425, 3766, 4096, 5285,
+  dw 18204, 14894,  8856,  5851,  4819, 3006, 3181, 4255,
+  dw 13653,  9362,  5958,  5120,  4045, 3151, 2900, 3562,
+  dw  6687,  5120,  4201,  3766,  3181, 2708, 2730, 3244,
+  dw  4551,  3562,  3449,  3344,  2926, 3277, 3181, 3310
+
+ALIGN SECTION_ALIGN
+Inv_iMask_Coeff:
+  dd    0,   155,   128,   328,   737,  2048,  3329,  4763,
+  dd  184,   184,   251,   462,   865,  4306,  4608,  3872,
+  dd  251,   216,   328,   737,  2048,  4159,  6094,  4014,
+  dd  251,   370,   620,  1076,  3329,  9688,  8192,  4920,
+  dd  415,   620,  1752,  4014,  5919, 15207, 13579,  7589,
+  dd  737,  1568,  3872,  5243,  8398, 13844, 16345, 10834,
+  dd 3073,  5243,  7787,  9688, 13579, 18741, 18433, 13057,
+  dd 6636, 10834, 11552, 12294, 16056, 12800, 13579, 12545
+
+ALIGN SECTION_ALIGN
+iCSF_Coeff:
+  dw 26353, 38331, 42164, 26353, 17568, 10541, 8268, 6912,
+  dw 35137, 35137, 30117, 22192, 16217,  7270, 7027, 7666,
+  dw 30117, 32434, 26353, 17568, 10541,  7397, 6111, 7529,
+  dw 30117, 24803, 19166, 14539,  8268,  4846, 5271, 6801,
+  dw 23425, 19166, 11396,  7529,  6201,  3868, 4094, 5476,
+  dw 17568, 12047,  7666,  6588,  5205,  4054, 3731, 4583,
+  dw  8605,  6588,  5406,  4846,  4094,  3485, 3514, 4175,
+  dw  5856,  4583,  4438,  4302,  3765,  4216, 4094, 4259
+
+ALIGN SECTION_ALIGN
+iCSF_Round:
+  dw 1, 1, 1, 1, 2, 3, 4, 5,
+  dw 1, 1, 1, 1, 2, 5, 5, 4,
+  dw 1, 1, 1, 2, 3, 4, 5, 4,
+  dw 1, 1, 2, 2, 4, 7, 6, 5,
+  dw 1, 2, 3, 4, 5, 8, 8, 6,
+  dw 2, 3, 4, 5, 6, 8, 9, 7,
+  dw 4, 5, 6, 7, 8, 9, 9, 8,
+  dw 6, 7, 7, 8, 9, 8, 8, 8
+
+
 ;=============================================================================
 ; Code
 ;=============================================================================
@@ -47,6 +103,10 @@
 cglobal  sad16_sse3
 cglobal  dev16_sse3
 
+cglobal  sseh8_16bit_sse2
+cglobal  coeff8_energy_sse2
+cglobal  blocksum8_sse2
+
 ;-----------------------------------------------------------------------------
 ; uint32_t sad16_sse2 (const uint8_t * const cur, <- assumed aligned!
 ;                      const uint8_t * const ref,
@@ -63,18 +123,17 @@
   movdqa  xmm3, [_EAX+TMP0]
   lea _EAX,[_EAX+2*TMP0]
   psadbw  xmm0, xmm2
-  paddusw xmm6,xmm0
+  paddusw xmm4,xmm0
   psadbw  xmm1, xmm3
-  paddusw xmm6,xmm1
+  paddusw xmm4,xmm1
 %endmacro
 
 %macro SAD16_SSE2_SSE3 1
-  PUSH_XMM6_XMM7
   mov _EAX, prm1 ; cur (assumed aligned)
   mov TMP1, prm2 ; ref
   mov TMP0, prm3 ; stride
 
-  pxor xmm6, xmm6 ; accum
+  pxor xmm4, xmm4 ; accum
 
   SAD_16x16_SSE2 %1
   SAD_16x16_SSE2 %1
@@ -85,11 +144,10 @@
   SAD_16x16_SSE2 %1
   SAD_16x16_SSE2 %1
 
-  pshufd  xmm5, xmm6, 00000010b
-  paddusw xmm6, xmm5
-  pextrw  eax, xmm6, 0
+  pshufd  xmm5, xmm4, 00000010b
+  paddusw xmm4, xmm5
+  pextrw  eax, xmm4, 0
 
-  POP_XMM6_XMM7
   ret
 %endmacro
 
@@ -113,20 +171,19 @@
   %1 xmm0, [_EAX]
   %1 xmm1, [_EAX+TMP0]
   lea _EAX, [_EAX+2*TMP0]    ; + 2*stride
-  psadbw xmm0, xmm7
-  paddusw xmm6, xmm0
-  psadbw xmm1, xmm7
-  paddusw xmm6, xmm1
+  psadbw xmm0, xmm5
+  paddusw xmm4, xmm0
+  psadbw xmm1, xmm5
+  paddusw xmm4, xmm1
 %endmacro
 
 
 %macro MEAN16_SSE2_SSE3 1
-  PUSH_XMM6_XMM7
   mov _EAX, prm1   ; src
   mov TMP0, prm2   ; stride
 
-  pxor xmm6, xmm6     ; accum
-  pxor xmm7, xmm7     ; zero
+  pxor xmm4, xmm4     ; accum
+  pxor xmm5, xmm5     ; zero
 
   MEAN_16x16_SSE2 %1
   MEAN_16x16_SSE2 %1
@@ -140,13 +197,13 @@
 
   mov _EAX, prm1       ; src again
 
-  pshufd   xmm7, xmm6, 10b
-  paddusw  xmm7, xmm6
-  pxor     xmm6, xmm6     ; zero accum
-  psrlw    xmm7, 8        ; => Mean
-  pshuflw  xmm7, xmm7, 0  ; replicate Mean
-  packuswb xmm7, xmm7
-  pshufd   xmm7, xmm7, 00000000b
+  pshufd   xmm5, xmm4, 10b
+  paddusw  xmm5, xmm4
+  pxor     xmm4, xmm4     ; zero accum
+  psrlw    xmm5, 8        ; => Mean
+  pshuflw  xmm5, xmm5, 0  ; replicate Mean
+  packuswb xmm5, xmm5
+  pshufd   xmm5, xmm5, 00000000b
 
   MEAN_16x16_SSE2 %1
   MEAN_16x16_SSE2 %1
@@ -158,11 +215,10 @@
   MEAN_16x16_SSE2 %1
   MEAN_16x16_SSE2 %1
 
-  pshufd   xmm7, xmm6, 10b
-  paddusw  xmm7, xmm6
-  pextrw eax, xmm7, 0
+  pshufd   xmm5, xmm4, 10b
+  paddusw  xmm5, xmm4
+  pextrw eax, xmm5, 0
 
-  POP_XMM6_XMM7
   ret
 %endmacro
 
@@ -176,8 +232,303 @@
   MEAN16_SSE2_SSE3 lddqu
 ENDFUNC
 
+;-----------------------------------------------------------------------------
+; uint32_t coeff8_energy_sse2(const int16_t * dct);
+;-----------------------------------------------------------------------------
+

xvidcore-1.2.2.tar.bz2/src/motion/x86_asm/sad_xmm.asm -> xvidcore-1.3.0.tar.bz2/src/motion/x86_asm/sad_xmm.asm Changed

xvidcore-1.2.2.tar.bz2/src/nasm.inc -> xvidcore-1.3.0.tar.bz2/src/nasm.inc Changed

xvidcore-1.2.2.tar.bz2/src/plugins/plugin_2pass1.c -> xvidcore-1.3.0.tar.bz2/src/plugins/plugin_2pass1.c Changed

@@ -1,12 +1,12 @@
 /******************************************************************************
  *
- *  XviD Bit Rate Controller Library
+ *  Xvid Bit Rate Controller Library
  *  - VBR 2 pass bitrate controler implementation -
  *
  *  Copyright (C) 2002-2003 Edouard Gomez <ed.gomez@free.fr>
  *
  *  The curve treatment algorithm is the one implemented by Foxer <email?> and
- *  Dirk Knop <dknop@gwdg.de> for the XviD vfw dynamic library.
+ *  Dirk Knop <dknop@gwdg.de> for the Xvid vfw dynamic library.
  *
  *  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
@@ -22,7 +22,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: plugin_2pass1.c,v 1.3 2004/07/18 12:46:44 syskin Exp $
+ * $Id: plugin_2pass1.c,v 1.4 2010/03/09 10:00:14 Isibaar Exp $
  *
  *****************************************************************************/

xvidcore-1.2.2.tar.bz2/src/plugins/plugin_2pass2.c -> xvidcore-1.3.0.tar.bz2/src/plugins/plugin_2pass2.c Changed

@@ -1,15 +1,15 @@
 /******************************************************************************
  *
- *  XviD Bit Rate Controller Library
+ *  Xvid Bit Rate Controller Library
  *  - VBR 2 pass bitrate controller implementation -
  *
- *  Copyright (C)      2002 Foxer <email?>
+ *  Copyright (C)      2002 Benjamin Lambert <foxer@hotmail.com>
  *                     2002 Dirk Knop <dknop@gwdg.de>
  *                2002-2003 Edouard Gomez <ed.gomez@free.fr>
  *                     2003 Pete Ross <pross@xvid.org>
  *
  *  This curve treatment algorithm is the one originally implemented by Foxer
- *  and tuned by Dirk Knop for the XviD vfw frontend.
+ *  and tuned by Dirk Knop for the Xvid vfw frontend.
  *
  *  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
@@ -25,7 +25,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: plugin_2pass2.c,v 1.7 2005/03/27 03:59:42 suxen_drol Exp $
+ * $Id: plugin_2pass2.c,v 1.10.2.1 2010/12/28 19:19:57 Isibaar Exp $
  *
  *****************************************************************************/
 
@@ -219,6 +219,8 @@
 	 *--------------------------------*/
 	double desired_total;
 	double real_total;
+	
+	int scaled_frames;
 } rc_2pass2_t;
 
 
@@ -344,6 +346,7 @@
 
 	rc->fq_error = 0;
 	rc->min_quant = 1;
+	rc->scaled_frames = 0;
 
 	/* Count frames (and intra frames) in the stats file, store the result into
 	 * the rc structure */
@@ -464,7 +467,7 @@
 
 	/* vbv_size==0 switches VBV check off */
 	if (rc->param.vbv_size > 0)  {
-		const double fps = (double)create->fbase/(double)create->fincr;
+		const float fps = (float)((double)create->fbase/(double)create->fincr);
 		int status = check_curve_for_vbv_compliancy(rc, fps);
 
 		if (status) {
@@ -794,8 +797,10 @@
 		rc->last_quant[s->type-1] = data->quant;
 
 	/* Don't forget to force 1st pass frame type ;-) */
-	data->type = s->type;
+	if (rc->scaled_frames)
+		data->type = s->type;
 
+	rc->scaled_frames++;
 	return 0;
 }
 
@@ -954,7 +959,8 @@
 	/* We are done with the file */
 	fclose(f);
 
-	return(0);
+	if (!rc->num_keyframes) return (-1); /* No keyframes? Then something is wrong */
+	else return(0);
 }
 
 /* open stats file(s) and read into rc->stats array */
@@ -1355,7 +1361,7 @@
 		if (rc->count[i] == 0 || rc->pb_iboost_tax_ratio == 0) {
 			rc->avg_length[i] = 1;
 		} else {
-			rc->avg_length[i] = rc->tot_scaled_length[i];
+			rc->avg_length[i] = (double)rc->tot_scaled_length[i];
 
 			if (i == (XVID_TYPE_IVOP-1)) {
 				/* I Frames total has to be added the boost total */
@@ -1440,17 +1446,17 @@
  * aren't...)
  *
  * DivX profiles have 2 criteria: VBV as in MPEG standard
- *                                a limit on peak bitrate for any 3 seconds
+ *                                a limit on peak bitrate for any 1 second
  *
  * But if VBV is fulfilled, peakrate is automatically fulfilled in any profile
- * define so far, so we check for it (for completeness) but correct only VBV
+ * defined so far, so we check for it (for completeness) but correct only VBV
  *
  *****************************************************************************/
 
 #define VBV_COMPLIANT 0
-#define VBV_UNDERFLOW 1 /* video buffer runs empty */
-#define VBV_OVERFLOW 2  /* doesn't exist for VBR encoding */
-#define VBV_PEAKRATE 4  /* peak bitrate (within 3s) violated */
+#define VBV_UNDERFLOW 1  /* video buffer runs empty */
+#define VBV_OVERFLOW  2  /* doesn't exist for VBR encoding */
+#define VBV_PEAKRATE  4  /* peak bitrate (within 1s) violated */
 
 static int
 check_curve_for_vbv_compliancy(rc_2pass2_t * rc, const float fps)
@@ -1458,14 +1464,14 @@
 	/* We do all calculations in float, for higher accuracy,
 	 * and in bytes for convenience.
 	 *
-	 * typical values from DivX Home Theater profile:
+	 * typical values from e.g. Home profile:
 	 *  vbv_size= 384*1024 (384kB)
 	 *  vbv_initial= 288*1024 (75% fill)
 	 *  maxrate= 4854000 (4.854MBps)
 	 *  peakrate= 8000000 (8MBps)
 	 *
-	 *  PAL: offset3s = 75 (3 seconds of 25fps)
-	 *  NTSC: offset3s = 90 (3 seconds of 29.97fps) or 72 (3 seconds of 23.976fps)
+	 *  PAL: offset1s = 25 (1 second of 25fps)
+	 *  NTSC: offset1s = 30 (1 second of 29.97fps) or 24 (1 second of 23.976fps)
 	 */
 
 	const float vbv_size = (float)rc->param.vbv_size/8.f;
@@ -1476,8 +1482,8 @@
 	const float peakrate = (float)rc->param.vbv_peakrate;
 	const float r0 = (int)(maxrate/fps+0.5)/8.f;
 
-	int bytes3s = 0;
-	int offset3s = (int)(3.f*fps+0.5);
+	int bytes1s = 0;
+	int offset1s = (int)(1.f*fps+0.5);
 	int i;
 
 	/* 1Gbit should be enough to inuitialize the vbvmin
@@ -1485,13 +1491,13 @@
 	vbvmin = 1000*1000*1000;
 
 	for (i=0; i<rc->num_frames; i++) {
-		/* DivX 3s peak bitrate check  */
-		bytes3s += rc->stats[i].scaled_length;
-		if (i>=offset3s)
-			bytes3s -= rc->stats[i-offset3s].scaled_length;
+		/* DivX 1s peak bitrate check  */
+		bytes1s += rc->stats[i].scaled_length;
+		if (i>=offset1s)
+			bytes1s -= rc->stats[i-offset1s].scaled_length;
 
     /* ignore peakrate constraint if peakrate is <= 0.f */
-		if (peakrate>0.f && 8.f*bytes3s > 3*peakrate)
+		if (peakrate>0.f && 8.f*bytes1s > peakrate)
 			return(VBV_PEAKRATE);
 
 		/* update vbv fill level */
@@ -1538,7 +1544,7 @@
 	const float vbv_size = (float)rc->param.vbv_size/8.f;
 	const float vbv_initial = (float)rc->param.vbv_initial/8.f;
 
-	const float maxrate = 0.9*rc->param.vbv_maxrate;
+	const float maxrate = 0.9f*rc->param.vbv_maxrate;
 	const float vbv_low = 0.10f*vbv_size;
 	const float r0 = (int)(maxrate/fps+0.5)/8.f;

xvidcore-1.2.2.tar.bz2/src/plugins/plugin_dump.c -> xvidcore-1.3.0.tar.bz2/src/plugins/plugin_dump.c Changed

xvidcore-1.2.2.tar.bz2/src/plugins/plugin_lumimasking.c -> xvidcore-1.3.0.tar.bz2/src/plugins/plugin_lumimasking.c Changed

@@ -1,10 +1,11 @@
 /*****************************************************************************
  *
  *  XVID MPEG-4 VIDEO CODEC
- *  - XviD plugin: performs a lumimasking algorithm on encoded frame  -
+ *  - Xvid plugin: performs a lumimasking algorithm on encoded frame  -
  *
  *  Copyright(C) 2002-2003 Peter Ross <pross@xvid.org>
  *               2002      Christoph Lampert <gruel@web.de>
+ *               2008      Jason Garrett-Glaser <darkshikari@gmail.com>
  *
  *  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
@@ -20,11 +21,13 @@
  *  along with this program ; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- * $Id: plugin_lumimasking.c,v 1.6 2006/05/06 04:37:15 syskin Exp $
+ * $Id: plugin_lumimasking.c,v 1.9 2010/03/09 10:00:14 Isibaar Exp $
  *
  ****************************************************************************/
 
 #include <stdlib.h>
+#include <stdio.h>
+#include <math.h>
 
 #include "../xvid.h"
 #include "../global.h"
@@ -39,6 +42,7 @@
 {
 	float *quant;
 	float *val;
+	int method;      
 } lumi_data_t;
 
 /*****************************************************************************
@@ -98,10 +102,12 @@
 lumi_plg_create(xvid_plg_create_t *create, lumi_data_t **handle)
 {
 	lumi_data_t *lumi;
+	xvid_plugin_lumimasking_t *param = (xvid_plugin_lumimasking_t *) create->param;
 
 	if ((lumi = (lumi_data_t*)malloc(sizeof(lumi_data_t))) == NULL)
 		return(XVID_ERR_MEMORY);
 
+	lumi->method = 0;
 	lumi->quant = (float*)malloc(create->mb_width*create->mb_height*sizeof(float));
 	if (lumi->quant == NULL) {
 		free(lumi);
@@ -115,6 +121,9 @@
 		return(XVID_ERR_MEMORY);
 	}
 
+	if (param != NULL) 
+		lumi->method = param->method;
+
 	/* Bind the data structure to the handle */
 	*handle = lumi;
 
@@ -172,12 +181,17 @@
 	const float GlobalDarkThres = 60;
 	const float GlobalBrightThres = 170;
 
+	/* Arbitrary centerpoint for variance-based AQ.  Roughly the same as used in x264. */
+	float center = 14000.f;
+	/* Arbitrary strength for variance-based AQ. */
+	float strength = 0.2f;
+
 	if (data->type == XVID_TYPE_BVOP) return 0;
 
 	/* Do this for all macroblocks individually  */
 	for (j = 0; j < data->mb_height; j++) {
 		for (i = 0; i < data->mb_width; i++) {
-			int k, l, sum = 0;
+			int k, l, sum = 0, sum_of_squares = 0;	
 			unsigned char *ptr;
 
 			/* Initialize the current quant value to the frame quant */
@@ -189,49 +203,79 @@
 			ptr  = data->current.plane[0];
 			ptr += 16*j*data->current.stride[0] + 16*i;
 
-			/* Accumulate luminance */
-			for (k = 0; k < 16; k++)
-				for (l = 0; l < 16; l++)
-					 sum += ptr[k*data->current.stride[0] + l];
+			if (handle->method) { /* Variance masking mode */
+				int variance = 0;
+				/* Accumulate sum and sum of squares over the MB */
+				for (k = 0; k < 16; k++) {
+ 					for (l = 0; l < 16; l++) {
+						int val = ptr[k*data->current.stride[0] + l];
+						sum += val;
+						sum_of_squares += val * val;
+					}
+				}
+				/* Variance = SSD - SAD^2 / (numpixels) */
+				variance = sum_of_squares - sum * sum / 256;
+				handle->val[j*data->mb_width + i] = (float)variance;
+			}
+			else { /* Luminance masking mode */
+				/* Accumulate luminance */
+				for (k = 0; k < 16; k++)
+					for (l = 0; l < 16; l++)
+						 sum += ptr[k*data->current.stride[0] + l];
 			
-			handle->val[j*data->mb_width + i] = (float)sum/256.0f;
+				handle->val[j*data->mb_width + i] = (float)sum/256.0f;
 
-			/* Accumulate the global frame luminance */
-			global += (float)sum/256.0f;
+				/* Accumulate the global frame luminance */
+				global += (float)sum/256.0f;
+			}
 		}
 	}
 
-	/* Normalize the global luminance accumulator */
-	global /= data->mb_width*data->mb_height;
-
-	DarkThres = DarkThres*global/127.0f;
-	BrightThres = BrightThres*global/127.0f;
-
-
-	/* Apply luminance masking only to frames where the global luminance is
-	 * higher than DarkThreshold and lower than Bright Threshold */
-	 if ((global < GlobalBrightThres) && (global > GlobalDarkThres)) {
-
-		/* Apply the luminance masking formulas to all MBs */
-		for (i = 0; i < data->mb_height; i++) {
-			for (j = 0; j < data->mb_width; j++) {
-				if (handle->val[i*data->mb_width + j] < DarkThres)
-					handle->quant[i*data->mb_width + j] *= 1 + DarkAmpl * (DarkThres - handle->val[i*data->mb_width + j]) / DarkThres;
-				else if (handle->val[i*data->mb_width + j] > BrightThres)
-					handle->quant[i*data->mb_width + j] *= 1 + BrightAmpl * (handle->val[i*data->mb_width + j] - BrightThres) / (255 - BrightThres);
+	if (handle->method) { /* Variance masking */
+		/* Apply the variance masking formula to all MBs */
+		for (i = 0; i < data->mb_height; i++)
+		{
+			for (j = 0; j < data->mb_width; j++)
+			{
+				float value = handle->val[i*data->mb_width + j];
+				float qscale_diff = strength * logf(value / center);
+				handle->quant[i*data->mb_width + j] *= (1.0f + qscale_diff);
+ 			}
+ 		}
+	}
+	else { /* Luminance masking */
+		/* Normalize the global luminance accumulator */
+		global /= data->mb_width*data->mb_height;
+
+		DarkThres = DarkThres*global/127.0f;
+		BrightThres = BrightThres*global/127.0f;
+
+
+		/* Apply luminance masking only to frames where the global luminance is
+		 * higher than DarkThreshold and lower than Bright Threshold */
+		 if ((global < GlobalBrightThres) && (global > GlobalDarkThres)) {
+
+			/* Apply the luminance masking formulas to all MBs */
+			for (i = 0; i < data->mb_height; i++) {
+				for (j = 0; j < data->mb_width; j++) {
+					if (handle->val[i*data->mb_width + j] < DarkThres)
+						handle->quant[i*data->mb_width + j] *= 1 + DarkAmpl * (DarkThres - handle->val[i*data->mb_width + j]) / DarkThres;
+					else if (handle->val[i*data->mb_width + j] > BrightThres)
+						handle->quant[i*data->mb_width + j] *= 1 + BrightAmpl * (handle->val[i*data->mb_width + j] - BrightThres) / (255 - BrightThres);
+				}
 			}
 		}
 	}
 
-	 /* Normalize the quantizer field */
-	 data->quant = normalize_quantizer_field(handle->quant,
+	/* Normalize the quantizer field */
+	data->quant = normalize_quantizer_field(handle->quant,
 											 data->dquant,
 											 data->mb_width*data->mb_height,
 											 data->quant,
 											 MAX(2,data->quant + data->quant/2));
 
-	 /* Plugin job finished */
-	 return(0);
+	/* Plugin job finished */
+	return(0);
 }
 
 /*----------------------------------------------------------------------------

xvidcore-1.2.2.tar.bz2/src/plugins/plugin_psnr.c -> xvidcore-1.3.0.tar.bz2/src/plugins/plugin_psnr.c Changed

xvidcore-1.3.0.tar.bz2/src/plugins/plugin_psnrhvsm.c Added

@@ -0,0 +1,350 @@
+/*****************************************************************************
+ *
+ *  XVID MPEG-4 VIDEO CODEC
+ *  - PSNR-HVS-M plugin: computes the PSNR-HVS-M metric -
+ *
+ *  Copyright(C) 2010 Michael Militzer <michael@xvid.org>
+ *
+ *  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
+ *
+ * $Id: plugin_psnrhvsm.c,v 1.4 2010/11/28 15:18:21 Isibaar Exp $
+ *
+ ****************************************************************************/
+
+/*****************************************************************************
+ *
+ * The PSNR-HVS-M metric is described in the following paper:
+ *
+ * "On between-coefficient contrast masking of DCT basis functions", by
+ * N. Ponomarenko, F. Silvestri, K. Egiazarian, M. Carli, J. Astola, V. Lukin,
+ * in Proceedings of the Third International Workshop on Video Processing and 
+ * Quality Metrics for Consumer Electronics VPQM-07, January, 2007, 4 p.
+ *
+ * http://www.ponomarenko.info/psnrhvsm.htm
+ *
+ ****************************************************************************/
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <math.h>
+#include "../portab.h"
+#include "../xvid.h"
+#include "../dct/fdct.h"
+#include "../image/image.h"
+#include "../motion/sad.h"
+#include "../utils/mem_transfer.h"
+#include "../utils/emms.h"
+
+typedef struct { 
+
+	uint64_t mse_sum_y; /* for avrg psnr-hvs-m */
+	uint64_t mse_sum_u;
+	uint64_t mse_sum_v;
+
+	long frame_cnt;
+
+} psnrhvsm_data_t; /* internal plugin data */
+
+
+#if 0 /* Floating-point implementation: Slow but accurate */
+
+static const float CSF_Coeff[64] = { 
+	1.608443f, 2.339554f, 2.573509f, 1.608443f, 1.072295f, 0.643377f, 0.504610f, 0.421887f,
+	2.144591f, 2.144591f, 1.838221f, 1.354478f, 0.989811f, 0.443708f, 0.428918f, 0.467911f,
+	1.838221f, 1.979622f, 1.608443f, 1.072295f, 0.643377f, 0.451493f, 0.372972f, 0.459555f,
+	1.838221f, 1.513829f, 1.169777f, 0.887417f, 0.504610f, 0.295806f, 0.321689f, 0.415082f,
+	1.429727f, 1.169777f, 0.695543f, 0.459555f, 0.378457f, 0.236102f, 0.249855f, 0.334222f,
+	1.072295f, 0.735288f, 0.467911f, 0.402111f, 0.317717f, 0.247453f, 0.227744f, 0.279729f,
+	0.525206f, 0.402111f, 0.329937f, 0.295806f, 0.249855f, 0.212687f, 0.214459f, 0.254803f,
+	0.357432f, 0.279729f, 0.270896f, 0.262603f, 0.229778f, 0.257351f, 0.249855f, 0.259950f
+};
+
+static const float Mask_Coeff[64] = { 
+	0.000000f, 0.826446f, 1.000000f, 0.390625f, 0.173611f, 0.062500f, 0.038447f, 0.026874f,
+	0.694444f, 0.694444f, 0.510204f, 0.277008f, 0.147929f, 0.029727f, 0.027778f, 0.033058f,
+	0.510204f, 0.591716f, 0.390625f, 0.173611f, 0.062500f, 0.030779f, 0.021004f, 0.031888f,
+	0.510204f, 0.346021f, 0.206612f, 0.118906f, 0.038447f, 0.013212f, 0.015625f, 0.026015f,
+	0.308642f, 0.206612f, 0.073046f, 0.031888f, 0.021626f, 0.008417f, 0.009426f, 0.016866f,
+	0.173611f, 0.081633f, 0.033058f, 0.024414f, 0.015242f, 0.009246f, 0.007831f, 0.011815f,
+	0.041649f, 0.024414f, 0.016437f, 0.013212f, 0.009426f, 0.006830f, 0.006944f, 0.009803f,
+	0.019290f, 0.011815f, 0.011080f, 0.010412f, 0.007972f, 0.010000f, 0.009426f, 0.010203f
+};
+
+static uint32_t calc_SSE_H(int16_t *DCT_A, int16_t *DCT_B, uint8_t *IMG_A, uint8_t *IMG_B, int stride)
+{
+	int x, y, i, j;
+	uint32_t Global_A, Global_B, Sum_A = 0, Sum_B = 0;
+	uint32_t Local[8] = {0, 0, 0, 0, 0, 0, 0, 0};
+	uint32_t Local_Square[8] = {0, 0, 0, 0, 0, 0, 0, 0};
+	float MASK_A = 0.f, MASK_B = 0.f;
+	float Mult1 = 1.f, Mult2 = 1.f;
+	uint32_t MSE_H = 0;
+
+	/* Step 1: Calculate CSF weighted energy of DCT coefficients */
+	for (y = 0; y < 8; y++) {
+		for (x = 0; x < 8; x++) {
+			MASK_A += (float)(DCT_A[y*8 + x]*DCT_A[y*8 + x])*Mask_Coeff[y*8 + x];
+			MASK_B += (float)(DCT_B[y*8 + x]*DCT_B[y*8 + x])*Mask_Coeff[y*8 + x];
+		}
+	}
+
+	/* Step 2: Determine local variances compared to entire block variance */
+	for (y = 0; y < 2; y++) {
+		for (x = 0; x < 2; x++) {
+			for (j = 0; j < 4; j++) {
+				for (i = 0; i < 4; i++) {
+					uint8_t A = IMG_A[(y*4+j)*stride + 4*x + i];
+					uint8_t B = IMG_B[(y*4+j)*stride + 4*x + i];
+
+					Local[y*2 + x] += A;
+					Local[y*2 + x + 4] += B;
+					Local_Square[y*2 + x] += A*A;
+					Local_Square[y*2 + x + 4] += B*B;
+				}
+			}
+		}
+	}
+
+	Global_A = Local[0] + Local[1] + Local[2] + Local[3];
+	Global_B = Local[4] + Local[5] + Local[6] + Local[7];
+
+	for (i = 0; i < 8; i++)
+		Local[i] = (Local_Square[i]<<4) - (Local[i]*Local[i]); /* 16*Var(Di) */
+
+	Local_Square[0] += (Local_Square[1] + Local_Square[2] + Local_Square[3]);
+	Local_Square[4] += (Local_Square[5] + Local_Square[6] + Local_Square[7]);
+
+	Global_A = (Local_Square[0]<<6) - Global_A*Global_A; /* 64*Var(D) */
+	Global_B = (Local_Square[4]<<6) - Global_B*Global_B; /* 64*Var(D) */
+
+	/* Step 3: Calculate contrast masking threshold */
+	if (Global_A) 
+		Mult1 = (float)(Local[0]+Local[1]+Local[2]+Local[3])/((float)(Global_A)/4.f);
+
+	if (Global_B)
+		Mult2 = (float)(Local[4]+Local[5]+Local[6]+Local[7])/((float)(Global_B)/4.f);
+
+	MASK_A = (float)sqrt(MASK_A * Mult1) / 32.f;
+	MASK_B = (float)sqrt(MASK_B * Mult2) / 32.f;
+
+	if (MASK_B > MASK_A) MASK_A = MASK_B; /* MAX(MASK_A, MASK_B) */
+
+	/* Step 4: Calculate MSE of DCT coeffs reduced by masking effect */
+	for (j = 0; j < 8; j++) {
+		for (i = 0; i < 8; i++) {
+			float u = (float)abs(DCT_A[j*8 + i] - DCT_B[j*8 + i]);
+
+			if ((i|j)>0) {
+				if (u < (MASK_A / Mask_Coeff[j*8 + i])) 
+					u = 0; /* The error is not perceivable */
+				else
+					u -= (MASK_A / Mask_Coeff[j*8 + i]);
+			}
+			
+			MSE_H += (uint32_t) ((16.f*(u * CSF_Coeff[j*8 + i])*(u * CSF_Coeff[j*8 + i])) + 0.5f);
+		}
+	}
+	return MSE_H; /* Fixed-point value right-shifted by four */
+}
+
+#else 
+
+static uint32_t calc_SSE_H(int16_t *DCT_A, int16_t *DCT_B, uint8_t *IMG_A, uint8_t *IMG_B, int stride)
+{
+	DECLARE_ALIGNED_MATRIX(sums, 1, 8, uint16_t, CACHE_LINE);
+	DECLARE_ALIGNED_MATRIX(squares, 1, 8, uint32_t, CACHE_LINE);
+	uint32_t i, Global_A, Global_B, Sum_A = 0, Sum_B = 0;
+	uint32_t local[8], MASK_A, MASK_B, Mult1 = 64, Mult2 = 64;
+
+	/* Step 1: Calculate CSF weighted energy of DCT coefficients */
+	
+	Sum_A = coeff8_energy(DCT_A);
+	Sum_B = coeff8_energy(DCT_B);
+
+	/* Step 2: Determine local variances compared to entire block variance */
+	
+	Global_A = blocksum8(IMG_A, stride, sums, squares);
+	Global_B = blocksum8(IMG_B, stride, &sums[4], &squares[4]);
+
+	for (i = 0; i < 8; i++)
+		local[i] = (squares[i]<<4) - (sums[i]*sums[i]); /* 16*Var(Di) */
+
+	squares[0] += (squares[1] + squares[2] + squares[3]);
+	squares[4] += (squares[5] + squares[6] + squares[7]);
+
+	Global_A = (squares[0]<<6) - Global_A*Global_A; /* 64*Var(D) */
+	Global_B = (squares[4]<<6) - Global_B*Global_B; /* 64*Var(D) */
+
+	/* Step 3: Calculate contrast masking threshold */
+	
+	if (Global_A) 
+		Mult1 = ((local[0]+local[1]+local[2]+local[3])<<8) / Global_A;
+
+	if (Global_B)
+		Mult2 = ((local[4]+local[5]+local[6]+local[7])<<8) / Global_B;
+
+	MASK_A = isqrt(2*Sum_A*Mult1) + 16;
+	MASK_B = isqrt(2*Sum_B*Mult2) + 16;

xvidcore-1.2.2.tar.bz2/src/plugins/plugin_single.c -> xvidcore-1.3.0.tar.bz2/src/plugins/plugin_single.c Changed

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- *  XviD Standard Plugins
+ *  Xvid Standard Plugins
  *  - single-pass bitrate controller implementation -
  *
  *  Copyright(C) 2002-2004 Benjamin Lambert <foxer@hotmail.com>
@@ -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: plugin_single.c,v 1.3 2004/08/10 22:34:32 edgomez Exp $
+ * $Id: plugin_single.c,v 1.4.2.1 2010/12/28 19:19:57 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -30,7 +30,7 @@
 #include "../xvid.h"
 #include "../image/image.h"
 
-#define DEFAULT_INITIAL_QUANTIZER 4
+#define DEFAULT_INITIAL_QUANTIZER 8
 
 #define DEFAULT_BITRATE 900000	/* 900kbps */
 #define DEFAULT_DELAY_FACTOR 16
@@ -187,8 +187,8 @@
 	rc->total_size += data->length;
 
 	/* Compute the deviation from expected total size */
-	deviation = 
-		rc->total_size - rc->bytes_per_sec * rc->time;
+	deviation = (int64_t)
+		(rc->total_size - rc->bytes_per_sec * rc->time);
 
 	averaging_period = (double) rc->averaging_period;

xvidcore-1.2.2.tar.bz2/src/plugins/x86_asm/plugin_ssim-a.asm -> xvidcore-1.3.0.tar.bz2/src/plugins/x86_asm/plugin_ssim-a.asm Changed

xvidcore-1.2.2.tar.bz2/src/portab.h -> xvidcore-1.3.0.tar.bz2/src/portab.h Changed

@@ -3,7 +3,7 @@
  *  XVID MPEG-4 VIDEO CODEC
  *  - Portable macros, types and inlined assembly -
  *
- *  Copyright(C) 2002      Michael Militzer <isibaar@xvid.org>
+ *  Copyright(C) 2002-2010 Michael Militzer <isibaar@xvid.org>
  *               2002-2003 Peter Ross <pross@xvid.org>
  *               2002-2003 Edouard Gomez <ed.gomez@free.fr>
  *
@@ -21,7 +21,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: portab.h,v 1.58.2.1 2008/11/30 16:38:31 Isibaar Exp $
+ * $Id: portab.h,v 1.60 2010/03/09 10:00:14 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -39,7 +39,7 @@
 #endif
 
 /*****************************************************************************
- *  Types used in XviD sources
+ *  Types used in Xvid sources
  ****************************************************************************/
 
 /*----------------------------------------------------------------------------
@@ -68,6 +68,45 @@
 #endif
 
 /*****************************************************************************
+ *  Some things that are OS dependant
+ ****************************************************************************/
+
+#ifdef WIN32
+
+# include <windows.h>
+# define pthread_t				HANDLE
+# define pthread_create(t,u,f,d) *(t)=CreateThread(NULL,0,f,d,0,NULL)
+# define pthread_join(t,s)		{ WaitForSingleObject(t,INFINITE); \
+									CloseHandle(t); } 
+# define sched_yield()			Sleep(0);
+static __inline int pthread_num_processors_np() 
+{
+	DWORD p_aff, s_aff, r = 0;
+	GetProcessAffinityMask(GetCurrentProcess(), (PDWORD_PTR) &p_aff, (PDWORD_PTR) &s_aff);
+	for(; p_aff != 0; p_aff>>=1) r += p_aff&1;
+	return r;
+}
+
+#elif defined(__amigaos4__)
+
+# include <pthread.h>
+# include <proto/dos.h>
+# define sched_yield() IDOS->Delay(1)
+
+#elif defined(SYS_BEOS)
+
+# include <kernel/OS.h>
+# define pthread_t				thread_id
+# define pthread_create(t,u,f,d) { *(t)=spawn_thread(f,"",10,d); \
+								resume_thread(*(t)); }
+# define pthread_join(t,s)		wait_for_thread(t,(long*)s)
+# define sched_yield()			snooze(0) /* is this correct? */
+
+#else
+# include <pthread.h>
+#endif
+
+/*****************************************************************************
  *  Some things that are only architecture dependant
  ****************************************************************************/
 
@@ -92,7 +131,7 @@
 #        define uintptr_t uint64_t
 #    endif
 #else
-#    error You are trying to compile XviD without defining address bus size.
+#    error You are trying to compile Xvid without defining address bus size.
 #endif
 
 /*****************************************************************************
@@ -193,10 +232,10 @@
 
 /*----------------------------------------------------------------------------
   | msvc Not given architecture - This is probably an user who tries to build
-  | XviD the wrong way.
+  | Xvid the wrong way.
  *---------------------------------------------------------------------------*/
 #    else
-#        error You are trying to compile XviD without defining the architecture type.
+#        error You are trying to compile Xvid without defining the architecture type.
 #    endif
 
 
@@ -327,10 +366,10 @@
 
 /*----------------------------------------------------------------------------
   | gcc Not given architecture - This is probably an user who tries to build
-  | XviD the wrong way.
+  | Xvid the wrong way.
  *---------------------------------------------------------------------------*/
 #    else
-#        error You are trying to compile XviD without defining the architecture type.
+#        error You are trying to compile Xvid without defining the architecture type.
 #    endif
 
 
@@ -400,10 +439,10 @@
 
 /*----------------------------------------------------------------------------
   | watcom Not given architecture - This is probably an user who tries to build
-  | XviD the wrong way.
+  | Xvid the wrong way.
  *---------------------------------------------------------------------------*/
 #    else
-#        error You are trying to compile XviD without defining the architecture type.
+#        error You are trying to compile Xvid without defining the architecture type.
 #    endif

xvidcore-1.2.2.tar.bz2/src/prediction/mbprediction.c -> xvidcore-1.3.0.tar.bz2/src/prediction/mbprediction.c 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: mbprediction.c,v 1.18 2005/11/22 10:23:01 suxen_drol Exp $
+ * $Id: mbprediction.c,v 1.20 2010/12/18 16:02:00 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -226,7 +226,7 @@
 
 	dct_codes[0] += predictors[0];	/* dc prediction */
 	pCurrent[0] = dct_codes[0]*iDcScaler;
-	if (!bsversion || bsversion > BS_VERSION_BUGGY_DC_CLIPPING) {
+	if (bsversion > BS_VERSION_BUGGY_DC_CLIPPING) {
 		pCurrent[0] = CLIP(pCurrent[0], -2048, 2047);
 	}
 
@@ -409,7 +409,8 @@
 			 uint32_t x,
 			 uint32_t y,
 			 uint32_t mb_width,
-			 int16_t qcoeff[6 * 64])
+			 int16_t qcoeff[6 * 64],
+			 const int bound)
 {
 
 	int32_t j;
@@ -426,7 +427,7 @@
 			iDcScaler = get_dc_scaler(iQuant, j<4);
 
 			predict_acdc(frame->mbs, x, y, mb_width, j, &qcoeff[j * 64],
-						 iQuant, iDcScaler, predictors[j], 0);
+						 iQuant, iDcScaler, predictors[j], bound);
 
 			if ((frame->vop_flags & XVID_VOP_HQACPRED))
 				S += calc_acdc_bits(pMB, j, &qcoeff[j * 64], iDcScaler, predictors[j]);

xvidcore-1.2.2.tar.bz2/src/prediction/mbprediction.h -> xvidcore-1.3.0.tar.bz2/src/prediction/mbprediction.h Changed

@@ -3,7 +3,7 @@
  *  XVID MPEG-4 VIDEO CODEC
  *  - Prediction header -
  *
- *  Copyright(C) 2002-2003 xvid team <xvid-devel@xvid.org>
+ *  Copyright(C) 2002-2010 Michael Militzer <michael@xvid.org>
  *
  *  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
@@ -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: mbprediction.h,v 1.25 2005/09/13 12:12:15 suxen_drol Exp $
+ * $Id: mbprediction.h,v 1.26 2010/12/18 16:02:00 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -43,7 +43,8 @@
 				uint32_t x_pos,	/* <-- The x position of the MB to be searched	*/
 				uint32_t y_pos,	/* <-- The y position of the MB to be searched	*/
 				uint32_t x_dim,	/* <-- Number of macroblocks in a row		*/
-				int16_t * qcoeff);	/* <-> The quantized DCT coefficients	*/
+				int16_t * qcoeff,	/* <-> The quantized DCT coefficients	*/
+				const int bound);
 
 void add_acdc(MACROBLOCK * pMB,
 			uint32_t block,

xvidcore-1.2.2.tar.bz2/src/quant/ia64_asm/quant_h263_ia64.s -> xvidcore-1.3.0.tar.bz2/src/quant/ia64_asm/quant_h263_ia64.s Changed

xvidcore-1.2.2.tar.bz2/src/quant/quant_matrix.c -> xvidcore-1.3.0.tar.bz2/src/quant/quant_matrix.c Changed

xvidcore-1.2.2.tar.bz2/src/quant/x86_asm/quantize_h263_3dne.asm -> xvidcore-1.3.0.tar.bz2/src/quant/x86_asm/quantize_h263_3dne.asm 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: quantize_h263_3dne.asm,v 1.9.2.2 2009/05/28 15:04:35 Isibaar Exp $
+; * $Id: quantize_h263_3dne.asm,v 1.12 2009/09/16 17:07:58 Isibaar Exp $
 ; *
 ; *************************************************************************/
 ;
@@ -137,7 +137,6 @@
 
 TEXT
 
-
 ;-----------------------------------------------------------------------------
 ;
 ; uint32_t quant_h263_intra_3dne(int16_t * coeff,
@@ -352,18 +351,18 @@
   mov _EBP, [_ESP + (4+4)*PTR_SIZE]   ; dcscalar
                                     ; NB -- there are 3 pushes in the function preambule and one more
                                     ; in "quant_intra 0", thus an added offset of 16 bytes
-  movsx _EAX, word [byte _ECX]        ; DC
+  movsx _EAX, word [byte _ECX]      ; DC
 
   quant_intra 1
-  mov _EDI, _EAX
-  sar _EDI, 31                       ; sign(DC)
-  shr _EBP, byte 1                   ; _EBP = dcscalar/2
+  mov _EDI, _EAX 
+  sar _EDI, 31                        ; sign(DC)
+  shr _EBP, byte 1                    ; _EBP = dcscalar/2
 
   quant_intra 2
   sub _EAX, _EDI                      ; DC (+1)
   xor _EBP, _EDI                      ; sign(DC) dcscalar /2  (-1)
   mov _EDI, [_ESP + (4+4)*PTR_SIZE]   ; dscalar
-  lea _EAX, [byte _EAX + _EBP]         ; DC + sign(DC) dcscalar/2
+  lea _EAX, [byte _EAX + _EBP]        ; DC + sign(DC) dcscalar/2
   mov _EBP, [byte _ESP]
 
   quant_intra 3
@@ -402,15 +401,15 @@
   movsx _EAX, word [byte _ECX]        ; DC
 
   quant_intra1 1
-  mov _EDI, _EAX
-  sar _EDI, 31                       ; sign(DC)
-  shr _EBP, byte 1                   ; _EBP = dcscalar /2
+  mov _EDI, _EAX 
+  sar _EDI, 31                        ; sign(DC)
+  shr _EBP, byte 1                    ; _EBP = dcscalar /2
 
   quant_intra1 2
   sub _EAX, _EDI                      ; DC (+1)
   xor _EBP, _EDI                      ; sign(DC) dcscalar /2  (-1)
   mov _EDI, [_ESP + (4+4)*PTR_SIZE]   ; dcscalar
-  lea _EAX, [byte _EAX + _EBP]         ; DC + sign(DC) dcscalar /2
+  lea _EAX, [byte _EAX + _EBP]        ; DC + sign(DC) dcscalar /2
   mov _EBP, [byte _ESP]
 
   quant_intra1 3
@@ -931,7 +930,4 @@
   ret
 ENDFUNC
 
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK

xvidcore-1.2.2.tar.bz2/src/quant/x86_asm/quantize_h263_mmx.asm -> xvidcore-1.3.0.tar.bz2/src/quant/x86_asm/quantize_h263_mmx.asm Changed

@@ -21,7 +21,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: quantize_h263_mmx.asm,v 1.11.2.3 2009/05/28 08:42:37 Isibaar Exp $
+; * $Id: quantize_h263_mmx.asm,v 1.16 2009/09/16 17:07:58 Isibaar Exp $
 ; *
 ; ****************************************************************************/
 
@@ -121,7 +121,7 @@
   movsx _EAX, word [_EAX]  ; data[0]
   
   sar TMP0, 1              ; dcscalar /2
-  mov TMP1, _EAX
+  mov TMP1, _EAX 
   sar TMP1, 31             ; sgn(data[0])
   xor TMP0,TMP1            ; *sgn(data[0])
   sub _EAX,TMP1
@@ -253,7 +253,7 @@
   movsx _EAX, word [_EAX]      ; data[0]
  
   mov TMP0,prm4     ; dcscalar
-  mov TMP1,_EAX
+  mov TMP1, _EAX 
   sar TMP0,1
   add _EAX,TMP0
   sub TMP1,TMP0
@@ -491,8 +491,7 @@
   pxor xmm5, xmm5                           ; sum
 
   lea TMP0, [mmx_sub]
-  movq mm0, [TMP0 + _EAX*8 - 8]             ; sub
-  movq2dq xmm6, mm0                         ; load into low 8 bytes
+  movq xmm6, [TMP0 + _EAX*8 - 8]             ; sub
   movlhps xmm6, xmm6                        ; duplicate into high 8 bytes
 
   cmp al, 1
@@ -500,12 +499,11 @@
 
 .qes2_not1:
   lea TMP0, [mmx_div]
-  movq mm0, [TMP0 + _EAX*8 - 8]          ; divider
+  movq xmm7, [TMP0 + _EAX*8 - 8]          ; divider
 
   xor TMP0, TMP0
   mov _EAX, prm2      ; data
 
-  movq2dq xmm7, mm0
   movlhps xmm7, xmm7
 
 ALIGN SECTION_ALIGN
@@ -538,7 +536,7 @@
   jnz .qes2_loop
 
 .qes2_done:
-  movdqu xmm6, [plus_one]
+  movdqa xmm6, [plus_one]
   pmaddwd xmm5, xmm6
   movhlps xmm6, xmm5
   paddd xmm5, xmm6
@@ -1070,8 +1068,4 @@
   ret
 ENDFUNC
 
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK

xvidcore-1.2.2.tar.bz2/src/quant/x86_asm/quantize_mpeg_mmx.asm -> xvidcore-1.3.0.tar.bz2/src/quant/x86_asm/quantize_mpeg_mmx.asm Changed

@@ -21,7 +21,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: quantize_mpeg_mmx.asm,v 1.13.2.1 2009/05/28 08:42:37 Isibaar Exp $
+; * $Id: quantize_mpeg_mmx.asm,v 1.16 2009/09/16 17:07:58 Isibaar Exp $
 ; *
 ; *************************************************************************/
 
@@ -187,12 +187,13 @@
   QUANT_MMX(7)
 
   ; calculate DC
-  movsx _EAX, word [_EAX]   ; data[0]
-  mov TMP0, prm4            ; dcscalar
+  movsx _EAX, word [_EAX]  ; data[0]
+  mov TMP0, prm4           ; dcscalar
   mov _EDX, _EAX 
-  shr TMP0, 1               ; TMP0 = dcscalar/2
-  sar _EDX, 31              ; TMP1 = sign extend of _EAX (ready for division too)
-  xor TMP0, _EDX            ; adjust TMP0 according to the sign of data[0]
+  shr TMP0, 1              ; TMP0 = dcscalar/2
+  sar _EDX, 31             ; TMP1 = sign extend of _EAX (ready for division too)
+
+  xor TMP0, _EDX           ; adjust TMP0 according to the sign of data[0]
   sub TMP0, _EDX 
   add _EAX, TMP0
 
@@ -657,8 +658,4 @@
   ret
 ENDFUNC
 
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK

xvidcore-1.2.2.tar.bz2/src/quant/x86_asm/quantize_mpeg_xmm.asm -> xvidcore-1.3.0.tar.bz2/src/quant/x86_asm/quantize_mpeg_xmm.asm Changed

xvidcore-1.2.2.tar.bz2/src/utils/emms.h -> xvidcore-1.3.0.tar.bz2/src/utils/emms.h Changed

xvidcore-1.2.2.tar.bz2/src/utils/ia64_asm/mem_transfer_ia64.s -> xvidcore-1.3.0.tar.bz2/src/utils/ia64_asm/mem_transfer_ia64.s Changed

xvidcore-1.2.2.tar.bz2/src/utils/mbtransquant.c -> xvidcore-1.3.0.tar.bz2/src/utils/mbtransquant.c Changed

@@ -1,10 +1,10 @@
 /*****************************************************************************
  *
  *  XVID MPEG-4 VIDEO CODEC
- *  - MB Transfert/Quantization functions -
+ *  - MB Transfer/Quantization functions -
  *
- *  Copyright(C) 2001-2003  Peter Ross <pross@xvid.org>
- *               2001-2003  Michael Militzer <isibaar@xvid.org>
+ *  Copyright(C) 2001-2010  Peter Ross <pross@xvid.org>
+ *               2001-2010  Michael Militzer <michael@xvid.org>
  *               2003       Edouard Gomez <ed.gomez@free.fr>
  *
  *  This program is free software ; you can redistribute it and/or modify
@@ -21,7 +21,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: mbtransquant.c,v 1.32 2006/07/10 08:09:59 syskin Exp $
+ * $Id: mbtransquant.c,v 1.33 2010/11/28 15:18:21 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -40,6 +40,7 @@
 #include "../dct/fdct.h"
 #include "../dct/idct.h"
 #include "../quant/quant.h"
+#include "../motion/sad.h"
 #include "../encoder.h"
 
 #include  "../quant/quant_matrix.h"
@@ -187,7 +188,9 @@
 					   const uint16_t * const QuantMatrix,
 					   int Non_Zero,
 					   int Sum,
-					   int Lambda_Mod);
+					   int Lambda_Mod,
+					   const uint32_t rel_var8,
+					   const int Metric);
 
 /* Quantize all blocks -- Inter mode */
 static __inline uint8_t
@@ -240,7 +243,9 @@
 										 matrix,
 										 63,
 										 sum,
-										 pMB->lambda[i]);
+										 pMB->lambda[i],
+										 pMB->rel_var8[i],
+										 !!(frame->vop_flags & XVID_VOP_RD_PSNRHVSM));
 		}
 		stop_quant_timer();
 
@@ -763,6 +768,23 @@
 
 #define TRELLIS_MIN_EFFORT	3
 
+static __inline uint32_t calc_mseh(int16_t dQ, uint16_t mask, 
+                                   const int index, const int Lambda)
+{
+	uint32_t t = (mask * Inv_iMask_Coeff[index] + 32) >> 7;
+	uint16_t u = abs(dQ) << 4;
+	uint16_t thresh = (t < 65536) ? t : 65535;
+
+	if (u <= thresh)	
+		u = 0; /* The error is not perceivable */
+	else 
+		u -= thresh; 
+
+	u = ((u + iCSF_Round[index]) * iCSF_Coeff[index]) >> 16;
+
+	return (((Lambda*u*u)>>4) + 4*Lambda*dQ*dQ) / 5;
+}
+
 /* this routine has been strippen of all debug code */
 static int
 dct_quantize_trellis_c(int16_t *const Out,
@@ -772,7 +794,9 @@
 					   const uint16_t * const QuantMatrix,
 					   int Non_Zero,
 					   int Sum,
-					   int Lambda_Mod)
+					   int Lambda_Mod,
+					   const uint32_t rel_var8,
+					   const int Metric)
 {
 
 	/* Note: We should search last non-zero coeffs on *real* DCT input coeffs
@@ -797,6 +821,8 @@
 
 	int i, j;
 
+	uint32_t mask = (Metric) ? ((isqrt(2*coeff8_energy(In)*rel_var8) + 48) >> 6) : 0;
+
 	/* source (w/ CBP penalty) */
 	Run_Costs[-1] = 2<<TL_SHIFT;
 
@@ -812,7 +838,7 @@
 
 		const int AC = In[Zigzag[i]];
 		const int Level1 = Out[Zigzag[i]];
-		const unsigned int Dist0 = Lambda* AC*AC;
+		const unsigned int Dist0 = (Metric) ? (calc_mseh(AC, mask, Zigzag[i], Lambda)) : (Lambda* AC*AC);
 		uint32_t Best_Cost = 0xf0000000;
 		Last_Cost += Dist0;
 
@@ -829,7 +855,7 @@
 				Nodes[i].Level = 1;
 				dQ = Lev0 - AC;
 			}
-			Cost0 = Lambda*dQ*dQ;
+			Cost0 = (Metric) ? (calc_mseh(dQ, mask, Zigzag[i], Lambda)) : (Lambda*dQ*dQ);
 
 			Nodes[i].Run = 1;
 			Best_Cost = (Code_Len20[0]<<TL_SHIFT) + Run_Costs[i-1]+Cost0;
@@ -884,8 +910,14 @@
 				Tbl_L2_Last = (Level2>=- 6) ? B16_17_Code_Len_Last[Level2^-1] : Code_Len0;
 			}
 
-			Dist1 = Lambda*dQ1*dQ1;
-			Dist2 = Lambda*dQ2*dQ2;
+			if (Metric) {
+				Dist1 = calc_mseh(dQ1, mask, Zigzag[i], Lambda);
+				Dist2 = calc_mseh(dQ2, mask, Zigzag[i], Lambda);
+			}
+			else {
+				Dist1 = Lambda*dQ1*dQ1;
+				Dist2 = Lambda*dQ2*dQ2;
+			}
 			dDist21 = Dist2-Dist1;
 
 			for(Run=i-Run_Start; Run>0; --Run)

xvidcore-1.2.2.tar.bz2/src/utils/ppc_asm/altivec_trigger.c -> xvidcore-1.3.0.tar.bz2/src/utils/ppc_asm/altivec_trigger.c Changed

xvidcore-1.2.2.tar.bz2/src/utils/x86_asm/cpuid.asm -> xvidcore-1.3.0.tar.bz2/src/utils/x86_asm/cpuid.asm Changed

xvidcore-1.2.2.tar.bz2/src/utils/x86_asm/interlacing_mmx.asm -> xvidcore-1.3.0.tar.bz2/src/utils/x86_asm/interlacing_mmx.asm Changed

xvidcore-1.2.2.tar.bz2/src/utils/x86_asm/mem_transfer_3dne.asm -> xvidcore-1.3.0.tar.bz2/src/utils/x86_asm/mem_transfer_3dne.asm Changed

xvidcore-1.2.2.tar.bz2/src/utils/x86_asm/mem_transfer_mmx.asm -> xvidcore-1.3.0.tar.bz2/src/utils/x86_asm/mem_transfer_mmx.asm Changed

xvidcore-1.2.2.tar.bz2/src/xvid.c -> xvidcore-1.3.0.tar.bz2/src/xvid.c Changed

@@ -4,6 +4,7 @@
  *  - Native API implementation  -
  *
  *  Copyright(C) 2001-2004 Peter Ross <pross@xvid.org>
+ *               2002-2010 Michael Militzer <isibaar@xvid.org>
  *
  *  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
@@ -19,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: xvid.c,v 1.77.2.5 2009/05/25 08:09:23 Isibaar Exp $
+ * $Id: xvid.c,v 1.85.2.2 2011/02/14 17:21:00 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -29,7 +30,23 @@
 #include <time.h>
 
 #if !defined(_WIN32)
-  #include <unistd.h>
+#include <unistd.h>
+#endif
+
+#if defined(__APPLE__) && defined(__MACH__) && !defined(_SC_NPROCESSORS_CONF)
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#ifdef MAX
+#undef MAX
+#endif
+#ifdef MIN
+#undef MIN
+#endif
+#endif
+
+#if defined(__amigaos4__)
+#include <exec/exec.h>
+#include <proto/exec.h>
 #endif
 
 #include "xvid.h"
@@ -58,7 +75,7 @@
 
 #if (defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64)) && defined(_MSC_VER)
 #	include <windows.h>
-#elif defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64) || defined(ARCH_IS_PPC)
+#elif defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64) || (defined(ARCH_IS_PPC) && !defined(__amigaos4__))
 #	include <signal.h>
 #	include <setjmp.h>
 
@@ -71,7 +88,6 @@
 	}
 #endif
 
-
 /*
  * Calls the funcptr, and returns whether SIGILL (illegal instruction) was
  * signalled
@@ -94,7 +110,7 @@
 	}
 	return(0);
 }
-#elif defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64) || defined(ARCH_IS_PPC)
+#elif defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64) || (defined(ARCH_IS_PPC) && !defined(__amigaos4__))
 static int
 sigill_check(void (*func)())
 {
@@ -146,16 +162,26 @@
 #endif
 
 #if defined(ARCH_IS_PPC)
+#if defined(__amigaos4__)
+        {
+                uint32_t vector_unit = VECTORTYPE_NONE;
+                IExec->GetCPUInfoTags(GCIT_VectorUnit, &vector_unit, TAG_END);
+                if (vector_unit == VECTORTYPE_ALTIVEC) {
+                        cpu_flags |= XVID_CPU_ALTIVEC;
+                }
+        }
+#else
 	if (!sigill_check(altivec_trigger))
 		cpu_flags |= XVID_CPU_ALTIVEC;
 #endif
+#endif
 
 	return cpu_flags;
 }
 
 
 /*****************************************************************************
- * XviD Init Entry point
+ * Xvid Init Entry point
  *
  * Well this function initialize all internal function pointers according
  * to the CPU features forced by the library client or autodetected (depending
@@ -303,15 +329,19 @@
 	yv12_to_uyvyi   = yv12_to_uyvyi_c;
 
 	/* Functions used in motion estimation algorithms */
-	calc_cbp   = calc_cbp_c;
-	sad16      = sad16_c;
-	sad8       = sad8_c;
-	sad16bi    = sad16bi_c;
-	sad8bi     = sad8bi_c;
-	dev16      = dev16_c;
-	sad16v	   = sad16v_c;
-	sse8_16bit = sse8_16bit_c;
-	sse8_8bit  = sse8_8bit_c;
+	calc_cbp      = calc_cbp_c;
+	sad16         = sad16_c;
+	sad8          = sad8_c;
+	sad16bi       = sad16bi_c;
+	sad8bi        = sad8bi_c;
+	dev16         = dev16_c;
+	sad16v        = sad16v_c;
+	sse8_16bit    = sse8_16bit_c;
+	sse8_8bit     = sse8_8bit_c;
+
+	sseh8_16bit   = sseh8_16bit_c;
+	coeff8_energy = coeff8_energy_c;
+	blocksum8     = blocksum8_c;
 
 	init_GMC(cpu_flags);
 
@@ -541,8 +571,13 @@
 		dequant_h263_inter = dequant_h263_inter_sse2;
 
 		/* SAD operators */
-		sad16    = sad16_sse2;
-		dev16    = dev16_sse2;
+		sad16       = sad16_sse2;
+		dev16       = dev16_sse2;
+
+		/* PSNR-HVS-M distortion metric */
+		sseh8_16bit   = sseh8_16bit_sse2;
+		coeff8_energy = coeff8_energy_sse2;
+		blocksum8     = blocksum8_sse2;
 
 		/* DCT operators */
 		fdct = fdct_sse2_skal;
@@ -665,9 +700,9 @@
 		return XVID_ERR_VERSION;
 
 	info->actual_version = XVID_VERSION;
-	info->build = "xvid-1.2.2";
+	info->build = "xvid-1.3.0";
 	info->cpu_flags = detect_cpu_flags();
-	info->num_threads = 0;
+	info->num_threads = 0; /* single-thread */
 
 #if defined(_WIN32)
 
@@ -677,10 +712,33 @@
 	info->num_threads = siSysInfo.dwNumberOfProcessors; /* number of _logical_ cores */
   }
 
-#else
+#elif defined(_SC_NPROCESSORS_CONF) /* should be available on Apple too actually */
 
   info->num_threads = sysconf(_SC_NPROCESSORS_CONF);	
 
+#elif defined(__APPLE__) && defined(__MACH__)
+
+  {
+    size_t len;
+    int    mib[2], ncpu;
+
+    mib[0] = CTL_HW;
+    mib[1] = HW_NCPU;
+    len    = sizeof(ncpu);
+    if (sysctl(mib, 2, &ncpu, &len, NULL, 0) == 0)
+      info -> num_threads = ncpu;
+    else
+      info -> num_threads = 1;
+  }
+
+#elif defined(__amigaos4__)
+
+  {
+    uint32_t num_threads = 1;
+    IExec->GetCPUInfoTags(GCIT_NumberOfCPUs, &num_threads, TAG_END);
+    info->num_threads = num_threads;
+  }
+
 #endif
 
 	return 0;
@@ -717,6 +775,15 @@
 						(uint8_t**)convert->output.plane, convert->output.stride,
 						convert->output.csp, convert->interlacing);
 			break;
+		
+		case XVID_CSP_INTERNAL :
+			img.y = (uint8_t*)convert->input.plane[0];
+			img.u = (uint8_t*)convert->input.plane[1];
+			img.v = (uint8_t*)convert->input.plane[2];
+			image_output(&img, width, height, convert->input.stride[0],
+						(uint8_t**)convert->output.plane, convert->output.stride,
+						convert->output.csp, convert->interlacing);

xvidcore-1.2.2.tar.bz2/src/xvid.h -> xvidcore-1.3.0.tar.bz2/src/xvid.h Changed

@@ -1,9 +1,9 @@
 /*****************************************************************************
  *
  * XVID MPEG-4 VIDEO CODEC
- * - XviD Main header file -
+ * - Xvid Main header file -
  *
- *  Copyright(C) 2001-2004 Peter Ross <pross@xvid.org>
+ *  Copyright(C) 2001-2010 Peter Ross <pross@xvid.org>
  *
  *  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
@@ -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: xvid.h,v 1.63.2.3 2009/05/25 08:09:23 Isibaar Exp $
+ * $Id: xvid.h,v 1.74.2.2 2011/02/14 17:21:00 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -57,8 +57,8 @@
 #define XVID_API_MAJOR(a)        (((a)>>16) & 0xff)
 #define XVID_API_MINOR(a)        (((a)>> 0) & 0xff)
 
-#define XVID_VERSION             XVID_MAKE_VERSION(1,2,2)
-#define XVID_API                 XVID_MAKE_API(4, 2)
+#define XVID_VERSION             XVID_MAKE_VERSION(1,3,0)
+#define XVID_API                 XVID_MAKE_API(4, 3)
 
 /* Bitstream Version
  * this will be writen into the bitstream to allow easy detection of xvid
@@ -71,7 +71,7 @@
  * doesnt hurt but not increasing it could cause difficulty for decoders in the
  * future
  */
-#define XVID_BS_VERSION 50 
+#define XVID_BS_VERSION 62 
 
 /*****************************************************************************
  * error codes
@@ -127,6 +127,9 @@
 #define XVID_PROFILE_S_L1    0x01
 #define XVID_PROFILE_S_L2    0x02
 #define XVID_PROFILE_S_L3    0x03
+#define XVID_PROFILE_S_L4a   0x04
+#define XVID_PROFILE_S_L5    0x05
+#define XVID_PROFILE_S_L6    0x06
 #define XVID_PROFILE_ARTS_L1 0x91 /* advanced realtime simple */
 #define XVID_PROFILE_ARTS_L2 0x92
 #define XVID_PROFILE_ARTS_L3 0x93
@@ -234,13 +237,16 @@
 extern int xvid_decore(void *handle, int opt, void *param1, void *param2);
 
 /* XVID_DEC_CREATE param 1
-	image width & height may be specified here when the dimensions are
-	known in advance. */
+	image width & height as well as FourCC code may be specified 
+	here when known in advance (e.g. being read from container) */
 typedef struct {
 	int version;
-	int width;     /* [in:opt] image width */
-	int height;    /* [in:opt] image width */
-	void * handle; /* [out]	   decore context handle */
+	int width;      /* [in:opt] image width */
+	int height;     /* [in:opt] image width */
+	void * handle;  /* [out]    decore context handle */
+/* ------- v1.3.x ------- */
+	int fourcc;     /* [in:opt] fourcc of the input video */
+	int num_threads;/* [in:opt] number of threads to use in decoder */
 } xvid_dec_create_t;
 
 
@@ -364,7 +370,6 @@
 #define XVID_REQDQUANTS  (1<<2) /* plugin requires access to the dquant table */
 #define XVID_REQLAMBDA   (1<<3) /* plugin requires access to the lambda table */
 
-
 typedef struct
 {
 	int version;
@@ -486,7 +491,8 @@
 extern xvid_plugin_func xvid_plugin_psnr;	/* write psnr values to stdout */
 extern xvid_plugin_func xvid_plugin_dump;	/* dump before and after yuvpgms */
 
-extern xvid_plugin_func xvid_plugin_ssim;	/*write ssim values to stdout*/
+extern xvid_plugin_func xvid_plugin_ssim;	    /*write ssim values to stdout*/
+extern xvid_plugin_func xvid_plugin_psnrhvsm;	/*write psnrhvsm values to stdout*/
 
 
 /* single pass rate control
@@ -534,11 +540,13 @@
 	int container_frame_overhead; /* [in] How many bytes the controller has to compensate per frame due to container format overhead */
 
 /* ------- v1.1.x ------- */
-	int vbv_size;                 /* [in] buffer size (bits) */
+	int vbv_size;                 /* [in] buffer size (bits) If this is zero, VBV check is disabled.*/
 	int vbv_initial;              /* [in] initial buffer occupancy (bits) */
 	int vbv_maxrate;              /* [in] max processing bitrate (bits per second) */
-	int vbv_peakrate;             /* [in:opt] max average bitrate over 3 seconds (bits per second) */
-
+	int vbv_peakrate;             /* [in:opt] max average bitrate over 1 second (bits per second).
+								   *          This is used for diagnostics only and won't affect the actual peak bitrate.
+								   *          This is not a problem as long as vbv_peakrate > vbv_size + vbv_maxrate which
+								   *          guarantees that vbv_peakrate won't be exceeded. */
 }xvid_plugin_2pass2_t;
 
 
@@ -557,6 +565,12 @@
 
 } xvid_plugin_ssim_t;
 
+typedef struct {
+        int version;
+
+        int method;      /* [in] masking method to apply. 0 for luminance masking, 1 for variance masking */
+} xvid_plugin_lumimasking_t;
+
 /*****************************************************************************
  *                             ENCODER API
  ****************************************************************************/
@@ -654,6 +668,7 @@
 #define XVID_VOP_MODEDECISION_RD      (1<< 8) /* enable DCT-ME and use it for mode decision */
 #define XVID_VOP_FAST_MODEDECISION_RD (1<<12) /* use simplified R-D mode decision */
 #define XVID_VOP_RD_BVOP              (1<<13) /* enable rate-distortion mode decision in b-frames */
+#define XVID_VOP_RD_PSNRHVSM          (1<<14) /* use PSNR-HVS-M as metric for rate-distortion optimizations */
 
 /* Only valid for vol_flags|=XVID_VOL_INTERLACING */
 #define XVID_VOP_TOPFIELDFIRST        (1<< 9) /* set top-field-first flag  */
@@ -731,7 +746,7 @@
 	int num_plugins;             /* [in:opt] number of plugins */
 	xvid_enc_plugin_t * plugins; /*          ^^ plugin array */
 
-	int num_threads;             /* [in:opt] number of threads */
+	int num_threads;             /* [in:opt] number of threads to use in encoder */
 	int max_bframes;             /* [in:opt] max sequential bframes (0=disable bframes) */
 
 	int global;                  /* [in:opt] global flags; controls encoding behavior */
@@ -754,6 +769,10 @@
 	/* ---------------------------------------------- */
 
 	void *handle;                /* [out] encoder instance handle */
+
+	/* ------- v1.3.x ------- */
+	int start_frame_num;         /* [in:opt] frame number of start frame relative to zones definitions. allows to encode sub-sequences */
+	int num_slices;              /* [in:opt] number of slices to code for each frame */
 } xvid_enc_create_t;

xvidcore-1.2.2.tar.bz2/vfw/bin/Makefile -> xvidcore-1.3.0.tar.bz2/vfw/bin/Makefile Changed

xvidcore-1.2.2.tar.bz2/vfw/src/codec.c -> xvidcore-1.3.0.tar.bz2/vfw/src/codec.c Changed

@@ -3,6 +3,8 @@
  *	XVID VFW FRONTEND
  *	codec
  *
+ *	Copyright(C) Peter Ross <pross@xvid.org>
+ *
  *	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
@@ -17,33 +19,7 @@
  *	along with this program; if not, write to the Free Software
  *	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- *************************************************************************/
-
-/**************************************************************************
- *
- *	History:
- *
- *	12.07.2002	num_threads
- *	23.06.2002	XVID_CPU_CHKONLY; loading speed up
- *	25.04.2002	ICDECOMPRESS_PREROLL
- *	17.04.2002	re-enabled lumi masking for 1st pass
- *	15.04.2002	updated cbr support
- *	04.04.2002	separated 2-pass code to 2pass.c
- *				interlacing support
- *				hinted ME support
- *	23.03.2002	daniel smith <danielsmith@astroboymail.com>
- *				changed inter4v to only be in modes 5 or 6
- *				fixed null mode crash ?
- *				merged foxer's alternative 2-pass code
- *				added DEBUGERR output on errors instead of returning
- *	16.03.2002	daniel smith <danielsmith@astroboymail.com>
- *				changed BITMAPV4HEADER to BITMAPINFOHEADER
- *					- prevents memcpy crash in compress_get_format()
- *				credits are processed in external 2pass mode
- *				motion search precision = 0 now effective in 2-pass
- *				modulated quantization
- *				added DX50 fourcc
- *	01.12.2001	inital version; (c)2001 peter ross <pross@xvid.org>
+ * $Id: codec.c,v 1.30.2.3 2011/02/16 19:04:39 Isibaar Exp $
  *
  *************************************************************************/
 
@@ -221,7 +197,7 @@
 	outhdr->biClrUsed = 0;
 	outhdr->biClrImportant = 0;
 
-	if (codec->config.fourcc_used == 0)
+	if ((codec->config.fourcc_used == 0) || (profiles[codec->config.profile].flags & PROFILE_XVID))
 	{
 		outhdr->biCompression = FOURCC_XVID;
 	}
@@ -421,10 +397,11 @@
 	xvid_plugin_single_t single;
 	xvid_plugin_2pass1_t pass1;
 	xvid_plugin_2pass2_t pass2;
+	xvid_plugin_lumimasking_t masking;
     xvid_gbl_info_t info;
 	int i;
 	HANDLE hFile;
-  const quality_t* quality_preset = (codec->config.quality==quality_table_num) ?
+	const quality_t* quality_preset = (codec->config.quality==quality_table_num) ?
     &codec->config.quality_user : &quality_table[codec->config.quality];
 
 	CONFIG tmpCfg; /* if we want to alter config to suit our needs, it shouldn't be visible to user later */
@@ -450,6 +427,38 @@
 	memset(&create, 0, sizeof(create));
 	create.version = XVID_VERSION;
 
+    /* Encoder threads */
+    if (codec->config.cpu & XVID_CPU_FORCE)
+		create.num_threads = codec->config.num_threads;
+	else 
+        create.num_threads = info.num_threads; /* Autodetect */
+
+	/* Encoder slices */
+	if ((profiles[codec->config.profile].flags & PROFILE_RESYNCMARKER) && codec->config.num_slices != 1) {
+		
+		if (codec->config.num_slices == 0) { /* auto */
+			int mb_width = (lpbiInput->bmiHeader.biWidth + 15) / 16;
+			int mb_height = (lpbiInput->bmiHeader.biHeight + 15) / 16;
+
+			int slices = (int)((mb_width*mb_height) / 811); /* use multiple slices only above SD resolutions for now */
+
+			if (slices > 1) {
+				if (create.num_threads <= 1)
+					slices &= ~1; /* make even */
+				else if (create.num_threads <= slices)
+					slices = (slices / create.num_threads) * create.num_threads; /* multiple of threads */
+				else if (create.num_threads % slices)
+					slices = (!(create.num_threads%2)) ? (create.num_threads/2) : (create.num_threads/3);
+			}
+
+			create.num_slices = slices;
+		}
+		else {
+			create.num_slices = codec->config.num_slices; /* force manual value - by registry edit */
+		}
+
+	}
+
 	/* plugins */
 	create.plugins = plugins;
 	switch (codec->config.mode) 
@@ -513,10 +522,7 @@
 		pass2.vbv_size = profiles[codec->config.profile].max_vbv_size;
 		pass2.vbv_initial = (profiles[codec->config.profile].max_vbv_size*3)/4; /* 75% */
 		pass2.vbv_maxrate = profiles[codec->config.profile].max_bitrate;
-
-    // XXX: xvidcore current provides a "peak bits over 3secs" constraint.
-    //      according to the latest dxn literature, a 1sec constraint is now used
-    pass2.vbv_peakrate = profiles[codec->config.profile].vbv_peakrate * 3;
+		pass2.vbv_peakrate = profiles[codec->config.profile].vbv_peakrate;
 
 		plugins[create.num_plugins].func = codec->xvid_plugin_2pass2_func;
 		plugins[create.num_plugins].param = &pass2;
@@ -546,9 +552,11 @@
 	}
 
 	/* lumimasking plugin */
-  	if ((profiles[codec->config.profile].flags & PROFILE_ADAPTQUANT) && codec->config.lum_masking) {
+  	if ((profiles[codec->config.profile].flags & PROFILE_ADAPTQUANT) && (codec->config.lum_masking>0)) {
+		memset(&masking, 0, sizeof(masking));
+		masking.method = (codec->config.lum_masking==2);
 		plugins[create.num_plugins].func = codec->xvid_plugin_lumimasking_func;
-		plugins[create.num_plugins].param = NULL;
+		plugins[create.num_plugins].param = &masking;
 		create.num_plugins++; 
 	}
 
@@ -600,16 +608,12 @@
     if ((profiles[codec->config.profile].flags & PROFILE_EXTRA))
       create.global |= XVID_GLOBAL_DIVX5_USERDATA;
 
-	create.frame_drop_ratio = quality_preset->frame_drop_ratio;
-
-    /* Encoder threads */
-    if (codec->config.num_threads == 0)
-        create.num_threads = info.num_threads; /* Autodetect */
-    else if (codec->config.num_threads == 1)
-        create.num_threads = -1; /* Single-threaded, disable SMP */
-    else 
-        create.num_threads = codec->config.num_threads;
-
+	if ((profiles[codec->config.profile].flags & PROFILE_EXTRA) || 
+		(profiles[codec->config.profile].flags & PROFILE_XVID)) {
+  	  create.frame_drop_ratio = 0;
+	} else {
+  	  create.frame_drop_ratio = quality_preset->frame_drop_ratio;
+	}
 
 	switch(codec->xvid_encore_func(0, XVID_ENC_CREATE, &create, NULL))
 	{
@@ -822,6 +826,9 @@
 		break;
 	}
 
+	if (quality_preset->vhq_metric == 1)
+		frame.vop_flags |= XVID_VOP_RD_PSNRHVSM;
+
 	frame.input.plane[0] = icc->lpInput;
 	frame.input.stride[0] = CALC_BI_STRIDE(icc->lpbiInput->biWidth, icc->lpbiInput->biBitCount);
 
@@ -917,13 +924,16 @@
 {
 	BITMAPINFOHEADER * inhdr = &lpbiInput->bmiHeader;
 	BITMAPINFOHEADER * outhdr = &lpbiOutput->bmiHeader;
+	int in_csp = XVID_CSP_NULL, out_csp = XVID_CSP_NULL;
 
 	if (lpbiInput == NULL) 
 	{
 		return ICERR_ERROR;
 	}
 
-	if (inhdr->biCompression != FOURCC_XVID && inhdr->biCompression != FOURCC_DIVX && inhdr->biCompression != FOURCC_DX50 && get_colorspace(inhdr) == XVID_CSP_NULL)
+	if (inhdr->biCompression != FOURCC_XVID && inhdr->biCompression != FOURCC_DIVX && inhdr->biCompression != FOURCC_DX50 && inhdr->biCompression != FOURCC_MP4V &&
+		inhdr->biCompression != FOURCC_xvid && inhdr->biCompression != FOURCC_divx && inhdr->biCompression != FOURCC_dx50 && inhdr->biCompression != FOURCC_mp4v &&
+		(in_csp = get_colorspace(inhdr)) != XVID_CSP_YV12)
 	{
 		return ICERR_BADFORMAT;
 	}
@@ -933,9 +943,12 @@
 		return ICERR_OK;
 	}
 
+	out_csp = get_colorspace(outhdr);
+
 	if (inhdr->biWidth != outhdr->biWidth ||
 		inhdr->biHeight != outhdr->biHeight ||
-		get_colorspace(outhdr) == XVID_CSP_NULL) 
+		out_csp == XVID_CSP_NULL ||
+		(in_csp == XVID_CSP_YV12 && in_csp != out_csp)) 
 	{
 		return ICERR_BADFORMAT;
 	}
@@ -996,7 +1009,9 @@
 
 LRESULT decompress_begin(CODEC * codec, BITMAPINFO * lpbiInput, BITMAPINFO * lpbiOutput)
 {

xvidcore-1.2.2.tar.bz2/vfw/src/codec.h -> xvidcore-1.3.0.tar.bz2/vfw/src/codec.h Changed

@@ -3,7 +3,7 @@
  *  XVID MPEG-4 VIDEO CODEC
  *  - VFW codec header  -
  *
- *  Copyright(C) 2002-2003 Anonymous <xvid-devel@xvid.org>
+ *  Copyright(C) Peter Ross <pross@xvid.org>
  *
  *  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
@@ -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: codec.h,v 1.6 2008/11/26 10:11:16 Isibaar Exp $
+ * $Id: codec.h,v 1.7.2.1 2011/02/16 19:04:39 Isibaar Exp $
  *
  ****************************************************************************/
 #ifndef _CODEC_H_
@@ -35,6 +35,12 @@
 #define FOURCC_XVID	mmioFOURCC('X','V','I','D')
 #define FOURCC_DIVX	mmioFOURCC('D','I','V','X')
 #define FOURCC_DX50 mmioFOURCC('D','X','5','0')
+#define FOURCC_MP4V	mmioFOURCC('M','P','4','V')
+#define FOURCC_xvid	mmioFOURCC('x','v','i','d')
+#define FOURCC_divx	mmioFOURCC('d','i','v','x')
+#define FOURCC_dx50	mmioFOURCC('d','x','5','0')
+#define FOURCC_mp4v	mmioFOURCC('m','p','4','v')
+
 /* yuyu		4:2:2 16bit, y-u-y-v, packed*/
 #define FOURCC_YUYV	mmioFOURCC('Y','U','Y','V')
 #define FOURCC_YUY2	mmioFOURCC('Y','U','Y','2')

xvidcore-1.2.2.tar.bz2/vfw/src/config.c -> xvidcore-1.3.0.tar.bz2/vfw/src/config.c Changed

@@ -3,6 +3,8 @@
  *	XVID VFW FRONTEND
  *	config
  *
+ *	Copyright(C) Peter Ross <pross@xvid.org>
+ *
  *	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
@@ -17,48 +19,14 @@
  *	along with this program; if not, write to the Free Software
  *	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- *************************************************************************/
-
-/**************************************************************************
- *
- *	History:
- *
- *	15.06.2002	added bframes options
- *	21.04.2002	fixed custom matrix support, tried to get dll size down
- *	17.04.2002	re-enabled lumi masking in 1st pass
- *	15.04.2002	updated cbr support
- *	07.04.2002	min keyframe interval checkbox
- *				2-pass max bitrate and overflow customization
- *	04.04.2002	interlacing support
- *				hinted ME support
- *	24.03.2002	daniel smith <danielsmith@astroboymail.com>
- *				added Foxer's new CBR engine
- *				- cbr_buffer is being used as reaction delay (quick hack)
- *	23.03.2002	daniel smith <danielsmith@astroboymail.com>
- *				added load defaults button
- *				merged foxer's alternative 2-pass code (2-pass alt tab)
- *				added proper tooltips
- *				moved registry data into reg_ints/reg_strs arrays
- *				added DEBUGERR output on errors instead of returning
- *	16.03.2002	daniel smith <danielsmith@astroboymail.com>
- *				rewrote/restructured most of file
- *				added tooltips (kind of - dirty message hook method)
- *				split tabs into a main dialog / advanced prop sheet
- *				advanced controls are now enabled/disabled by mode
- *				added modulated quantization, DX50 fourcc
- *	11.03.2002  Min Chen <chenm001@163.com>
- *			  now get Core Version use xvid_init()
- *	05.03.2002  Min Chen <chenm001@163.com>
- *				Add Core version display to about box
- *	01.12.2001	inital version; (c)2001 peter ross <pross@xvid.org>
+ * $Id: config.c,v 1.45.2.2 2011/02/16 19:04:39 Isibaar Exp $
  *
  *************************************************************************/
 
-
 #include <windows.h>
 #include <commctrl.h>
 #include <stdio.h>  /* sprintf */
-#include <xvid.h>	/* XviD API */
+#include <xvid.h>	/* Xvid API */
 
 #include "debug.h"
 #include "config.h"
@@ -115,52 +83,57 @@
 const profile_t profiles[] =
 {
 /*  name                p@l    w    h    fps  obj Tvmv vmv    vcv    ac%   vbv        pkt     bps    vbv_peak dbf flags */
-  { "Simple @ L0",      0x08,  176, 144, 15,  1,  198,   99,   1485, 100,  10*16368,  2048,   64000,        0, -1, PROFILE_S },
+#ifndef EXTRA_PROFILES
+  { "Xvid Mobile",  "Xvid Mobile",  0x00,  352, 240, 30,  1,  990,  330,   9900, 100,  128*8192,    -1, 1334850,  8000000,  5, PROFILE_4MV|PROFILE_ADAPTQUANT|PROFILE_BVOP|PROFILE_PACKED|PROFILE_MPEGQUANT|PROFILE_QPEL|PROFILE_XVID },
+  { "Xvid Home",    "Xvid Home",    0x00,  720, 576, 25,  1, 4860, 1620,  40500, 100,  384*8192,    -1, 4854000,  8000000,  5, PROFILE_4MV|PROFILE_ADAPTQUANT|PROFILE_BVOP|PROFILE_PACKED|PROFILE_MPEGQUANT|PROFILE_QPEL|PROFILE_INTERLACE|PROFILE_XVID },
+  { "Xvid HD 720",  "Xvid HD 720",  0x00, 1280, 720, 30,  1,10800, 3600, 108000, 100,  768*8192,    -1, 9708400, 16000000,  5, PROFILE_4MV|PROFILE_ADAPTQUANT|PROFILE_BVOP|PROFILE_PACKED|PROFILE_MPEGQUANT|PROFILE_QPEL|PROFILE_INTERLACE|PROFILE_XVID },
+  { "Xvid HD 1080",	"Xvid HD 1080", 0x00, 1920,1080, 30,  1,24480, 8160, 244800, 100, 2047*8192,    -1,20480000, 36000000,  5, PROFILE_4MV|PROFILE_ADAPTQUANT|PROFILE_BVOP|PROFILE_PACKED|PROFILE_MPEGQUANT|PROFILE_QPEL|PROFILE_INTERLACE|PROFILE_XVID },
+#else
+  { "Handheld",	         "Handheld",		  0x00,  176, 144, 15,  1,  198,   99,   1485, 100,   32*8192,    -1,  537600,   800000,  0, PROFILE_ADAPTQUANT|PROFILE_EXTRA },
+  { "Portable NTSC",     "Portable NTSC",	  0x00,  352, 240, 30,  1,  990,  330,  36000, 100,  384*8192,    -1, 4854000,  8000000,  1, PROFILE_4MV|PROFILE_ADAPTQUANT|PROFILE_BVOP|PROFILE_PACKED|PROFILE_EXTRA },
+  { "Portable PAL",	     "Portable PAL",	  0x00,  352, 288, 25,  1, 1188,  396,  36000, 100,  384*8192,    -1, 4854000,  8000000,  1, PROFILE_4MV|PROFILE_ADAPTQUANT|PROFILE_BVOP|PROFILE_PACKED|PROFILE_EXTRA },
+  { "Home Theatre NTSC", "Home Theatre NTSC", 0x00,  720, 480, 30,  1, 4050, 1350,  40500, 100,  384*8192,    -1, 4854000,  8000000,  1, PROFILE_4MV|PROFILE_ADAPTQUANT|PROFILE_BVOP|PROFILE_PACKED|PROFILE_INTERLACE|PROFILE_EXTRA },
+  { "Home Theatre PAL",  "Home Theatre PAL",  0x00,  720, 576, 25,  1, 4860, 1620,  40500, 100,  384*8192,    -1, 4854000,  8000000,  1, PROFILE_4MV|PROFILE_ADAPTQUANT|PROFILE_BVOP|PROFILE_PACKED|PROFILE_INTERLACE|PROFILE_EXTRA },
+  { "HDTV",	             "HDTV",			  0x00, 1280, 720, 30,  1,10800, 3600, 108000, 100,  768*8192,    -1, 9708400, 16000000,  2, PROFILE_4MV|PROFILE_ADAPTQUANT|PROFILE_BVOP|PROFILE_PACKED|PROFILE_INTERLACE|PROFILE_EXTRA },
+#endif
+
+  { "MPEG4 Simple @ L0", "MPEG4 SP @ L0",     0x08,  176, 144, 15,  1,  198,   99,   1485, 100,  10*16368,  2048,   64000,        0, -1, PROFILE_S },
   /* simple@l0: max f_code=1, intra_dc_vlc_threshold=0 */
   /* if ac preidition is used, adaptive quantization must not be used */
   /* <=qcif must be used */
-  { "Simple @ L1",      0x01,  176, 144, 15,  4,  198,   99,   1485, 100,  10*16368,  2048,   64000,        0, -1, PROFILE_S|PROFILE_ADAPTQUANT },
-  { "Simple @ L2",      0x02,  352, 288, 15,  4,  792,  396,   5940, 100,  40*16368,  4096,  128000,        0, -1, PROFILE_S|PROFILE_ADAPTQUANT },
-  { "Simple @ L3",      0x03,  352, 288, 15,  4,  792,  396,  11880, 100,  40*16368,  8192,  384000,        0, -1, PROFILE_S|PROFILE_ADAPTQUANT },
+  { "MPEG4 Simple @ L1", "MPEG4 SP @ L1",     0x01,  176, 144, 15,  4,  198,   99,   1485, 100,  10*16368,  2048,   64000,        0, -1, PROFILE_S|PROFILE_ADAPTQUANT },
+  { "MPEG4 Simple @ L2", "MPEG4 SP @ L2",     0x02,  352, 288, 15,  4,  792,  396,   5940, 100,  40*16368,  4096,  128000,        0, -1, PROFILE_S|PROFILE_ADAPTQUANT },
+  { "MPEG4 Simple @ L3", "MPEG4 SP @ L3",     0x03,  352, 288, 30,  4,  792,  396,  11880, 100,  40*16368,  8192,  384000,        0, -1, PROFILE_S|PROFILE_ADAPTQUANT },
+  /* From ISO/IEC 14496-2:2004/FPDAM 2: New Levels for Simple Profile */
+  { "MPEG4 Simple @ L4a","MPEG4 SP @ L4a",    0x04,  640, 480, 30,  4, 2400, 1200,  36000, 100,  80*16368, 16384, 4000000,        0, -1, PROFILE_S|PROFILE_ADAPTQUANT },
+  { "MPEG4 Simple @ L5", "MPEG4 SP @ L5",     0x05,  720, 576, 30,  4, 3240, 1620,  40500, 100, 112*16368, 16384, 8000000,        0, -1, PROFILE_S|PROFILE_ADAPTQUANT },
+  /* From ISO/IEC 14496-2:2004/FPDAM 4: Simple profile level 6 */
+  { "MPEG4 Simple @ L6", "MPEG4 SP @ L6",     0x06, 1280, 720, 30,  4, 7200, 3600, 108000, 100, 248*16368, 16384,12000000,        0, -1, PROFILE_S|PROFILE_ADAPTQUANT },
 
 #if 0 /* since rrv encoding is no longer support, these profiles have little use */
-  { "ARTS @ L1",        0x91,  176, 144, 15,  4,  198,   99,   1485, 100,  10*16368,  8192,   64000,        0, -1, PROFILE_ARTS },
-  { "ARTS @ L2",        0x92,  352, 288, 15,  4,  792,  396,   5940, 100,  40*16368, 16384,  128000,        0, -1, PROFILE_ARTS },
-  { "ARTS @ L3",        0x93,  352, 288, 30,  4,  792,  396,  11880, 100,  40*16368, 16384,  384000,        0, -1, PROFILE_ARTS },
-  { "ARTS @ L4",        0x94,  352, 288, 30, 16,  792,  396,  11880, 100,  80*16368, 16384, 2000000,        0, -1, PROFILE_ARTS },
+  { "MPEG4 ARTS @ L1", "MPEG4 ARTS @ L1",       0x91,  176, 144, 15,  4,  198,   99,   1485, 100,  10*16368,  8192,   64000,        0, -1, PROFILE_ARTS },
+  { "MPEG4 ARTS @ L2", "MPEG4 ARTS @ L2",       0x92,  352, 288, 15,  4,  792,  396,   5940, 100,  40*16368, 16384,  128000,        0, -1, PROFILE_ARTS },
+  { "MPEG4 ARTS @ L3", "MPEG4 ARTS @ L3",       0x93,  352, 288, 30,  4,  792,  396,  11880, 100,  40*16368, 16384,  384000,        0, -1, PROFILE_ARTS },
+  { "MPEG4 ARTS @ L4", "MPEG4 ARTS @ L4",       0x94,  352, 288, 30, 16,  792,  396,  11880, 100,  80*16368, 16384, 2000000,        0, -1, PROFILE_ARTS },
 #endif
 
-  { "Advanced Simple @ L0",          0xf0,  176, 144, 30,  1,  297,   99,   2970, 100,  10*16368,  2048,  128000,        0, -1, PROFILE_AS },
-  { "Advanced Simple @ L1",          0xf1,  176, 144, 30,  4,  297,   99,   2970, 100,  10*16368,  2048,  128000,        0, -1, PROFILE_AS },
-  { "Advanced Simple @ L2",          0xf2,  352, 288, 15,  4, 1188,  396,   5940, 100,  40*16368,  4096,  384000,        0, -1, PROFILE_AS },
-  { "Advanced Simple @ L3",          0xf3,  352, 288, 30,  4, 1188,  396,  11880, 100,  40*16368,  4096,  768000,        0, -1, PROFILE_AS },
+  { "MPEG4 Advanced Simple @ L0", "MPEG4 ASP @ L0",         0xf0,  176, 144, 30,  1,  297,   99,   2970, 100,  10*16368,  2048,  128000,        0, -1, PROFILE_AS },
+  { "MPEG4 Advanced Simple @ L1", "MPEG4 ASP @ L1",         0xf1,  176, 144, 30,  4,  297,   99,   2970, 100,  10*16368,  2048,  128000,        0, -1, PROFILE_AS },
+  { "MPEG4 Advanced Simple @ L2", "MPEG4 ASP @ L2",         0xf2,  352, 288, 15,  4, 1188,  396,   5940, 100,  40*16368,  4096,  384000,        0, -1, PROFILE_AS },
+  { "MPEG4 Advanced Simple @ L3", "MPEG4 ASP @ L3",         0xf3,  352, 288, 30,  4, 1188,  396,  11880, 100,  40*16368,  4096,  768000,        0, -1, PROFILE_AS },
  /*  ISMA Profile 1, (ASP) @ L3b (CIF, 1.5 Mb/s) CIF(352x288), 30fps, 1.5Mbps max ??? */
-  { "Advanced Simple @ L4",          0xf4,  352, 576, 30,  4, 2376,  792,  23760,  50,  80*16368,  8192, 3000000,        0, -1, PROFILE_AS },
-  { "Advanced Simple @ L5",          0xf5,  720, 576, 30,  4, 4860, 1620,  48600,  25, 112*16368, 16384, 8000000,        0, -1, PROFILE_AS },
-
-#ifndef EXTRA_PROFILES
-  { "Mobile",            0x00,  352, 240, 30,  1,  990,  330,  36000, 100,  128*8192,    -1, 1334850,  8000000,  5, PROFILE_4MV|PROFILE_ADAPTQUANT|PROFILE_BVOP|PROFILE_PACKED|PROFILE_MPEGQUANT|PROFILE_QPEL },
-  { "Portable",          0x00,  640, 480, 30,  1, 3600, 1200,  36000, 100,  384*8192,    -1, 4854000,  8000000,  5, PROFILE_4MV|PROFILE_ADAPTQUANT|PROFILE_BVOP|PROFILE_PACKED|PROFILE_MPEGQUANT|PROFILE_QPEL|PROFILE_INTERLACE },
-  { "Home",              0x00,  720, 576, 25,  1, 4860, 1620,  40500, 100,  384*8192,    -1, 4854000,  8000000,  5, PROFILE_4MV|PROFILE_ADAPTQUANT|PROFILE_BVOP|PROFILE_PACKED|PROFILE_MPEGQUANT|PROFILE_QPEL|PROFILE_INTERLACE },
-  { "Highdef",           0x00, 1280, 720, 30,  1,10800, 3600, 108000, 100,  768*8192,    -1, 9708400, 16000000,  5, PROFILE_4MV|PROFILE_ADAPTQUANT|PROFILE_BVOP|PROFILE_PACKED|PROFILE_MPEGQUANT|PROFILE_QPEL|PROFILE_INTERLACE },
-#else
-  { "Handheld",			 0x00,  176, 144, 15,  1,  198,   99,   1485, 100,   32*8192,    -1,  537600,   800000,  0, PROFILE_ADAPTQUANT|PROFILE_EXTRA },
-  { "Portable NTSC",	 0x00,  352, 240, 30,  1,  990,  330,  36000, 100,  384*8192,    -1, 4854000,  8000000,  1, PROFILE_4MV|PROFILE_ADAPTQUANT|PROFILE_BVOP|PROFILE_PACKED|PROFILE_EXTRA },
-  { "Portable PAL",		 0x00,  352, 288, 25,  1, 1188,  396,  36000, 100,  384*8192,    -1, 4854000,  8000000,  1, PROFILE_4MV|PROFILE_ADAPTQUANT|PROFILE_BVOP|PROFILE_PACKED|PROFILE_EXTRA },
-  { "Home Theatre NTSC", 0x00,  720, 480, 30,  1, 4050, 1350,  40500, 100,  384*8192,    -1, 4854000,  8000000,  1, PROFILE_4MV|PROFILE_ADAPTQUANT|PROFILE_BVOP|PROFILE_PACKED|PROFILE_INTERLACE|PROFILE_EXTRA },
-  { "Home Theatre PAL",  0x00,  720, 576, 25,  1, 4860, 1620,  40500, 100,  384*8192,    -1, 4854000,  8000000,  1, PROFILE_4MV|PROFILE_ADAPTQUANT|PROFILE_BVOP|PROFILE_PACKED|PROFILE_INTERLACE|PROFILE_EXTRA },
-  { "HDTV",				 0x00, 1280, 720, 30,  1,10800, 3600, 108000, 100,  768*8192,    -1, 9708400, 16000000,  2, PROFILE_4MV|PROFILE_ADAPTQUANT|PROFILE_BVOP|PROFILE_PACKED|PROFILE_INTERLACE|PROFILE_EXTRA },
-#endif
+  { "MPEG4 Advanced Simple @ L4", "MPEG4 ASP @ L4",         0xf4,  352, 576, 30,  4, 2376,  792,  23760,  50,  80*16368,  8192, 3000000,        0, -1, PROFILE_AS },
+  { "MPEG4 Advanced Simple @ L5", "MPEG4 ASP @ L5",         0xf5,  720, 576, 30,  4, 4860, 1620,  48600,  25, 112*16368, 16384, 8000000,        0, -1, PROFILE_AS },
 
-  { "(unrestricted)",   0x00,    0,   0,  0,  0,    0,    0,      0, 100,   0*16368,    -1,       0,        0, -1, 0xffffffff & ~(PROFILE_EXTRA | PROFILE_PACKED)},
+  { "(unrestricted)", "(unrestricted)",  0x00,    0,   0,  0,  0,    0,    0,      0, 100,   0*16368,    -1,       0,        0, -1, 0xffffffff & ~(PROFILE_EXTRA | PROFILE_PACKED | PROFILE_XVID)},
 };
 
 
 const quality_t quality_table[] = 
 {
-    /* name                 |  m  vhq  bf cme  tbo  kfi  fdr  | iquant pquant bquant trellis */
-  { "Real-time",               1,  0,  0,  0,  0,  300,  0,     1, 31, 1, 31, 1, 31,   0   },
-  { QUALITY_GENERAL_STRING,    6,  1,  0,  1,  0,  300,  0,     1, 31, 1, 31, 1, 31,   1   },
+    /* name                 |  m  vhq mtc bf cme  tbo  kfi  fdr  | iquant pquant bquant trellis */
+  { "Real-time",               1,  0,  0,  0,  0,  0,  300,  0,     1, 31, 1, 31, 1, 31,   0   },
+  { QUALITY_GENERAL_STRING,    6,  1,  0,  0,  1,  0,  300,  0,     1, 31, 1, 31, 1, 31,   1   },
 };
 
 const int quality_table_num = sizeof(quality_table)/sizeof(quality_t);
@@ -228,6 +201,7 @@
 	{"bquant_ratio",			&reg.bquant_ratio,				150},   /* 100-base float */
 	{"bquant_offset",			&reg.bquant_offset,				100},   /* 100-base float */
 	{"packed",					&reg.packed,					1},
+	{"num_slices", 				&reg.num_slices,				1},
 
 	/* aspect ratio */
 	{"ar_mode",					&reg.ar_mode,					0},
@@ -275,6 +249,7 @@
 	/* motion */
 	{"motion_search",			&reg.quality_user.motion_search,				6},
 	{"vhq_mode",				&reg.quality_user.vhq_mode,					1},
+	{"vhq_metric",				&reg.quality_user.vhq_metric,				0},
 	{"vhq_bframe",				&reg.quality_user.vhq_bframe,				0},
 	{"chromame",				&reg.quality_user.chromame,					1},
 	{"turbo",					&reg.quality_user.turbo,						0},
@@ -295,10 +270,11 @@
 	{"debug",					&reg.debug,						0x0},
 	{"vop_debug",				&reg.vop_debug,					0},
 	{"display_status",			&reg.display_status,			1},
+	{"cpu_flags", 				&reg.cpu,						0},
 
 	/* smp */
 	{"num_threads",				&reg.num_threads,				0},
-	
+
 	/* decoder, shared with dshow */
 	{"Brightness",				&pp_brightness,					0},
 	{"Deblock_Y",				&pp_dy,							0},
@@ -310,8 +286,8 @@
 };
 
 static const REG_STR reg_strs[] = {
-	{"profile",					reg.profile_name,				"(unrestricted)"},
-  {"quality",         reg.quality_name,       QUALITY_GENERAL_STRING},
+	{"profile",					reg.profile_name,				"Xvid Home"},
+	{"quality",         reg.quality_name,       QUALITY_GENERAL_STRING},
 	{"stats",					reg.stats,						CONFIG_2PASS_FILE},
 };
 
@@ -378,8 +354,6 @@
 		FreeLibrary(m_hdll);
 	}
 
-	reg.cpu = info.cpu_flags;
-
 	RegOpenKeyEx(XVID_REG_KEY, XVID_REG_PARENT "\\" XVID_REG_CHILD, 0, KEY_READ, &hKey);
 
 	/* read integer values */
@@ -401,7 +375,10 @@

xvidcore-1.2.2.tar.bz2/vfw/src/config.h -> xvidcore-1.3.0.tar.bz2/vfw/src/config.h Changed

@@ -3,7 +3,7 @@
  *  XVID MPEG-4 VIDEO CODEC
  *  - VFW configuration header  -
  *
- *  Copyright(C) 2002-2003 Anonymous <xvid-devel@xvid.org>
+ *  Copyright(C) Peter Ross <pross@xvid.org>
  *
  *  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
@@ -19,9 +19,10 @@
  *  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.h,v 1.12.2.1 2008/11/30 16:38:31 Isibaar Exp $
+ * $Id: config.h,v 1.17 2010/12/22 16:52:12 Isibaar Exp $
  *
  ****************************************************************************/
+
 #ifndef _CONFIG_H_
 #define _CONFIG_H_
 
@@ -42,7 +43,7 @@
 
 /* min/max bitrate when not specified by profile */
 #define DEFAULT_MIN_KBPS	16
-#define DEFAULT_MAX_KBPS	10000
+#define DEFAULT_MAX_KBPS	20480
 #define DEFAULT_QUANT		400
 
 /* registry stuff */
@@ -59,13 +60,13 @@
 #define CONFIG_2PASS_FILE ".\\video.pass"
 
 /* codec modes */
-#define RC_MODE_1PASS		  0
-#define RC_MODE_2PASS1		 1
-#define RC_MODE_2PASS2		 2
-#define RC_MODE_NULL		   3
+#define RC_MODE_1PASS			0
+#define RC_MODE_2PASS1			1
+#define RC_MODE_2PASS2			2
+#define RC_MODE_NULL			3
 
-#define RC_ZONE_WEIGHT		 0
-#define RC_ZONE_QUANT		  1
+#define RC_ZONE_WEIGHT			0
+#define RC_ZONE_QUANT			1
 
 /* vhq modes */
 #define VHQ_OFF					0
@@ -102,10 +103,11 @@
 #define QUALITY_GENERAL_STRING  "General purpose"
 #define QUALITY_USER_STRING   	"(User defined)"
 typedef struct {
-  char * name;
-  /* motion */
-  int motion_search;
+	char * name;
+	/* motion */
+	int motion_search;
 	int vhq_mode;
+	int vhq_metric;
 	int vhq_bframe;
 	int chromame;
 	int turbo;
@@ -209,6 +211,8 @@
 
 	DWORD cpu;
 
+	int num_slices;
+
 	/* internal */
 	int ci_valid;
 	VFWEXT_CONFIGURE_INFO_T ci;
@@ -237,16 +241,17 @@
 } REG_STR;
 
 
-#define PROFILE_ADAPTQUANT  0x00000001
-#define PROFILE_BVOP		0x00000002
-#define PROFILE_MPEGQUANT	0x00000004
-#define PROFILE_INTERLACE	0x00000008
-#define PROFILE_QPEL		0x00000010
-#define PROFILE_GMC			0x00000020
-#define PROFILE_4MV		    0x00000040
-#define PROFILE_PACKED      0x00000080
-#define PROFILE_EXTRA       0x00000100
-
+#define PROFILE_ADAPTQUANT   0x00000001
+#define PROFILE_BVOP		 0x00000002
+#define PROFILE_MPEGQUANT	 0x00000004
+#define PROFILE_INTERLACE	 0x00000008
+#define PROFILE_QPEL		 0x00000010
+#define PROFILE_GMC			 0x00000020
+#define PROFILE_4MV		     0x00000040
+#define PROFILE_PACKED       0x00000080
+#define PROFILE_EXTRA        0x00000100
+#define PROFILE_XVID         0x00000200
+#define PROFILE_RESYNCMARKER 0x00000400
 
 static const int PARS[][2] = {
 	{1, 1},
@@ -263,6 +268,7 @@
 typedef struct
 {
 	char * name;
+	char * short_name;
 	int id;		 /* mpeg-4 profile id; iso/iec 14496-2:2001 table G-1 */
 	int width;
 	int height;

xvidcore-1.2.2.tar.bz2/vfw/src/debug.h -> xvidcore-1.3.0.tar.bz2/vfw/src/debug.h Changed

xvidcore-1.2.2.tar.bz2/vfw/src/driverproc.c -> xvidcore-1.3.0.tar.bz2/vfw/src/driverproc.c Changed

xvidcore-1.3.0.tar.bz2/vfw/src/hd1080_40.ico Added

xvidcore-1.3.0.tar.bz2/vfw/src/hd720_40.ico Added

xvidcore-1.3.0.tar.bz2/vfw/src/home_40.ico Added

xvidcore-1.3.0.tar.bz2/vfw/src/mobile_40.ico Added

xvidcore-1.2.2.tar.bz2/vfw/src/resource.h -> xvidcore-1.3.0.tar.bz2/vfw/src/resource.h Changed

@@ -1,5 +1,5 @@
 //{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
+// Microsoft Visual C++ generated include file.
 // Used by resource.rc
 //
 #define IDC_LICENSE                     3
@@ -30,6 +30,10 @@
 #define IDD_LICENSE                     129
 #define IDR_GPL                         131
 #define IDD_COMMON                      132
+#define IDI_MOBILE                      135
+#define IDI_HOME                        136
+#define IDI_HD720                       137
+#define IDI_HD1080                      138
 #define WIZ_CYDLG                       140
 #define PROP_MIN_CYDLG                  144
 #define PROP_SM_CYDLG                   188
@@ -426,14 +430,19 @@
 #define IDC_LEVEL_VMV_S                 1402
 #define IDC_LEVEL_VCV_S                 1403
 #define IDC_LEVEL_LEVEL_G               1404
+#define IDC_LUMMASK_S                   1405
+#define IDC_PROFILE_LOGO                1406
+#define IDC_PROFILE_LABEL               1407
+#define IDC_VHQ_METRIC                  1408
+#define IDC_SLICES                      1409
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        133
+#define _APS_NEXT_RESOURCE_VALUE        139
 #define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1405
+#define _APS_NEXT_CONTROL_VALUE         1410
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif

xvidcore-1.2.2.tar.bz2/vfw/src/resource.rc -> xvidcore-1.3.0.tar.bz2/vfw/src/resource.rc Changed

@@ -1,4 +1,4 @@
-//Microsoft Developer Studio generated resource script.
+// Microsoft Visual C++ generated resource script.
 //
 #include "resource.h"
 
@@ -29,72 +29,56 @@
 // Dialog
 //
 
-IDD_RC_2PASS1 DIALOG DISCARDABLE  0, 0, 212, 212
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+IDD_RC_2PASS1 DIALOG 0, 0, 212, 212
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "1st Pass"
 FONT 8, "MS Shell Dlg"
 BEGIN
     EDITTEXT        IDC_STATS,72,6,106,12,ES_AUTOHSCROLL
     PUSHBUTTON      "...",IDC_STATS_BROWSE,182,7,22,12
-    CONTROL         "Full quality first pass",IDC_FULL1PASS,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,15,38,83,12
-    CONTROL         "Discard first pass",IDC_DISCARD1PASS,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,127,38,69,12
+    CONTROL         "Full quality first pass",IDC_FULL1PASS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,38,83,12
+    CONTROL         "Discard first pass",IDC_DISCARD1PASS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,38,69,12
     LTEXT           "Stats filename:",IDC_STATIC,8,6,52,12,SS_CENTERIMAGE
-    CTEXT           "If you don't discard first pass but keep full quality disabled,\nthe resulting 1st pass stream might not be mpeg-4 compliant.",
-                    IDC_STATIC,7,114,197,35
-    CTEXT           "Full quality first pass is only useful if you want to keep the resulting stream.\nIt doesn't improve quality of second pass and normally should be disabled.",
-                    IDC_STATIC,7,71,197,35
+    CTEXT           "If you don't discard first pass but keep full quality disabled,\nthe resulting 1st pass stream might not be MPEG-4 compliant.",IDC_STATIC,7,114,197,35
+    CTEXT           "Full quality first pass is only useful if you want to keep the resulting stream.\nIt doesn't improve quality of second pass and normally should be disabled.",IDC_STATIC,7,71,197,35
 END
 
-IDD_MOTION DIALOG DISCARDABLE  0, 0, 212, 212
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+IDD_MOTION DIALOGEX 0, 0, 212, 212
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Motion"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    COMBOBOX        IDC_MOTION,112,19,76,76,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
-    COMBOBOX        IDC_VHQ,112,37,76,76,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
-    CONTROL         "Use chroma motion",IDC_CHROMAME,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,14,65,77,10
-    CONTROL         "Turbo ;-)",IDC_TURBO,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,143,65,43,10
-    EDITTEXT        IDC_FRAMEDROP,112,96,75,12,ES_AUTOHSCROLL | ES_NUMBER
-    EDITTEXT        IDC_MAXKEY,112,116,76,12,ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "Motion search precision:",IDC_STATIC,14,20,80,12,
-                    SS_CENTERIMAGE
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    COMBOBOX        IDC_MOTION,112,19,76,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_VHQ,112,37,76,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Use chroma motion",IDC_CHROMAME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,91,77,10
+    CONTROL         "Turbo ;-)",IDC_TURBO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,143,91,43,10
+    EDITTEXT        IDC_FRAMEDROP,112,125,75,12,ES_AUTOHSCROLL | ES_NUMBER
+    EDITTEXT        IDC_MAXKEY,112,145,76,12,ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "Motion search precision:",IDC_STATIC,14,20,80,12,SS_CENTERIMAGE
     LTEXT           "VHQ mode:",IDC_STATIC,14,39,38,8
-    LTEXT           "Frame drop ratio:",IDC_FRAMEDROP_STATIC,14,96,68,12,
-                    SS_CENTERIMAGE
-    LTEXT           "Maximum I-frame interval:",IDC_STATIC,14,117,80,12,
-                    SS_CENTERIMAGE
-    GROUPBOX        "Motion Precision",IDC_STATIC,7,7,193,77
-    GROUPBOX        "Other",IDC_STATIC,7,79,193,67
-    CONTROL         "Use VHQ for bframes too",IDC_VHQ_BFRAME,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,14,52,95,10
+    LTEXT           "Frame drop ratio:",IDC_FRAMEDROP_STATIC,14,125,68,12,SS_CENTERIMAGE
+    LTEXT           "Maximum I-frame interval:",IDC_STATIC,14,146,80,12,SS_CENTERIMAGE
+    GROUPBOX        "Motion Precision",IDC_STATIC,7,7,193,99
+    GROUPBOX        "Other",IDC_STATIC,7,108,193,67
+    CONTROL         "Use VHQ for bframes too",IDC_VHQ_BFRAME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,78,95,10
+    COMBOBOX        IDC_VHQ_METRIC,112,55,76,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "VHQ metric:",IDC_STATIC,14,56,38,8
 END
 
 IDD_MAIN DIALOGEX 0, 0, 225, 255
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Xvid Configuration"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    COMBOBOX        IDC_PROFILE,88,16,91,200,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
+    COMBOBOX        IDC_PROFILE,88,16,91,200,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "more...",IDC_PROFILE_ADV,184,16,28,12
-    COMBOBOX        IDC_MODE,88,34,92,76,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
+    COMBOBOX        IDC_MODE,88,34,92,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "more...",IDC_MODE_ADV,184,34,28,12
-    CTEXT           "Target bitrate (kbps):",IDC_BITRATE_S,12,53,71,13,
-                    SS_NOTIFY | SS_CENTERIMAGE,WS_EX_DLGMODALFRAME
+    CTEXT           "Target bitrate (kbps):",IDC_BITRATE_S,12,53,71,13,SS_NOTIFY | SS_CENTERIMAGE,WS_EX_DLGMODALFRAME
     EDITTEXT        IDC_BITRATE,88,53,91,12,ES_AUTOHSCROLL
     PUSHBUTTON      "calc...",IDC_BITRATE_ADV,184,52,28,12
-    CONTROL         "Slider1",IDC_SLIDER,"msctls_trackbar32",TBS_BOTH | 
-                    TBS_NOTICKS | WS_TABSTOP,12,78,204,14
-    CONTROL         "List1",IDC_ZONES,"SysListView32",LVS_REPORT | 
-                    LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | 
-                    WS_TABSTOP,14,110,198,68,WS_EX_STATICEDGE
+    CONTROL         "Slider1",IDC_SLIDER,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,12,78,204,14
+    CONTROL         "List1",IDC_ZONES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_TABSTOP,14,110,198,68,WS_EX_STATICEDGE
     PUSHBUTTON      "Add",IDC_ADD,16,182,36,12
     PUSHBUTTON      "Remove",IDC_REMOVE,56,182,36,12
     PUSHBUTTON      "Zone Options...",IDC_EDIT,155,182,57,12
@@ -108,14 +92,13 @@
     RTEXT           "X",IDC_BITRATE_MAX,125,70,84,8
     GROUPBOX        "Zones",IDC_STATIC,7,98,212,107
     GROUPBOX        "More",IDC_STATIC,7,200,212,29
-    COMBOBOX        IDC_QUALITY,86,210,92,76,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
+    COMBOBOX        IDC_QUALITY,86,210,92,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "more...",IDC_QUALITY_ADV,182,210,28,12
     LTEXT           "Quality preset:",IDC_STATIC,12,210,70,12,SS_CENTERIMAGE
 END
 
-IDD_QUANT DIALOG DISCARDABLE  0, 0, 212, 212
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+IDD_QUANT DIALOG 0, 0, 212, 212
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Quantization"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -126,24 +109,17 @@
     EDITTEXT        IDC_MINBQUANT,120,82,76,12,ES_AUTOHSCROLL | ES_NUMBER
     EDITTEXT        IDC_MAXBQUANT,120,98,76,12,ES_AUTOHSCROLL | ES_NUMBER
     GROUPBOX        "Quantizer restrictions",IDC_STATIC,8,6,196,112
-    LTEXT           "Min I-frame quantizer:",IDC_STATIC,16,18,76,12,
-                    SS_CENTERIMAGE
-    LTEXT           "Max I-frame quantizer:",IDC_STATIC,16,34,76,12,
-                    SS_CENTERIMAGE
-    LTEXT           "Min P-frame quantizer:",IDC_STATIC,16,50,76,12,
-                    SS_CENTERIMAGE
-    LTEXT           "Max P-frame quantizer:",IDC_STATIC,16,66,76,12,
-                    SS_CENTERIMAGE
-    LTEXT           "Min B-frame quantizer:",IDC_STATIC,16,82,76,12,
-                    SS_CENTERIMAGE
-    LTEXT           "Max B-frame quantizer:",IDC_STATIC,16,98,76,12,
-                    SS_CENTERIMAGE
-    CONTROL         "Trellis quantization",IDC_TRELLISQUANT,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,8,128,74,10
+    LTEXT           "Min I-frame quantizer:",IDC_STATIC,16,18,76,12,SS_CENTERIMAGE
+    LTEXT           "Max I-frame quantizer:",IDC_STATIC,16,34,76,12,SS_CENTERIMAGE
+    LTEXT           "Min P-frame quantizer:",IDC_STATIC,16,50,76,12,SS_CENTERIMAGE
+    LTEXT           "Max P-frame quantizer:",IDC_STATIC,16,66,76,12,SS_CENTERIMAGE
+    LTEXT           "Min B-frame quantizer:",IDC_STATIC,16,82,76,12,SS_CENTERIMAGE
+    LTEXT           "Max B-frame quantizer:",IDC_STATIC,16,98,76,12,SS_CENTERIMAGE
+    CONTROL         "Trellis quantization",IDC_TRELLISQUANT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,128,74,10
 END
 
-IDD_RC_2PASS2 DIALOG DISCARDABLE  0, 0, 212, 212
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+IDD_RC_2PASS2 DIALOG 0, 0, 212, 212
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "2nd Pass"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -152,330 +128,186 @@
     EDITTEXT        IDC_KFBOOST,140,34,56,12,ES_AUTOHSCROLL | ES_NUMBER
     EDITTEXT        IDC_MINKEY,140,55,56,12,ES_AUTOHSCROLL | ES_NUMBER
     EDITTEXT        IDC_KFREDUCTION,140,69,56,12,ES_AUTOHSCROLL | ES_NUMBER
-    EDITTEXT        IDC_OVERFLOW_CONTROL_STRENGTH,140,99,56,12,
-                    ES_AUTOHSCROLL | ES_NUMBER
+    EDITTEXT        IDC_OVERFLOW_CONTROL_STRENGTH,140,99,56,12,ES_AUTOHSCROLL | ES_NUMBER
     EDITTEXT        IDC_OVERIMP,140,118,56,12,ES_AUTOHSCROLL | ES_NUMBER
     EDITTEXT        IDC_OVERDEG,140,137,56,12,ES_AUTOHSCROLL | ES_NUMBER
     EDITTEXT        IDC_CURVECOMPH,140,169,56,12,ES_AUTOHSCROLL | ES_NUMBER
     EDITTEXT        IDC_CURVECOMPL,140,186,56,12,ES_AUTOHSCROLL | ES_NUMBER
     LTEXT           "Stats filename:",IDC_STATIC,8,6,52,12,SS_CENTERIMAGE
     GROUPBOX        "Intra-frames tuning",IDC_STATIC,7,22,197,69
-    LTEXT           "Overflow control strength (%):",IDC_STATIC,16,100,100,
-                    12,SS_CENTERIMAGE
-    LTEXT           "High bitrate scenes degradation (%):",IDC_STATIC,16,170,
-                    124,12,SS_CENTERIMAGE
-    LTEXT           "Low bitrate scenes improvement (%):",IDC_STATIC,16,186,
-                    124,12,SS_CENTERIMAGE
-    LTEXT           "I-frame boost (%):",IDC_STATIC,16,34,91,12,
-                    SS_CENTERIMAGE
+    LTEXT           "Overflow control strength (%):",IDC_STATIC,16,100,100,12,SS_CENTERIMAGE
+    LTEXT           "High bitrate scenes degradation (%):",IDC_STATIC,16,170,124,12,SS_CENTERIMAGE
+    LTEXT           "Low bitrate scenes improvement (%):",IDC_STATIC,16,186,124,12,SS_CENTERIMAGE
+    LTEXT           "I-frame boost (%):",IDC_STATIC,16,34,91,12,SS_CENTERIMAGE
     LTEXT           "...are reduced by (%):",IDC_STATIC,16,69,100,12
-    LTEXT           "Max overflow improvement (%):",IDC_STATIC,16,119,100,12,
-                    SS_CENTERIMAGE
-    LTEXT           "Max overflow degradation (%):",IDC_STATIC,16,138,100,12,
-                    SS_CENTERIMAGE
-    LTEXT           "I-frames closer than... (frames):",IDC_STATIC,16,56,124,
-                    11
+    LTEXT           "Max overflow improvement (%):",IDC_STATIC,16,119,100,12,SS_CENTERIMAGE
+    LTEXT           "Max overflow degradation (%):",IDC_STATIC,16,138,100,12,SS_CENTERIMAGE
+    LTEXT           "I-frames closer than... (frames):",IDC_STATIC,16,56,124,11
     GROUPBOX        "Overflow treatment",IDC_STATIC,7,86,197,75
     GROUPBOX        "Curve compression",IDC_STATIC,7,156,197,51
 END

xvidcore-1.2.2.tar.bz2/vfw/src/status.c -> xvidcore-1.3.0.tar.bz2/vfw/src/status.c Changed

xvidcore-1.2.2.tar.bz2/vfw/src/status.h -> xvidcore-1.3.0.tar.bz2/vfw/src/status.h Changed

@@ -1,3 +1,28 @@
+/*****************************************************************************
+ *
+ *  XVID MPEG-4 VIDEO CODEC
+ *  - Status window header  -
+ *
+ *  Copyright(C) Peter Ross <pross@xvid.org>
+ *
+ *  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
+ *
+ * $Id: status.h,v 1.3 2010/12/02 06:46:07 Isibaar Exp $
+ *
+ ****************************************************************************/
+
 #ifndef _STATUS_H_
 #define _STATUS_H_

xvidcore-1.2.2.tar.bz2/vfw/src/vfwext.h -> xvidcore-1.3.0.tar.bz2/vfw/src/vfwext.h Changed

xvidcore-1.2.2.tar.bz2/vfw/src/xvid.ico -> xvidcore-1.3.0.tar.bz2/vfw/src/xvid.ico Changed

xvidcore-1.2.2.tar.bz2/vfw/vfw.vcproj -> xvidcore-1.3.0.tar.bz2/vfw/vfw.vcproj Changed

@@ -50,7 +50,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\src"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -149,7 +149,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\src"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
@@ -245,7 +245,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\src"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -344,7 +344,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\src"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"

Changes of Revision 2