[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42929] branches/bmesh/blender: svn merge ^/trunk/blender -r42920:42927
Campbell Barton
ideasman42 at gmail.com
Wed Dec 28 14:33:41 CET 2011
Revision: 42929
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42929
Author: campbellbarton
Date: 2011-12-28 13:33:35 +0000 (Wed, 28 Dec 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r42920:42927
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42920
Modified Paths:
--------------
branches/bmesh/blender/release/scripts/modules/sys_info.py
branches/bmesh/blender/release/scripts/presets/ffmpeg/DV.py
branches/bmesh/blender/release/scripts/presets/ffmpeg/DVD.py
branches/bmesh/blender/release/scripts/presets/ffmpeg/SVCD.py
branches/bmesh/blender/release/scripts/presets/ffmpeg/VCD.py
branches/bmesh/blender/source/blender/makesdna/DNA_customdata_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_defs.h
branches/bmesh/blender/source/blender/makesdna/DNA_mesh_types.h
branches/bmesh/blender/source/blender/python/SConscript
branches/bmesh/blender/source/blender/python/intern/CMakeLists.txt
branches/bmesh/blender/source/blender/python/intern/bpy_app.c
Added Paths:
-----------
branches/bmesh/blender/source/blender/python/intern/bpy_app_ffmpeg.c
branches/bmesh/blender/source/blender/python/intern/bpy_app_ffmpeg.h
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:39992-42920
+ /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:39992-42927
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42757,42779-42870
+ /trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42757,42779-42870,42921-42927
Modified: branches/bmesh/blender/release/scripts/modules/sys_info.py
===================================================================
--- branches/bmesh/blender/release/scripts/modules/sys_info.py 2011-12-28 13:29:33 UTC (rev 42928)
+++ branches/bmesh/blender/release/scripts/modules/sys_info.py 2011-12-28 13:33:35 UTC (rev 42929)
@@ -94,6 +94,16 @@
output.write('autosave: {}\n'.format(bpy.utils.user_resource('AUTOSAVE')))
output.write('tempdir: {}\n'.format(bpy.app.tempdir))
+ output.write('\nFFmpeg:\n')
+ output.write(lilies)
+ ffmpeg = bpy.app.ffmpeg
+ if ffmpeg.supported:
+ for lib in ['avcodec', 'avdevice', 'avformat', 'avutil', 'swscale']:
+ output.write('{}:{}{}\n'.format(lib, " "*(10-len(lib)),
+ getattr(ffmpeg, lib + '_version_string')))
+ else:
+ output.write('Blender was built without FFmpeg support\n')
+
if bpy.app.background:
output.write('\nOpenGL: missing, background mode\n')
else:
Modified: branches/bmesh/blender/release/scripts/presets/ffmpeg/DV.py
===================================================================
--- branches/bmesh/blender/release/scripts/presets/ffmpeg/DV.py 2011-12-28 13:29:33 UTC (rev 42928)
+++ branches/bmesh/blender/release/scripts/presets/ffmpeg/DV.py 2011-12-28 13:33:35 UTC (rev 42929)
@@ -11,4 +11,4 @@
bpy.context.scene.render.ffmpeg_audio_mixrate = 48000
bpy.context.scene.render.ffmpeg_audio_codec = "PCM"
-bpy.context.scene.render.ffmpeg_audio_channels = 2
+bpy.context.scene.render.ffmpeg_audio_channels = "STEREO"
Modified: branches/bmesh/blender/release/scripts/presets/ffmpeg/DVD.py
===================================================================
--- branches/bmesh/blender/release/scripts/presets/ffmpeg/DVD.py 2011-12-28 13:29:33 UTC (rev 42928)
+++ branches/bmesh/blender/release/scripts/presets/ffmpeg/DVD.py 2011-12-28 13:33:35 UTC (rev 42929)
@@ -21,4 +21,4 @@
bpy.context.scene.render.ffmpeg_audio_codec = "AC3"
bpy.context.scene.render.ffmpeg_audio_bitrate = 448
bpy.context.scene.render.ffmpeg_audio_mixrate = 48000
-bpy.context.scene.render.ffmpeg_audio_channels = 6
+bpy.context.scene.render.ffmpeg_audio_channels = "SURROUND51"
Modified: branches/bmesh/blender/release/scripts/presets/ffmpeg/SVCD.py
===================================================================
--- branches/bmesh/blender/release/scripts/presets/ffmpeg/SVCD.py 2011-12-28 13:29:33 UTC (rev 42928)
+++ branches/bmesh/blender/release/scripts/presets/ffmpeg/SVCD.py 2011-12-28 13:33:35 UTC (rev 42929)
@@ -21,4 +21,4 @@
bpy.context.scene.render.ffmpeg_audio_bitrate = 224
bpy.context.scene.render.ffmpeg_audio_mixrate = 44100
bpy.context.scene.render.ffmpeg_audio_codec = "MP2"
-bpy.context.scene.render.ffmpeg_audio_channels = 2
+bpy.context.scene.render.ffmpeg_audio_channels = "STEREO"
Modified: branches/bmesh/blender/release/scripts/presets/ffmpeg/VCD.py
===================================================================
--- branches/bmesh/blender/release/scripts/presets/ffmpeg/VCD.py 2011-12-28 13:29:33 UTC (rev 42928)
+++ branches/bmesh/blender/release/scripts/presets/ffmpeg/VCD.py 2011-12-28 13:33:35 UTC (rev 42929)
@@ -21,4 +21,4 @@
bpy.context.scene.render.ffmpeg_audio_bitrate = 224
bpy.context.scene.render.ffmpeg_audio_mixrate = 44100
bpy.context.scene.render.ffmpeg_audio_codec = "MP2"
-bpy.context.scene.render.ffmpeg_audio_channels = 2
+bpy.context.scene.render.ffmpeg_audio_channels = "STEREO"
Modified: branches/bmesh/blender/source/blender/makesdna/DNA_customdata_types.h
===================================================================
--- branches/bmesh/blender/source/blender/makesdna/DNA_customdata_types.h 2011-12-28 13:29:33 UTC (rev 42928)
+++ branches/bmesh/blender/source/blender/makesdna/DNA_customdata_types.h 2011-12-28 13:33:35 UTC (rev 42929)
@@ -36,6 +36,8 @@
extern "C" {
#endif
+#include "DNA_defs.h" /* USE_BMESH_FORWARD_COMPAT */
+
/** descriptor and storage for a custom data layer */
typedef struct CustomDataLayer {
int type; /* type of data in layer */
Modified: branches/bmesh/blender/source/blender/makesdna/DNA_defs.h
===================================================================
--- branches/bmesh/blender/source/blender/makesdna/DNA_defs.h 2011-12-28 13:29:33 UTC (rev 42928)
+++ branches/bmesh/blender/source/blender/makesdna/DNA_defs.h 2011-12-28 13:33:35 UTC (rev 42929)
@@ -45,4 +45,6 @@
/* hrmf, we need a better include then this */
#include "../blenloader/BLO_sys_types.h" /* needed for int64_t only! */
+#define USE_BMESH_FORWARD_COMPAT
+
#endif /* DNA_DEFS_H */
Modified: branches/bmesh/blender/source/blender/makesdna/DNA_mesh_types.h
===================================================================
--- branches/bmesh/blender/source/blender/makesdna/DNA_mesh_types.h 2011-12-28 13:29:33 UTC (rev 42928)
+++ branches/bmesh/blender/source/blender/makesdna/DNA_mesh_types.h 2011-12-28 13:33:35 UTC (rev 42929)
@@ -36,6 +36,8 @@
#include "DNA_ID.h"
#include "DNA_customdata_types.h"
+#include "DNA_defs.h" /* USE_BMESH_FORWARD_COMPAT */
+
struct DerivedMesh;
struct Ipo;
struct Key;
Modified: branches/bmesh/blender/source/blender/python/SConscript
===================================================================
--- branches/bmesh/blender/source/blender/python/SConscript 2011-12-28 13:29:33 UTC (rev 42928)
+++ branches/bmesh/blender/source/blender/python/SConscript 2011-12-28 13:33:35 UTC (rev 42929)
@@ -46,5 +46,8 @@
if env['WITH_BF_CYCLES']:
defs.append('WITH_CYCLES')
+if env['WITH_BF_FFMPEG']:
+ defs.append('WITH_FFMPEG')
+
sources = env.Glob('intern/*.c')
env.BlenderLib( libname = 'bf_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core'], priority = [361])
Modified: branches/bmesh/blender/source/blender/python/intern/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/source/blender/python/intern/CMakeLists.txt 2011-12-28 13:29:33 UTC (rev 42928)
+++ branches/bmesh/blender/source/blender/python/intern/CMakeLists.txt 2011-12-28 13:33:35 UTC (rev 42929)
@@ -42,9 +42,10 @@
)
set(SRC
- gpu.c
+ gpu.c
bpy.c
bpy_app.c
+ bpy_app_ffmpeg.c
bpy_app_handlers.c
bpy_driver.c
bpy_interface.c
@@ -62,9 +63,10 @@
bpy_util.c
stubs.c
- gpu.h
+ gpu.h
bpy.h
bpy_app.h
+ bpy_app_ffmpeg.h
bpy_app_handlers.h
bpy_driver.h
bpy_intern_string.h
@@ -101,7 +103,15 @@
endif()
if(WITH_INTERNATIONAL)
- add_definitions(-DWITH_INTERNATIONAL)
+ add_definitions(-DWITH_INTERNATIONAL)
endif()
+if(WITH_CODEC_FFMPEG)
+ list(APPEND INC_SYS
+ ${FFMPEG_INCLUDE_DIRS}
+ )
+
+ add_definitions(-DWITH_FFMPEG)
+endif()
+
blender_add_lib(bf_python "${SRC}" "${INC}" "${INC_SYS}")
Modified: branches/bmesh/blender/source/blender/python/intern/bpy_app.c
===================================================================
--- branches/bmesh/blender/source/blender/python/intern/bpy_app.c 2011-12-28 13:29:33 UTC (rev 42928)
+++ branches/bmesh/blender/source/blender/python/intern/bpy_app.c 2011-12-28 13:33:35 UTC (rev 42929)
@@ -32,6 +32,9 @@
#include <Python.h>
#include "bpy_app.h"
+
+#include "bpy_app_ffmpeg.h"
+
#include "bpy_app_handlers.h"
#include "bpy_driver.h"
@@ -79,6 +82,7 @@
{(char *)"build_system", (char *)"Build system used"},
/* submodules */
+ {(char *)"ffmpeg", (char *)"FFmpeg library information backend"},
{(char *)"handlers", (char *)"Application handler callbacks"},
{NULL}
};
@@ -147,6 +151,7 @@
SetStrItem("Unknown");
#endif
+ SetObjItem(BPY_app_ffmpeg_struct());
SetObjItem(BPY_app_handlers_struct());
#undef SetIntItem
Copied: branches/bmesh/blender/source/blender/python/intern/bpy_app_ffmpeg.c (from rev 42927, trunk/blender/source/blender/python/intern/bpy_app_ffmpeg.c)
===================================================================
--- branches/bmesh/blender/source/blender/python/intern/bpy_app_ffmpeg.c (rev 0)
+++ branches/bmesh/blender/source/blender/python/intern/bpy_app_ffmpeg.c 2011-12-28 13:33:35 UTC (rev 42929)
@@ -0,0 +1,139 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor(s): Sergey Sharybin
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/python/intern/bpy_app_ffmpeg.c
+ * \ingroup pythonintern
+ */
+
+#include <Python.h>
+#include "BLI_utildefines.h"
+#include "BLI_callbacks.h"
+
+#include "RNA_types.h"
+#include "RNA_access.h"
+#include "bpy_rna.h"
+
+#ifdef WITH_FFMPEG
+#include <libavcodec/avcodec.h>
+#include <libavdevice/avdevice.h>
+#include <libavformat/avformat.h>
+#include <libavutil/avutil.h>
+#include <libswscale/swscale.h>
+#endif
+
+static PyTypeObject BlenderAppFFmpegType;
+
+#define DEF_FFMPEG_LIB_VERSION(lib) \
+ {(char *)(#lib "_version"), (char *)("The " #lib " version as a tuple of 3 numbers")}, \
+ {(char *)(#lib "_version_string"), (char *)("The " #lib " version formatted as a string")},
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list