[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17248] trunk/lib/windows: Windows library update for the Video texture Module.
Benoit Bolsee
benoit.bolsee at online.be
Fri Oct 31 20:43:21 CET 2008
Revision: 17248
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17248
Author: ben2610
Date: 2008-10-31 20:43:18 +0100 (Fri, 31 Oct 2008)
Log Message:
-----------
Windows library update for the Video texture Module.
Update the ffmpeg Windows binaries to support network protocol
so that video texture from streaming source is possible:
Remove --disable-network configure option.
The same should be done on other OS build.
Add headers from numpy module to Python2.5 include files.
The video texture module uses numpy to to transfer texture
images to and from application memory.
The numpy package can be found at http://numpy.scipy.org/
The same should be done on other Python versions and OS.
Modified Paths:
--------------
trunk/lib/windows/ffmpeg/Readme.txt
trunk/lib/windows/ffmpeg/include/stdint.h
trunk/lib/windows/ffmpeg/lib/avcodec-51.dll
trunk/lib/windows/ffmpeg/lib/avcodec-51.lib
trunk/lib/windows/ffmpeg/lib/avdevice-52.dll
trunk/lib/windows/ffmpeg/lib/avdevice-52.lib
trunk/lib/windows/ffmpeg/lib/avformat-52.dll
trunk/lib/windows/ffmpeg/lib/avformat-52.lib
trunk/lib/windows/ffmpeg/lib/avutil-49.dll
trunk/lib/windows/ffmpeg/lib/avutil-49.lib
trunk/lib/windows/ffmpeg/lib/swscale-0.dll
trunk/lib/windows/ffmpeg/lib/swscale-0.lib
Added Paths:
-----------
trunk/lib/windows/python/include/python2.5/numpy/
trunk/lib/windows/python/include/python2.5/numpy/__multiarray_api.h
trunk/lib/windows/python/include/python2.5/numpy/__ufunc_api.h
trunk/lib/windows/python/include/python2.5/numpy/arrayobject.h
trunk/lib/windows/python/include/python2.5/numpy/arrayscalars.h
trunk/lib/windows/python/include/python2.5/numpy/multiarray_api.txt
trunk/lib/windows/python/include/python2.5/numpy/ndarrayobject.h
trunk/lib/windows/python/include/python2.5/numpy/noprefix.h
trunk/lib/windows/python/include/python2.5/numpy/npy_interrupt.h
trunk/lib/windows/python/include/python2.5/numpy/numpyconfig.h
trunk/lib/windows/python/include/python2.5/numpy/old_defines.h
trunk/lib/windows/python/include/python2.5/numpy/oldnumeric.h
trunk/lib/windows/python/include/python2.5/numpy/ufunc_api.txt
trunk/lib/windows/python/include/python2.5/numpy/ufuncobject.h
Modified: trunk/lib/windows/ffmpeg/Readme.txt
===================================================================
--- trunk/lib/windows/ffmpeg/Readme.txt 2008-10-31 17:12:45 UTC (rev 17247)
+++ trunk/lib/windows/ffmpeg/Readme.txt 2008-10-31 19:43:18 UTC (rev 17248)
@@ -13,7 +13,7 @@
After getting revision from svn, apply the patch from Peter Schaile: ffmpeg_accel_bgra32.patch
Compilation option for ffmpeg:
- --enable-shared --disable-static --enable-memalign-hack --extra-ldflags=-L/shared/lib --extra-cflags=-I/shared/include --enable-libmp3lame --enable-libfaac --enable-libfaad --enable-libx264 --enable-liba52 --enable-gpl --enable-libxvid --enable-swscale --disable-ffplay --disable-ffserver --disable-zlib --disable-network --disable-vhook
+ --enable-shared --disable-static --enable-memalign-hack --extra-ldflags=-L/shared/lib --extra-cflags=-I/shared/include --enable-libmp3lame --enable-libfaac --enable-libfaad --enable-libx264 --enable-liba52 --enable-gpl --enable-libxvid --enable-swscale --disable-ffplay --disable-ffserver --disable-zlib --disable-vhook
The compilation returns error on linking the ffmpeg applications but the DLL are correctly built.
Copy the ffmpeg dll an lib files from <mingw>/local/bin directory to <blender_home>/lib/windows/ffmpeg/lib.
Modified: trunk/lib/windows/ffmpeg/include/stdint.h
===================================================================
--- trunk/lib/windows/ffmpeg/include/stdint.h 2008-10-31 17:12:45 UTC (rev 17247)
+++ trunk/lib/windows/ffmpeg/include/stdint.h 2008-10-31 19:43:18 UTC (rev 17248)
@@ -56,10 +56,10 @@
// 7.18.1 Integer types
// 7.18.1.1 Exact-width integer types
-typedef __int8 int8_t;
-typedef __int16 int16_t;
-typedef __int32 int32_t;
-typedef __int64 int64_t;
+typedef signed __int8 int8_t;
+typedef signed __int16 int16_t;
+typedef signed __int32 int32_t;
+typedef signed __int64 int64_t;
typedef unsigned __int8 uint8_t;
typedef unsigned __int16 uint16_t;
typedef unsigned __int32 uint32_t;
@@ -86,13 +86,23 @@
typedef uint64_t uint_fast64_t;
// 7.18.1.4 Integer types capable of holding object pointers
+#ifndef _INTPTR_T_DEFINED
#ifdef _WIN64 // [
typedef __int64 intptr_t;
+#else // _WIN64 ][
+ typedef long intptr_t;
+#endif // _WIN64 ]
+#define _INTPTR_T_DEFINED
+#endif
+
+#ifndef _UINTPTR_T_DEFINED
+#ifdef _WIN64 // [
typedef unsigned __int64 uintptr_t;
#else // _WIN64 ][
- typedef int intptr_t;
- typedef unsigned int uintptr_t;
+ typedef unsigned long uintptr_t;
#endif // _WIN64 ]
+#define _UINTPTR_T_DEFINED
+#endif
// 7.18.1.5 Greatest-width integer types
typedef int64_t intmax_t;
Modified: trunk/lib/windows/ffmpeg/lib/avcodec-51.dll
===================================================================
(Binary files differ)
Modified: trunk/lib/windows/ffmpeg/lib/avcodec-51.lib
===================================================================
(Binary files differ)
Modified: trunk/lib/windows/ffmpeg/lib/avdevice-52.dll
===================================================================
(Binary files differ)
Modified: trunk/lib/windows/ffmpeg/lib/avdevice-52.lib
===================================================================
(Binary files differ)
Modified: trunk/lib/windows/ffmpeg/lib/avformat-52.dll
===================================================================
(Binary files differ)
Modified: trunk/lib/windows/ffmpeg/lib/avformat-52.lib
===================================================================
(Binary files differ)
Modified: trunk/lib/windows/ffmpeg/lib/avutil-49.dll
===================================================================
(Binary files differ)
Modified: trunk/lib/windows/ffmpeg/lib/avutil-49.lib
===================================================================
(Binary files differ)
Modified: trunk/lib/windows/ffmpeg/lib/swscale-0.dll
===================================================================
(Binary files differ)
Modified: trunk/lib/windows/ffmpeg/lib/swscale-0.lib
===================================================================
(Binary files differ)
Added: trunk/lib/windows/python/include/python2.5/numpy/__multiarray_api.h
===================================================================
--- trunk/lib/windows/python/include/python2.5/numpy/__multiarray_api.h (rev 0)
+++ trunk/lib/windows/python/include/python2.5/numpy/__multiarray_api.h 2008-10-31 19:43:18 UTC (rev 17248)
@@ -0,0 +1,989 @@
+
+#ifdef _MULTIARRAYMODULE
+
+typedef struct {
+ PyObject_HEAD
+ npy_bool obval;
+} PyBoolScalarObject;
+
+
+static unsigned int PyArray_GetNDArrayCVersion (void);
+static PyTypeObject PyBigArray_Type;
+static PyTypeObject PyArray_Type;
+static PyTypeObject PyArrayDescr_Type;
+static PyTypeObject PyArrayFlags_Type;
+static PyTypeObject PyArrayIter_Type;
+static PyTypeObject PyArrayMapIter_Type;
+static PyTypeObject PyArrayMultiIter_Type;
+static int NPY_NUMUSERTYPES=0;
+static PyTypeObject PyBoolArrType_Type;
+static PyBoolScalarObject _PyArrayScalar_BoolValues[2];
+
+static PyTypeObject PyGenericArrType_Type;
+static PyTypeObject PyNumberArrType_Type;
+static PyTypeObject PyIntegerArrType_Type;
+static PyTypeObject PySignedIntegerArrType_Type;
+static PyTypeObject PyUnsignedIntegerArrType_Type;
+static PyTypeObject PyInexactArrType_Type;
+static PyTypeObject PyFloatingArrType_Type;
+static PyTypeObject PyComplexFloatingArrType_Type;
+static PyTypeObject PyFlexibleArrType_Type;
+static PyTypeObject PyCharacterArrType_Type;
+static PyTypeObject PyByteArrType_Type;
+static PyTypeObject PyShortArrType_Type;
+static PyTypeObject PyIntArrType_Type;
+static PyTypeObject PyLongArrType_Type;
+static PyTypeObject PyLongLongArrType_Type;
+static PyTypeObject PyUByteArrType_Type;
+static PyTypeObject PyUShortArrType_Type;
+static PyTypeObject PyUIntArrType_Type;
+static PyTypeObject PyULongArrType_Type;
+static PyTypeObject PyULongLongArrType_Type;
+static PyTypeObject PyFloatArrType_Type;
+static PyTypeObject PyDoubleArrType_Type;
+static PyTypeObject PyLongDoubleArrType_Type;
+static PyTypeObject PyCFloatArrType_Type;
+static PyTypeObject PyCDoubleArrType_Type;
+static PyTypeObject PyCLongDoubleArrType_Type;
+static PyTypeObject PyObjectArrType_Type;
+static PyTypeObject PyStringArrType_Type;
+static PyTypeObject PyUnicodeArrType_Type;
+static PyTypeObject PyVoidArrType_Type;
+static int PyArray_SetNumericOps \
+ (PyObject *);
+static PyObject * PyArray_GetNumericOps \
+ (void);
+static int PyArray_INCREF \
+ (PyArrayObject *);
+static int PyArray_XDECREF \
+ (PyArrayObject *);
+static void PyArray_SetStringFunction \
+ (PyObject *, int);
+static PyArray_Descr * PyArray_DescrFromType \
+ (int);
+static PyObject * PyArray_TypeObjectFromType \
+ (int);
+static char * PyArray_Zero \
+ (PyArrayObject *);
+static char * PyArray_One \
+ (PyArrayObject *);
+static PyObject * PyArray_CastToType \
+ (PyArrayObject *, PyArray_Descr *, int);
+static int PyArray_CastTo \
+ (PyArrayObject *, PyArrayObject *);
+static int PyArray_CastAnyTo \
+ (PyArrayObject *, PyArrayObject *);
+static int PyArray_CanCastSafely \
+ (int, int);
+static npy_bool PyArray_CanCastTo \
+ (PyArray_Descr *, PyArray_Descr *);
+static int PyArray_ObjectType \
+ (PyObject *, int);
+static PyArray_Descr * PyArray_DescrFromObject \
+ (PyObject *, PyArray_Descr *);
+static PyArrayObject ** PyArray_ConvertToCommonType \
+ (PyObject *, int *);
+static PyArray_Descr * PyArray_DescrFromScalar \
+ (PyObject *);
+static PyArray_Descr * PyArray_DescrFromTypeObject \
+ (PyObject *);
+static npy_intp PyArray_Size \
+ (PyObject *);
+static PyObject * PyArray_Scalar \
+ (void *, PyArray_Descr *, PyObject *);
+static PyObject * PyArray_FromScalar \
+ (PyObject *, PyArray_Descr *);
+static void PyArray_ScalarAsCtype \
+ (PyObject *, void *);
+static int PyArray_CastScalarToCtype \
+ (PyObject *, void *, PyArray_Descr *);
+static int PyArray_CastScalarDirect \
+ (PyObject *, PyArray_Descr *, void *, int);
+static PyObject * PyArray_ScalarFromObject \
+ (PyObject *);
+static PyArray_VectorUnaryFunc * PyArray_GetCastFunc \
+ (PyArray_Descr *, int);
+static PyObject * PyArray_FromDims \
+ (int, int *, int);
+static PyObject * PyArray_FromDimsAndDataAndDescr \
+ (int, int *, PyArray_Descr *, char *);
+static PyObject * PyArray_FromAny \
+ (PyObject *, PyArray_Descr *, int, int, int, PyObject *);
+static PyObject * PyArray_EnsureArray \
+ (PyObject *);
+static PyObject * PyArray_EnsureAnyArray \
+ (PyObject *);
+static PyObject * PyArray_FromFile \
+ (FILE *, PyArray_Descr *, npy_intp, char *);
+static PyObject * PyArray_FromString \
+ (char *, npy_intp, PyArray_Descr *, npy_intp, char *);
+static PyObject * PyArray_FromBuffer \
+ (PyObject *, PyArray_Descr *, npy_intp, npy_intp);
+static PyObject * PyArray_FromIter \
+ (PyObject *, PyArray_Descr *, npy_intp);
+static PyObject * PyArray_Return \
+ (PyArrayObject *);
+static PyObject * PyArray_GetField \
+ (PyArrayObject *, PyArray_Descr *, int);
+static int PyArray_SetField \
+ (PyArrayObject *, PyArray_Descr *, int, PyObject *);
+static PyObject * PyArray_Byteswap \
+ (PyArrayObject *, npy_bool);
+static PyObject * PyArray_Resize \
+ (PyArrayObject *, PyArray_Dims *, int, NPY_ORDER);
+static int PyArray_MoveInto \
+ (PyArrayObject *, PyArrayObject *);
+static int PyArray_CopyInto \
+ (PyArrayObject *, PyArrayObject *);
+static int PyArray_CopyAnyInto \
+ (PyArrayObject *, PyArrayObject *);
+static int PyArray_CopyObject \
+ (PyArrayObject *, PyObject *);
+static PyObject * PyArray_NewCopy \
+ (PyArrayObject *, NPY_ORDER);
+static PyObject * PyArray_ToList \
+ (PyArrayObject *);
+static PyObject * PyArray_ToString \
+ (PyArrayObject *, NPY_ORDER);
+static int PyArray_ToFile \
+ (PyArrayObject *, FILE *, char *, char *);
+static int PyArray_Dump \
+ (PyObject *, PyObject *, int);
+static PyObject * PyArray_Dumps \
+ (PyObject *, int);
+static int PyArray_ValidType \
+ (int);
+static void PyArray_UpdateFlags \
+ (PyArrayObject *, int);
+static PyObject * PyArray_New \
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list