[xiph-commits] r10497 - in branches/theora-oil: . debian doc
doc/python doc/spec examples lib m4 symbian tests win32
win32/VS2003 win32/VS2003/libtheora
j at svn.xiph.org
j at svn.xiph.org
Mon Nov 28 08:23:44 PST 2005
Author: j
Date: 2005-11-28 08:23:34 -0800 (Mon, 28 Nov 2005)
New Revision: 10497
Added:
branches/theora-oil/AUTHORS
branches/theora-oil/doc/draft-barbato-avt-rtp-theora-00.txt
branches/theora-oil/doc/draft-barbato-avt-rtp-theora-00.xml
branches/theora-oil/m4/Makefile.am
branches/theora-oil/m4/ogg.m4
branches/theora-oil/m4/pkg.m4
branches/theora-oil/m4/sdl.m4
branches/theora-oil/m4/vorbis.m4
branches/theora-oil/win32/VS2003/
branches/theora-oil/win32/VS2003/libtheora/
branches/theora-oil/win32/VS2003/libtheora/libtheora.vcproj
branches/theora-oil/win32/libtheora.def
Removed:
branches/theora-oil/acinclude.m4
branches/theora-oil/debian/Makefile.am
branches/theora-oil/win32/VS2003/libtheora/
branches/theora-oil/win32/VS2003/libtheora/libtheora.vcproj
Modified:
branches/theora-oil/
branches/theora-oil/Makefile.am
branches/theora-oil/autogen.sh
branches/theora-oil/configure.ac
branches/theora-oil/doc/
branches/theora-oil/doc/python/
branches/theora-oil/doc/spec/spec.tex
branches/theora-oil/examples/Makefile.am
branches/theora-oil/lib/
branches/theora-oil/lib/encoder_toplevel.c
branches/theora-oil/m4/
branches/theora-oil/symbian/config.h
branches/theora-oil/tests/
branches/theora-oil/tests/Makefile.am
Log:
merge changes from theora-trunk
Property changes on: branches/theora-oil
___________________________________________________________________
Name: branch-point
- 9814
+ 10495
Name: svn:ignore
- Makefile
Makefile.in
aclocal.m4
config.cache
config.log
config.status
configure
libtool
autom4te.cache
config.guess
config.sub
depcomp
install-sh
ltmain.sh
missing
stamp-h1
config.h.in
config.h
+ aclocal.m4
autom4te.cache
compile
config.cache
config.guess
config.h
config.h.in
config.log
config.status
config.sub
configure
depcomp
install-sh
libtheora.spec
libtool
ltmain.sh
Makefile
Makefile.in
missing
mkinstalldirs
stamp-h1
theora.pc
theora-uninstalled.pc
Copied: branches/theora-oil/AUTHORS (from rev 10496, trunk/theora/AUTHORS)
Modified: branches/theora-oil/Makefile.am
===================================================================
--- branches/theora-oil/Makefile.am 2005-11-28 16:19:57 UTC (rev 10496)
+++ branches/theora-oil/Makefile.am 2005-11-28 16:23:34 UTC (rev 10497)
@@ -2,20 +2,24 @@
AUTOMAKE_OPTIONS = foreign 1.6 dist-zip dist-bzip2
-SUBDIRS = lib include doc examples debian tests
+SUBDIRS = lib include doc examples tests m4
-EXTRA_DIST = COPYING autogen.sh win32 libtheora.spec libtheora.spec.in \
- theora-uninstalled.pc.in
+# we include the whole debian/ dir in EXTRA_DIST because there's a problem
+# with autotools and HFS+ MacOSX file systems that caused debian/Makefile.am
+# to pick up on the lowercase changelog file and add ChangeLog to DIST_COMMON
+# because of it, breaking make dist. This works just as well.
+EXTRA_DIST = \
+ COPYING autogen.sh win32 libtheora.spec libtheora.spec.in \
+ theora-uninstalled.pc.in \
+ debian
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = theora.pc
dist-hook:
- rm -rf `find $(distdir)/macos -name CVS`
- rm -rf `find $(distdir)/win32 -name CVS`
- rm -rf `find $(distdir)/macos -name .svn`
+ rm -rf `find $(distdir)/debian -name .svn`
+ rm -rf `find $(distdir)/debian -name "Makefile*"`
rm -rf `find $(distdir)/win32 -name .svn`
- rm -rf `find $(distdir)/doc -name .svn`
debug:
$(MAKE) all CFLAGS="@DEBUG@"
Deleted: branches/theora-oil/acinclude.m4
===================================================================
--- branches/theora-oil/acinclude.m4 2005-11-28 16:19:57 UTC (rev 10496)
+++ branches/theora-oil/acinclude.m4 2005-11-28 16:23:34 UTC (rev 10497)
@@ -1,399 +0,0 @@
-# Configure paths for libogg
-# Jack Moffitt <jack at icecast.org> 10-21-2000
-# Shamelessly stolen from Owen Taylor and Manish Singh
-
-dnl XIPH_PATH_OGG([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl Test for libogg, and define OGG_CFLAGS and OGG_LIBS
-dnl
-AC_DEFUN([XIPH_PATH_OGG],
-[dnl
-dnl Get the cflags and libraries
-dnl
-AC_ARG_WITH(ogg,[ --with-ogg=PFX Prefix where libogg is installed (optional)], ogg_prefix="$withval", ogg_prefix="")
-AC_ARG_WITH(ogg-libraries,[ --with-ogg-libraries=DIR Directory where libogg library is installed (optional)], ogg_libraries="$withval", ogg_libraries="")
-AC_ARG_WITH(ogg-includes,[ --with-ogg-includes=DIR Directory where libogg header files are installed (optional)], ogg_includes="$withval", ogg_includes="")
-AC_ARG_ENABLE(oggtest, [ --disable-oggtest Do not try to compile and run a test Ogg program],, enable_oggtest=yes)
-
- if test "x$ogg_libraries" != "x" ; then
- OGG_LIBS="-L$ogg_libraries"
- elif test "x$ogg_prefix" != "x" ; then
- OGG_LIBS="-L$ogg_prefix/lib"
- elif test "x$prefix" != "xNONE" ; then
- OGG_LIBS="-L$prefix/lib"
- fi
-
- OGG_LIBS="$OGG_LIBS -logg"
-
- if test "x$ogg_includes" != "x" ; then
- OGG_CFLAGS="-I$ogg_includes"
- elif test "x$ogg_prefix" != "x" ; then
- OGG_CFLAGS="-I$ogg_prefix/include"
- elif test "x$prefix" != "xNONE"; then
- OGG_CFLAGS="-I$prefix/include"
- fi
-
- AC_MSG_CHECKING(for Ogg)
- no_ogg=""
-
-
- if test "x$enable_oggtest" = "xyes" ; then
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $OGG_CFLAGS"
- LIBS="$LIBS $OGG_LIBS"
-dnl
-dnl Now check if the installed Ogg is sufficiently new.
-dnl
- rm -f conf.oggtest
- AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ogg/ogg.h>
-
-int main ()
-{
- system("touch conf.oggtest");
- return 0;
-}
-
-],, no_ogg=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
-
- if test "x$no_ogg" = "x" ; then
- AC_MSG_RESULT(yes)
- ifelse([$1], , :, [$1])
- else
- AC_MSG_RESULT(no)
- if test -f conf.oggtest ; then
- :
- else
- echo "*** Could not run Ogg test program, checking why..."
- CFLAGS="$CFLAGS $OGG_CFLAGS"
- LIBS="$LIBS $OGG_LIBS"
- AC_TRY_LINK([
-#include <stdio.h>
-#include <ogg/ogg.h>
-], [ return 0; ],
- [ echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding Ogg or finding the wrong"
- echo "*** version of Ogg. If it is not finding Ogg, you'll need to set your"
- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
- echo "*** to the installed location Also, make sure you have run ldconfig if that"
- echo "*** is required on your system"
- echo "***"
- echo "*** If you have an old version installed, it is best to remove it, although"
- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
- [ echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means Ogg was incorrectly installed"
- echo "*** or that you have moved Ogg since it was installed." ])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- OGG_CFLAGS=""
- OGG_LIBS=""
- ifelse([$2], , :, [$2])
- fi
- AC_SUBST(OGG_CFLAGS)
- AC_SUBST(OGG_LIBS)
- rm -f conf.oggtest
-])
-# Configure paths for libvorbis
-# Jack Moffitt <jack at icecast.org> 10-21-2000
-# Shamelessly stolen from Owen Taylor and Manish Singh
-# thomasvs added check for vorbis_bitrate_addblock which is new in rc3
-
-dnl XIPH_PATH_VORBIS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl Test for libvorbis, and define VORBIS_CFLAGS and VORBIS_LIBS
-dnl
-AC_DEFUN([XIPH_PATH_VORBIS],
-[dnl
-dnl Get the cflags and libraries
-dnl
-AC_ARG_WITH(vorbis,[ --with-vorbis=PFX Prefix where libvorbis is installed (optional)], vorbis_prefix="$withval", vorbis_prefix="")
-AC_ARG_WITH(vorbis-libraries,[ --with-vorbis-libraries=DIR Directory where libvorbis library is installed (optional)], vorbis_libraries="$withval", vorbis_libraries="")
-AC_ARG_WITH(vorbis-includes,[ --with-vorbis-includes=DIR Directory where libvorbis header files are installed (optional)], vorbis_includes="$withval", vorbis_includes="")
-AC_ARG_ENABLE(vorbistest, [ --disable-vorbistest Do not try to compile and run a test Vorbis program],, enable_vorbistest=yes)
-
- if test "x$vorbis_libraries" != "x" ; then
- VORBIS_LIBS="-L$vorbis_libraries"
- elif test "x$vorbis_prefix" != "x" ; then
- VORBIS_LIBS="-L$vorbis_prefix/lib"
- elif test "x$prefix" != "xNONE"; then
- VORBIS_LIBS="-L$prefix/lib"
- fi
-
- VORBIS_LIBS="$VORBIS_LIBS -lvorbis -lm"
- VORBISFILE_LIBS="-lvorbisfile"
- VORBISENC_LIBS="-lvorbisenc"
-
- if test "x$vorbis_includes" != "x" ; then
- VORBIS_CFLAGS="-I$vorbis_includes"
- elif test "x$vorbis_prefix" != "x" ; then
- VORBIS_CFLAGS="-I$vorbis_prefix/include"
- elif test "x$prefix" != "xNONE"; then
- VORBIS_CFLAGS="-I$prefix/include"
- fi
-
-
- AC_MSG_CHECKING(for Vorbis)
- no_vorbis=""
-
-
- if test "x$enable_vorbistest" = "xyes" ; then
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $VORBIS_CFLAGS $OGG_CFLAGS"
- LIBS="$LIBS $VORBIS_LIBS $VORBISENC_LIBS $OGG_LIBS"
-dnl
-dnl Now check if the installed Vorbis is sufficiently new.
-dnl
- rm -f conf.vorbistest
- AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <vorbis/codec.h>
-#include <vorbis/vorbisenc.h>
-
-int main ()
-{
- vorbis_block vb;
- vorbis_dsp_state vd;
- vorbis_info vi;
-
- vorbis_info_init (&vi);
- vorbis_encode_init (&vi, 2, 44100, -1, 128000, -1);
- vorbis_analysis_init (&vd, &vi);
- vorbis_block_init (&vd, &vb);
- /* this function was added in 1.0rc3, so this is what we're testing for */
- vorbis_bitrate_addblock (&vb);
-
- system("touch conf.vorbistest");
- return 0;
-}
-
-],, no_vorbis=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
-
- if test "x$no_vorbis" = "x" ; then
- AC_MSG_RESULT(yes)
- ifelse([$1], , :, [$1])
- else
- AC_MSG_RESULT(no)
- if test -f conf.vorbistest ; then
- :
- else
- echo "*** Could not run Vorbis test program, checking why..."
- CFLAGS="$CFLAGS $VORBIS_CFLAGS"
- LIBS="$LIBS $VORBIS_LIBS $OGG_LIBS"
- AC_TRY_LINK([
-#include <stdio.h>
-#include <vorbis/codec.h>
-], [ return 0; ],
- [ echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding Vorbis or finding the wrong"
- echo "*** version of Vorbis. If it is not finding Vorbis, you'll need to set your"
- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
- echo "*** to the installed location Also, make sure you have run ldconfig if that"
- echo "*** is required on your system"
- echo "***"
- echo "*** If you have an old version installed, it is best to remove it, although"
- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
- [ echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means Vorbis was incorrectly installed"
- echo "*** or that you have moved Vorbis since it was installed." ])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- VORBIS_CFLAGS=""
- VORBIS_LIBS=""
- VORBISFILE_LIBS=""
- VORBISENC_LIBS=""
- ifelse([$2], , :, [$2])
- fi
- AC_SUBST(VORBIS_CFLAGS)
- AC_SUBST(VORBIS_LIBS)
- AC_SUBST(VORBISFILE_LIBS)
- AC_SUBST(VORBISENC_LIBS)
- rm -f conf.vorbistest
-])
-# Configure paths for SDL
-# Sam Lantinga 9/21/99
-# stolen from Manish Singh
-# stolen back from Frank Belew
-# stolen from Manish Singh
-# Shamelessly stolen from Owen Taylor
-
-dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
-dnl
-AC_DEFUN([AM_PATH_SDL],
-[dnl
-dnl Get the cflags and libraries from the sdl-config script
-dnl
-AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)],
- sdl_prefix="$withval", sdl_prefix="")
-AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
- sdl_exec_prefix="$withval", sdl_exec_prefix="")
-AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program],
- , enable_sdltest=yes)
-
- if test x$sdl_exec_prefix != x ; then
- sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
- if test x${SDL_CONFIG+set} != xset ; then
- SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
- fi
- fi
- if test x$sdl_prefix != x ; then
- sdl_args="$sdl_args --prefix=$sdl_prefix"
- if test x${SDL_CONFIG+set} != xset ; then
- SDL_CONFIG=$sdl_prefix/bin/sdl-config
- fi
- fi
-
- AC_REQUIRE([AC_CANONICAL_TARGET])
- PATH="$prefix/bin:$prefix/usr/bin:$PATH"
- AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
- min_sdl_version=ifelse([$1], ,0.11.0,$1)
- AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
- no_sdl=""
- if test "$SDL_CONFIG" = "no" ; then
- no_sdl=yes
- else
- SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
- SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
-
- sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
- if test "x$enable_sdltest" = "xyes" ; then
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $SDL_CFLAGS"
- LIBS="$LIBS $SDL_LIBS"
-dnl
-dnl Now check if the installed SDL is sufficiently new. (Also sanity
-dnl checks the results of sdl-config to some extent
-dnl
- rm -f conf.sdltest
- AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "SDL.h"
-
-char*
-my_strdup (char *str)
-{
- char *new_str;
-
- if (str)
- {
- new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
- strcpy (new_str, str);
- }
- else
- new_str = NULL;
-
- return new_str;
-}
-
-int main (int argc, char *argv[])
-{
- int major, minor, micro;
- char *tmp_version;
-
- /* This hangs on some systems (?)
- system ("touch conf.sdltest");
- */
- { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
-
- /* HP/UX 9 (%@#!) writes to sscanf strings */
- tmp_version = my_strdup("$min_sdl_version");
- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
- printf("%s, bad version string\n", "$min_sdl_version");
- exit(1);
- }
-
- if (($sdl_major_version > major) ||
- (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
- (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
- {
- return 0;
- }
- else
- {
- printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
- printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
- printf("*** best to upgrade to the required version.\n");
- printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
- printf("*** to point to the correct copy of sdl-config, and remove the file\n");
- printf("*** config.cache before re-running configure\n");
- return 1;
- }
-}
-
-],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- if test "x$no_sdl" = x ; then
- AC_MSG_RESULT(yes)
- ifelse([$2], , :, [$2])
- else
- AC_MSG_RESULT(no)
- if test "$SDL_CONFIG" = "no" ; then
- echo "*** The sdl-config script installed by SDL could not be found"
- echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
- echo "*** your path, or set the SDL_CONFIG environment variable to the"
- echo "*** full path to sdl-config."
- else
- if test -f conf.sdltest ; then
- :
- else
- echo "*** Could not run SDL test program, checking why..."
- CFLAGS="$CFLAGS $SDL_CFLAGS"
- LIBS="$LIBS $SDL_LIBS"
- AC_TRY_LINK([
-#include <stdio.h>
-#include "SDL.h"
-
-int main(int argc, char *argv[])
-{ return 0; }
-#undef main
-#define main K_and_R_C_main
-], [ return 0; ],
- [ echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding SDL or finding the wrong"
- echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
- echo "*** to the installed location Also, make sure you have run ldconfig if that"
- echo "*** is required on your system"
- echo "***"
- echo "*** If you have an old version installed, it is best to remove it, although"
- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
- [ echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means SDL was incorrectly installed"
- echo "*** or that you have moved SDL since it was installed. In the latter case, you"
- echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- SDL_CFLAGS=""
- SDL_LIBS=""
- ifelse([$3], , :, [$3])
- fi
- AC_SUBST(SDL_CFLAGS)
- AC_SUBST(SDL_LIBS)
- rm -f conf.sdltest
-])
Modified: branches/theora-oil/autogen.sh
===================================================================
--- branches/theora-oil/autogen.sh 2005-11-28 16:19:57 UTC (rev 10496)
+++ branches/theora-oil/autogen.sh 2005-11-28 16:23:34 UTC (rev 10497)
@@ -114,11 +114,6 @@
echo " autoconf"
autoconf || exit 1
-# this search and replace hack is specifically for MacOSX where automake
-# picks up changelog in debian/ because of filesystem
-# case-not-quite-sensitivity breaking make distcheck
-perl -i -p -e 's/DIST_COMMON = ChangeLog/DIST_COMMON =/g' debian/Makefile.in
-
cd
cd $olddir
$srcdir/configure --enable-maintainer-mode "$@" && echo
Modified: branches/theora-oil/configure.ac
===================================================================
--- branches/theora-oil/configure.ac 2005-11-28 16:19:57 UTC (rev 10496)
+++ branches/theora-oil/configure.ac 2005-11-28 16:23:34 UTC (rev 10497)
@@ -84,7 +84,6 @@
dnl Set some target options
cflags_save="$CFLAGS"
-ldflags_save="$LDFLAGS"
if test -z "$GCC"; then
case $host in
*)
@@ -102,16 +101,23 @@
esac
fi
CFLAGS="$CFLAGS $cflags_save"
-LDFLAGS="$LDFLAGS $ldflags_save"
-dnl Set extra linker options
-case "$target_os" in
+# Test whenever ld supports -version-script
+AC_PROG_LD
+AC_PROG_LD_GNU
+if test "x$lt_cv_prog_gnu_ld" = "xyes"; then
+ SHLIB_VERSION_ARG="Wl,--version-script=Version_script"
+
+ dnl Set extra linker options
+ case "$target_os" in
linux* | solaris* )
SHLIB_VERSION_ARG="-Wl,--version-script=Version_script"
;;
*)
;;
-esac
+ esac
+fi
+
AC_SUBST(SHLIB_VERSION_ARG)
dnl --------------------------------------------------
@@ -237,7 +243,7 @@
[Define to exclude encode support from the build])
else
if test x$HAVE_VORBIS = xyes; then
- BUILDABLE_EXAMPLES="$BUILDABLE_EXAMPLES encoder_example"
+ BUILDABLE_EXAMPLES="$BUILDABLE_EXAMPLES encoder_example\$(EXEEXT)"
else
AC_MSG_NOTICE([Vorbis missing, cannot build example encoder])
fi
@@ -283,9 +289,9 @@
include/Makefile include/theora/Makefile
examples/Makefile
doc/Makefile doc/Doxyfile
- debian/Makefile
tests/Makefile
lib/Version_script
+ m4/Makefile
libtheora.spec
theora.pc
theora-uninstalled.pc
Deleted: branches/theora-oil/debian/Makefile.am
===================================================================
--- branches/theora-oil/debian/Makefile.am 2005-11-28 16:19:57 UTC (rev 10496)
+++ branches/theora-oil/debian/Makefile.am 2005-11-28 16:23:34 UTC (rev 10497)
@@ -1,4 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-EXTRA_DIST = changelog control copyright \
- libtheora-dev.install libtheora0.install rules
Property changes on: branches/theora-oil/doc
___________________________________________________________________
Name: svn:ignore
- spec.html
spec.py
Makefile.in
Makefile
+ Makefile.in
Makefile
Doxyfile
Copied: branches/theora-oil/doc/draft-barbato-avt-rtp-theora-00.txt (from rev 10496, trunk/theora/doc/draft-barbato-avt-rtp-theora-00.txt)
Copied: branches/theora-oil/doc/draft-barbato-avt-rtp-theora-00.xml (from rev 10496, trunk/theora/doc/draft-barbato-avt-rtp-theora-00.xml)
Property changes on: branches/theora-oil/doc/python
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Makefile
spec.html
spec.py
Modified: branches/theora-oil/doc/spec/spec.tex
===================================================================
--- branches/theora-oil/doc/spec/spec.tex 2005-11-28 16:19:57 UTC (rev 10496)
+++ branches/theora-oil/doc/spec/spec.tex 2005-11-28 16:23:34 UTC (rev 10497)
@@ -2706,7 +2706,7 @@
The stream is undecodable.
\item
\label{step:qr-loop}
-Read an $\ilog(63-\locvar{\qi})$-bit unsigned integer.
+Read an $\ilog(62-\locvar{\qi})$-bit unsigned integer.
Assign\\ $\bitvar{QRSIZES}[\locvar{\qti}][\locvar{\pli}][\locvar{\qri}]$ the value
read, plus one.
\item
@@ -4099,7 +4099,7 @@
Otherwise, if $\bitvar{MBMODES}[\locvar{\mbi}]$ is 4 (INTER\_MV\_LAST2):
\begin{enumerate}
\item
-Assign $(\locvar{MVX},\locvar{MVY}$ the value \locvar{LAST2}.
+Assign $(\locvar{MVX},\locvar{MVY})$ the value \locvar{LAST2}.
\item
Assign \locvar{LAST2} the value \locvar{LAST1}.
\item
@@ -4120,8 +4120,9 @@
Assign \locvar{LAST1} the value $(\locvar{MVX},\locvar{MVY})$.
\end{enumerate}
\item
-Otherwise (5:~INTER\_GOLDEN\_NOMV, 1:~INTRA, or \\
- 0:~INTER\_NOMV), assign \locvar{MVX} and \locvar{MVY} the value zero.
+Otherwise ($\bitvar{MBMODES}[\locvar{\mbi}]$ is 5:~INTER\_GOLDEN\_NOMV,
+ 1:~INTRA, or 0:~INTER\_NOMV), assign \locvar{MVX} and \locvar{MVY} the value
+ zero.
\item
If $\bitvar{MBMODES}[\locvar{\mbi}]$ is not 7 (not INTER\_MV\_FOUR), then for
each coded block \locvar{\bi} in macro block \locvar{\mbi}:
@@ -4206,13 +4207,12 @@
The value is actually represented by an index \locvar{\qii} into the list of
\qi\ values defined for the frame.
-It makes multiple passes through the list of coded blocks, one for each \qi\
- value except the last one.
+The decoder makes multiple passes through the list of coded blocks, one for
+ each \qi\ value except the last one.
In each pass, an RLE-coded bitmask is decoded to divide the blocks into two
- groups: those that use a value of \qi\ from later in the list, and those that
- do not.
-Each block in the second group is assigned the current \qi\ value.
-Each subsequent pass is restricted to the blocks in the first group.
+ groups: those that use the current \qi\ value in the list, and those that use
+ a value from later in the list.
+Each subsequent pass is restricted to the blocks in the second group.
\begin{enumerate}
\item
@@ -4244,9 +4244,9 @@
\paragraph{VP3 Compatibility}
For VP3 compatible streams, only one \qi\ value can be specified in the frame
- header, so the main loop of the above procedure, which goes to
- $\bitvar{NQIIS}-2$ instead of $\bitvar{NQIIS}-1$, is never executed.
-Thus, no bits are read and each block uses the one \qi\ value defined for the
+ header, so the main loop of the above procedure, which would iterate from $0$
+ to $-1$, is never executed.
+Thus, no bits are read, and each block uses the one \qi\ value defined for the
frame.
\cleardoublepage
Modified: branches/theora-oil/examples/Makefile.am
===================================================================
--- branches/theora-oil/examples/Makefile.am 2005-11-28 16:19:57 UTC (rev 10496)
+++ branches/theora-oil/examples/Makefile.am 2005-11-28 16:23:34 UTC (rev 10497)
@@ -11,13 +11,17 @@
LDADD = ../lib/libtheora.la $(OGG_LIBS) $(LIBOIL_LIBS)
dump_video_SOURCES = dump_video.c
-dump_video_LDADD = $(LDADD)
+EXTRA_dump_video_SOURCES = getopt.c getopt1.c getopt.h
+dump_video_LDADD = $(GETOPT_OBJS) $(LDADD)
+dump_video_DEPENDENCIES = $(GETOPT_OBJS)
player_example_SOURCES = player_example.c
+player_example_CFLAGS = $(SDL_CFLAGS) $(OGG_CFLAGS) $(VORBIS_CFLAGS)
player_example_LDADD = $(LDADD) $(SDL_LIBS) $(VORBIS_LIBS)
encoder_example_SOURCES = encoder_example.c
EXTRA_encoder_example_SOURCES = getopt.c getopt1.c getopt.h
+encoder_example_CFLAGS = $(OGG_CFLAGS) $(VORBIS_CFLAGS)
encoder_example_LDADD = $(GETOPT_OBJS) $(LDADD) $(VORBIS_LIBS) $(VORBISENC_LIBS)
encoder_example_DEPENDENCIES = $(GETOPT_OBJS)
Property changes on: branches/theora-oil/lib
___________________________________________________________________
Name: svn:ignore
- .deps
.libs
Makefile
Makefile.in
*.o
*.lo
*.la
+ .deps
.libs
Makefile
Makefile.in
*.o
*.lo
*.la
Version_script
Modified: branches/theora-oil/lib/encoder_toplevel.c
===================================================================
--- branches/theora-oil/lib/encoder_toplevel.c 2005-11-28 16:19:57 UTC (rev 10496)
+++ branches/theora-oil/lib/encoder_toplevel.c 2005-11-28 16:23:34 UTC (rev 10497)
@@ -1124,8 +1124,8 @@
op->bytes=oggpack_bytes(opb);
#ifndef LIBOGG2
- /* So we're expecting the application with free this? */
- op->packet=malloc(oggpack_bytes(opb));
+ /* So we're expecting the application will free this? */
+ op->packet=_ogg_malloc(oggpack_bytes(opb));
memcpy(op->packet, oggpack_get_buffer(opb), oggpack_bytes(opb));
oggpack_writeclear(opb);
#else
@@ -1134,7 +1134,7 @@
it becomes the property of libogg2's internal memory management. */
#endif
- free(opb);
+ _ogg_free(opb);
op->b_o_s=0;
op->e_o_s=0;
Property changes on: branches/theora-oil/m4
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
Copied: branches/theora-oil/m4/Makefile.am (from rev 10496, trunk/theora/m4/Makefile.am)
Copied: branches/theora-oil/m4/ogg.m4 (from rev 10496, trunk/theora/m4/ogg.m4)
Copied: branches/theora-oil/m4/pkg.m4 (from rev 10496, trunk/theora/m4/pkg.m4)
Copied: branches/theora-oil/m4/sdl.m4 (from rev 10496, trunk/theora/m4/sdl.m4)
Copied: branches/theora-oil/m4/vorbis.m4 (from rev 10496, trunk/theora/m4/vorbis.m4)
Modified: branches/theora-oil/symbian/config.h
===================================================================
--- branches/theora-oil/symbian/config.h 2005-11-28 16:19:57 UTC (rev 10496)
+++ branches/theora-oil/symbian/config.h 2005-11-28 16:23:34 UTC (rev 10497)
@@ -39,7 +39,7 @@
/* Do not build floating point code */
-#define THEORA_SUPPORT_FLOAT 0
+#define THEORA_DISABLE_FLOAT 1
#ifdef __WINS__
Property changes on: branches/theora-oil/tests
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
noop
comment-test
.libs
.deps
Modified: branches/theora-oil/tests/Makefile.am
===================================================================
--- branches/theora-oil/tests/Makefile.am 2005-11-28 16:19:57 UTC (rev 10496)
+++ branches/theora-oil/tests/Makefile.am 2005-11-28 16:23:34 UTC (rev 10497)
@@ -2,6 +2,8 @@
noinst_HEADERS = tests.h
+AM_CFLAGS = $(OGG_CFLAGS)
+
THEORADIR = ../lib
THEORA_LIBS = $(THEORADIR)/libtheora.la $(OGG_LIBS) $(LIBOIL_LIBS)
@@ -15,6 +17,8 @@
noop_SOURCES = noop.c
noop_LDADD = $(THEORA_LIBS)
+noop_CFLAGS = $(OGG_CFLAGS)
comment_test_SOURCES = comment-test.c
comment_test_LDADD = $(THEORA_LIBS)
+comment_test_CFLAGS = $(OGG_CFLAGS)
Copied: branches/theora-oil/win32/VS2003 (from rev 10496, trunk/theora/win32/VS2003)
Copied: branches/theora-oil/win32/VS2003/libtheora (from rev 10496, trunk/theora/win32/VS2003/libtheora)
Deleted: branches/theora-oil/win32/VS2003/libtheora/libtheora.vcproj
===================================================================
--- trunk/theora/win32/VS2003/libtheora/libtheora.vcproj 2005-11-28 16:19:57 UTC (rev 10496)
+++ branches/theora-oil/win32/VS2003/libtheora/libtheora.vcproj 2005-11-28 16:23:34 UTC (rev 10497)
@@ -1,367 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="7.10"
- Name="libtheora"
- ProjectGUID="{653F3841-3F26-49B9-AFCF-091DB4B67031}"
- Keyword="Win32Proj">
- <Platforms>
- <Platform
- Name="Win32"/>
- </Platforms>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
- ConfigurationType="2"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTHEORA_EXPORTS"
- MinimalRebuild="TRUE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="4"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)/libtheora.dll"
- LinkIncremental="2"
- ModuleDefinitionFile="..\..\libtheora.def"
- GenerateDebugInformation="TRUE"
- ProgramDatabaseFile="$(OutDir)/libtheora.pdb"
- SubSystem="2"
- ImportLibrary="$(OutDir)/libtheora.lib"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
- ConfigurationType="2"
- CharacterSet="2"
- WholeProgramOptimization="TRUE">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="3"
- GlobalOptimizations="TRUE"
- InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="TRUE"
- FavorSizeOrSpeed="1"
- OptimizeForProcessor="2"
- AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTHEORA_EXPORTS"
- StringPooling="TRUE"
- ExceptionHandling="FALSE"
- RuntimeLibrary="0"
- BufferSecurityCheck="FALSE"
- UsePrecompiledHeader="0"
- WarningLevel="4"
- Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="3"
- CompileAs="1"
- DisableSpecificWarnings="4244;4267;4057;4100;4245"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)/libtheora.dll"
- LinkIncremental="1"
- ModuleDefinitionFile="..\..\libtheora.def"
- GenerateDebugInformation="TRUE"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- OptimizeForWindows98="1"
- ImportLibrary="$(OutDir)/libtheora.lib"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="Release_SSE|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="2"
- WholeProgramOptimization="TRUE">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="3"
- GlobalOptimizations="TRUE"
- InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="TRUE"
- FavorSizeOrSpeed="1"
- OptimizeForProcessor="2"
- AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTHEORA_EXPORTS"
- StringPooling="TRUE"
- ExceptionHandling="FALSE"
- RuntimeLibrary="0"
- BufferSecurityCheck="FALSE"
- EnableEnhancedInstructionSet="1"
- UsePrecompiledHeader="0"
- WarningLevel="4"
- Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="3"
- CompileAs="1"
- DisableSpecificWarnings="4244;4267;4057;4100;4245"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)/libtheora.dll"
- LinkIncremental="1"
- ModuleDefinitionFile="..\..\libtheora.def"
- GenerateDebugInformation="TRUE"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- OptimizeForWindows98="1"
- ImportLibrary="$(OutDir)/libtheora.lib"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="Release_SSE2|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="2"
- WholeProgramOptimization="TRUE">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="3"
- GlobalOptimizations="TRUE"
- InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="TRUE"
- FavorSizeOrSpeed="1"
- OptimizeForProcessor="3"
- AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTHEORA_EXPORTS"
- StringPooling="TRUE"
- ExceptionHandling="FALSE"
- RuntimeLibrary="0"
- BufferSecurityCheck="FALSE"
- EnableEnhancedInstructionSet="2"
- UsePrecompiledHeader="0"
- WarningLevel="4"
- Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="3"
- CompileAs="1"
- DisableSpecificWarnings="4244;4267;4057;4100;4245"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)/libtheora.dll"
- LinkIncremental="1"
- ModuleDefinitionFile="..\..\libtheora.def"
- GenerateDebugInformation="TRUE"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- OptimizeForWindows98="1"
- ImportLibrary="$(OutDir)/libtheora.lib"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
- <File
- RelativePath="..\..\..\lib\blockmap.c">
- </File>
- <File
- RelativePath="..\..\..\lib\comment.c">
- </File>
- <File
- RelativePath="..\..\..\lib\dct.c">
- </File>
- <File
- RelativePath="..\..\..\lib\dct_decode.c">
- </File>
- <File
- RelativePath="..\..\..\lib\dct_encode.c">
- </File>
- <File
- RelativePath="..\..\..\lib\decode.c">
- </File>
- <File
- RelativePath="..\..\..\lib\encode.c">
- </File>
- <File
- RelativePath="..\..\..\lib\encoder_toplevel.c">
- </File>
- <File
- RelativePath="..\..\..\lib\frarray.c">
- </File>
- <File
- RelativePath="..\..\..\lib\frinit.c">
- </File>
- <File
- RelativePath="..\..\..\lib\huffman.c">
- </File>
- <File
- RelativePath="..\..\..\lib\idct.c">
- </File>
- <File
- RelativePath="..\..\libtheora.def">
- </File>
- <File
- RelativePath="..\..\..\lib\mcomp.c">
- </File>
- <File
- RelativePath="..\..\..\lib\misc_common.c">
- </File>
- <File
- RelativePath="..\..\..\lib\pb.c">
- </File>
- <File
- RelativePath="..\..\..\lib\pp.c">
- </File>
- <File
- RelativePath="..\..\..\lib\quant.c">
- </File>
- <File
- RelativePath="..\..\..\lib\reconstruct.c">
- </File>
- <File
- RelativePath="..\..\..\lib\scan.c">
- </File>
- <File
- RelativePath="..\..\..\lib\toplevel.c">
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
- <File
- RelativePath="..\..\..\lib\block_inline.h">
- </File>
- <File
- RelativePath="..\..\..\lib\encoder_internal.h">
- </File>
- <File
- RelativePath="..\..\..\lib\encoder_lookup.h">
- </File>
- <File
- RelativePath="..\..\..\lib\huffman.h">
- </File>
- <File
- RelativePath="..\..\..\lib\hufftables.h">
- </File>
- <File
- RelativePath="..\..\..\lib\mcomp.h">
- </File>
- <File
- RelativePath="..\..\..\lib\pp.h">
- </File>
- <File
- RelativePath="..\..\..\lib\quant_lookup.h">
- </File>
- <File
- RelativePath="..\..\..\include\theora\theora.h">
- </File>
- <File
- RelativePath="..\..\..\lib\toplevel_lookup.h">
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
Copied: branches/theora-oil/win32/VS2003/libtheora/libtheora.vcproj (from rev 10496, trunk/theora/win32/VS2003/libtheora/libtheora.vcproj)
Copied: branches/theora-oil/win32/libtheora.def (from rev 10496, trunk/theora/win32/libtheora.def)
More information about the commits
mailing list