[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39180] branches/soc-2011-tomato: Camera tracking integration
Sergey Sharybin
g.ulairi at gmail.com
Mon Aug 8 14:18:21 CEST 2011
Revision: 39180
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39180
Author: nazgul
Date: 2011-08-08 12:18:20 +0000 (Mon, 08 Aug 2011)
Log Message:
-----------
Camera tracking integration
===========================
Commiting VSE-proxies patch from Peter Schlaile.
Description is here: http://lists.blender.org/pipermail/bf-committers/2011-May/032152.html
Git commit hash: baaecf244b83c70cb57e1bf6fdd51dd8591bde5b
Modified Paths:
--------------
branches/soc-2011-tomato/CMakeLists.txt
branches/soc-2011-tomato/build_files/scons/config/darwin-config.py
branches/soc-2011-tomato/build_files/scons/config/linuxcross-config.py
branches/soc-2011-tomato/build_files/scons/config/win32-mingw-config.py
branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py
branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py
branches/soc-2011-tomato/intern/ffmpeg/ffmpeg_compat.h
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2011-tomato/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_templates.c
branches/soc-2011-tomato/source/blender/editors/space_image/image_buttons.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_intern.h
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_ops.c
branches/soc-2011-tomato/source/blender/imbuf/CMakeLists.txt
branches/soc-2011-tomato/source/blender/imbuf/IMB_imbuf.h
branches/soc-2011-tomato/source/blender/imbuf/intern/IMB_anim.h
branches/soc-2011-tomato/source/blender/imbuf/intern/allocimbuf.c
branches/soc-2011-tomato/source/blender/imbuf/intern/anim_movie.c
branches/soc-2011-tomato/source/blender/imbuf/intern/thumbs.c
branches/soc-2011-tomato/source/blender/imbuf/intern/util.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_sequence_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2011-tomato/source/blender/windowmanager/WM_api.h
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_jobs.c
branches/soc-2011-tomato/source/creator/CMakeLists.txt
Added Paths:
-----------
branches/soc-2011-tomato/source/blender/imbuf/intern/IMB_indexer.h
branches/soc-2011-tomato/source/blender/imbuf/intern/indexer.c
branches/soc-2011-tomato/source/blender/imbuf/intern/indexer_dv.c
Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt 2011-08-08 12:11:40 UTC (rev 39179)
+++ branches/soc-2011-tomato/CMakeLists.txt 2011-08-08 12:18:20 UTC (rev 39180)
@@ -694,11 +694,11 @@
${LIBDIR}/ffmpeg/include/msvc
)
set(FFMPEG_LIBRARIES
- ${LIBDIR}/ffmpeg/lib/avcodec-52.lib
- ${LIBDIR}/ffmpeg/lib/avformat-52.lib
- ${LIBDIR}/ffmpeg/lib/avdevice-52.lib
- ${LIBDIR}/ffmpeg/lib/avutil-50.lib
- ${LIBDIR}/ffmpeg/lib/swscale-0.lib
+ ${LIBDIR}/ffmpeg/lib/avcodec-53.lib
+ ${LIBDIR}/ffmpeg/lib/avformat-53.lib
+ ${LIBDIR}/ffmpeg/lib/avdevice-53.lib
+ ${LIBDIR}/ffmpeg/lib/avutil-51.lib
+ ${LIBDIR}/ffmpeg/lib/swscale-2.lib
)
endif()
@@ -825,7 +825,7 @@
if(WITH_CODEC_FFMPEG)
set(FFMPEG ${LIBDIR}/ffmpeg)
set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include ${FFMPEG}/include)
- set(FFMPEG_LIBRARIES avcodec-52 avformat-52 avdevice-52 avutil-50 swscale-0)
+ set(FFMPEG_LIBRARIES avcodec-53 avformat-53 avdevice-53 avutil-51 swscale-2)
set(FFMPEG_LIBPATH ${FFMPEG}/lib)
endif()
Modified: branches/soc-2011-tomato/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/darwin-config.py 2011-08-08 12:11:40 UTC (rev 39179)
+++ branches/soc-2011-tomato/build_files/scons/config/darwin-config.py 2011-08-08 12:18:20 UTC (rev 39180)
@@ -98,7 +98,7 @@
# enable ffmpeg support
WITH_BF_FFMPEG = True # -DWITH_FFMPEG
-BF_FFMPEG = LIBDIR + '/ffmpeg'
+BF_FFMPEG = LIBDIR + '/ffmpeg-9.8'
BF_FFMPEG_INC = "${BF_FFMPEG}/include"
BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
BF_FFMPEG_LIB = 'avcodec avdevice avformat avutil mp3lame swscale x264 xvidcore theora theoradec theoraenc vorbis vorbisenc vorbisfile ogg bz2'
Modified: branches/soc-2011-tomato/build_files/scons/config/linuxcross-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/linuxcross-config.py 2011-08-08 12:11:40 UTC (rev 39179)
+++ branches/soc-2011-tomato/build_files/scons/config/linuxcross-config.py 2011-08-08 12:18:20 UTC (rev 39180)
@@ -125,8 +125,9 @@
# enable ffmpeg support
WITH_BF_FFMPEG = True # -DWITH_FFMPEG
-BF_FFMPEG = LIBDIR + '/ffmpeg'
-BF_FFMPEG_LIB = 'avformat-52 avcodec-52 avdevice-52 avutil-50 swscale-0'
+BF_FFMPEG = LIBDIR + '/ffmpeg-0.8'
+BF_FFMPEG_LIB = 'avformat-53 avcodec-53 avdevice-53 avutil-51 swscale-2'
+BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-53.dll ${BF_FFMPEG_LIBPATH}/avcodec-53.dll ${BF_FFMPEG_LIBPATH}/avdevice-53.dll ${BF_FFMPEG_LIBPATH}/avutil-51.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'
BF_FFMPEG_INC = '${BF_FFMPEG}/include'
BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib'
Modified: branches/soc-2011-tomato/build_files/scons/config/win32-mingw-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/win32-mingw-config.py 2011-08-08 12:11:40 UTC (rev 39179)
+++ branches/soc-2011-tomato/build_files/scons/config/win32-mingw-config.py 2011-08-08 12:18:20 UTC (rev 39180)
@@ -18,10 +18,12 @@
BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
WITH_BF_FFMPEG = False
-BF_FFMPEG_LIB = 'avformat-52 avcodec-52 avdevice-52 avutil-50 swscale-0'
-BF_FFMPEG_LIBPATH = LIBDIR + '/ffmpeg/lib'
-BF_FFMPEG_INC = LIBDIR + '/ffmpeg/include'
+BF_FFMPEG_LIB = 'avformat-53 avcodec-53 avdevice-53 avutil-51 swscale-2'
+BF_FFMPEG_LIBPATH = LIBDIR + '/ffmpeg-0.8/lib'
+BF_FFMPEG_INC = LIBDIR + '/ffmpeg-0.8/include'
+BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-53.dll ${BF_FFMPEG_LIBPATH}/avcodec-53.dll ${BF_FFMPEG_LIBPATH}/avdevice-53.dll ${BF_FFMPEG_LIBPATH}/avutil-51.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'
+
BF_LIBSAMPLERATE = LIBDIR + '/samplerate'
BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'
BF_LIBSAMPLERATE_LIB = 'libsamplerate'
Modified: branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py 2011-08-08 12:11:40 UTC (rev 39179)
+++ branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py 2011-08-08 12:18:20 UTC (rev 39180)
@@ -3,11 +3,11 @@
# enable ffmpeg support
WITH_BF_FFMPEG = True # -DWITH_FFMPEG
-BF_FFMPEG = LIBDIR +'/ffmpeg'
+BF_FFMPEG = LIBDIR +'/ffmpeg-0.8'
BF_FFMPEG_INC = '${BF_FFMPEG}/include ${BF_FFMPEG}/include/msvc'
BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
-BF_FFMPEG_LIB = 'avformat-52.lib avcodec-52.lib avdevice-52.lib avutil-50.lib swscale-0.lib'
-BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-52.dll ${BF_FFMPEG_LIBPATH}/avcodec-52.dll ${BF_FFMPEG_LIBPATH}/avdevice-52.dll ${BF_FFMPEG_LIBPATH}/avutil-50.dll ${BF_FFMPEG_LIBPATH}/swscale-0.dll'
+BF_FFMPEG_LIB = 'avformat-53.lib avcodec-53.lib avdevice-53.lib avutil-51.lib swscale-2.lib'
+BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-53.dll ${BF_FFMPEG_LIBPATH}/avcodec-53.dll ${BF_FFMPEG_LIBPATH}/avdevice-53.dll ${BF_FFMPEG_LIBPATH}/avutil-51.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'
BF_PYTHON = LIBDIR + '/python'
BF_PYTHON_VERSION = '3.2'
Modified: branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py 2011-08-08 12:11:40 UTC (rev 39179)
+++ branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py 2011-08-08 12:18:20 UTC (rev 39180)
@@ -3,11 +3,11 @@
# enable ffmpeg support
WITH_BF_FFMPEG = True # -DWITH_FFMPEG
-BF_FFMPEG = LIBDIR +'/ffmpeg'
+BF_FFMPEG = LIBDIR +'/ffmpeg-0.8'
BF_FFMPEG_INC = '${BF_FFMPEG}/include ${BF_FFMPEG}/include/msvc '
BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
-BF_FFMPEG_LIB = 'avformat-52.lib avcodec-52.lib avdevice-52.lib avutil-50.lib swscale-0.lib'
-BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-52.dll ${BF_FFMPEG_LIBPATH}/avcodec-52.dll ${BF_FFMPEG_LIBPATH}/avdevice-52.dll ${BF_FFMPEG_LIBPATH}/avutil-50.dll ${BF_FFMPEG_LIBPATH}/swscale-0.dll'
+BF_FFMPEG_LIB = 'avformat-53.lib avcodec-53.lib avdevice-53.lib avutil-51.lib swscale-2.lib'
+BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-53.dll ${BF_FFMPEG_LIBPATH}/avcodec-53.dll ${BF_FFMPEG_LIBPATH}/avdevice-53.dll ${BF_FFMPEG_LIBPATH}/avutil-51.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'
BF_PYTHON = LIBDIR + '/python'
BF_PYTHON_VERSION = '3.2'
Modified: branches/soc-2011-tomato/intern/ffmpeg/ffmpeg_compat.h
===================================================================
--- branches/soc-2011-tomato/intern/ffmpeg/ffmpeg_compat.h 2011-08-08 12:11:40 UTC (rev 39179)
+++ branches/soc-2011-tomato/intern/ffmpeg/ffmpeg_compat.h 2011-08-08 12:18:20 UTC (rev 39180)
@@ -71,6 +71,7 @@
#define avio_open url_fopen
#define avio_tell url_ftell
#define avio_close url_fclose
+#define avio_size url_fsize
#endif
/* there are some version inbetween, which have avio_... functions but no
@@ -130,4 +131,19 @@
}
#endif
+static inline
+int64_t av_get_pts_from_frame(AVFormatContext *avctx, AVFrame * picture)
+{
+ int64_t pts = picture->pkt_pts;
+
+ if (pts == AV_NOPTS_VALUE) {
+ pts = picture->pkt_dts;
+ }
+ if (pts == AV_NOPTS_VALUE) {
+ pts = 0;
+ }
+
+ return pts;
+}
+
#endif
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_sequencer.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_sequencer.py 2011-08-08 12:11:40 UTC (rev 39179)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_sequencer.py 2011-08-08 12:18:20 UTC (rev 39180)
@@ -60,6 +60,7 @@
layout.separator()
layout.operator("sequencer.refresh_all")
+ layout.template_running_jobs()
elif st.view_type == 'SEQUENCER_PREVIEW':
layout.separator()
layout.operator("sequencer.refresh_all")
@@ -234,6 +235,7 @@
layout.operator("sequencer.cut", text="Cut (soft) at frame").type = 'SOFT'
layout.operator("sequencer.images_separate")
layout.operator("sequencer.deinterlace_selected_movies")
+ layout.operator("sequencer.rebuild_proxy")
layout.separator()
layout.operator("sequencer.duplicate")
@@ -733,7 +735,7 @@
class SEQUENCER_PT_proxy(SequencerButtonsPanel, bpy.types.Panel):
- bl_label = "Proxy"
+ bl_label = "Proxy / Timecode"
@classmethod
def poll(cls, context):
@@ -759,13 +761,30 @@
flow = layout.column_flow()
flow.prop(strip, "use_proxy_custom_directory")
flow.prop(strip, "use_proxy_custom_file")
- if strip.proxy: # TODO - need to add this somehow
+ if strip.proxy:
if strip.use_proxy_custom_directory and not strip.use_proxy_custom_file:
flow.prop(strip.proxy, "directory")
if strip.use_proxy_custom_file:
flow.prop(strip.proxy, "filepath")
+ row = layout.row()
+ row.label(text="Build Sizes:")
+ row.prop(strip.proxy, "build_25")
+ row.prop(strip.proxy, "build_50")
+ row.prop(strip.proxy, "build_75")
+ col = layout.column()
+ col.label(text="Build JPEG quality")
+ col.prop(strip.proxy, "quality")
+
+ if strip.type == "MOVIE":
+ col = layout.column()
+ col.label(text="Use timecode index:")
+
+ col.prop(strip.proxy, "timecode")
+
+
+
class SEQUENCER_PT_preview(SequencerButtonsPanel_Output, bpy.types.Panel):
bl_label = "Scene Preview/Render"
bl_space_type = 'SEQUENCE_EDITOR'
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_sequencer.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_sequencer.h 2011-08-08 12:11:40 UTC (rev 39179)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_sequencer.h 2011-08-08 12:18:20 UTC (rev 39180)
@@ -177,6 +177,7 @@
/* maintainance functions, mostly for RNA */
// extern
void seq_free_sequence(struct Scene *scene, struct Sequence *seq);
+void seq_free_sequence_recurse(struct Scene *scene, struct Sequence *seq);
void seq_free_strip(struct Strip *strip);
void seq_free_editing(struct Scene *scene);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list