[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39207] branches/soc-2011-tomato/extern/ libmv: Camera tracking integration

Sergey Sharybin g.ulairi at gmail.com
Tue Aug 9 12:42:39 CEST 2011 

Revision: 39207
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39207
Author:   nazgul
Date:     2011-08-09 10:42:39 +0000 (Tue, 09 Aug 2011)
Log Message:
-----------
Camera tracking integration
===========================

Bundling new version of libmv. It's repo is ready for
bundling again, some patches which were applied on our
side are in libmv repo now.

This new version of libmv also contains patch from John Carpenter
which makes reconstruciton a bit more "stable" -- some kind
of fallback algorithm.

Modified Paths:
--------------
    branches/soc-2011-tomato/extern/libmv/ChangeLog
    branches/soc-2011-tomato/extern/libmv/libmv/image/array_nd.h
    branches/soc-2011-tomato/extern/libmv/libmv/image/sample.h
    branches/soc-2011-tomato/extern/libmv/libmv/multiview/projection.cc
    branches/soc-2011-tomato/extern/libmv/libmv/multiview/projection.h
    branches/soc-2011-tomato/extern/libmv/libmv/numeric/levenberg_marquardt.h
    branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/bundle.cc
    branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/bundle.h
    branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc
    branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/camera_intrinsics.h
    branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/detect.cc
    branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.cc
    branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.h
    branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/intersect.cc
    branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/intersect.h
    branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/pipeline.cc
    branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/pipeline.h
    branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/reconstruction.cc
    branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/reconstruction.h
    branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/resect.cc
    branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/resect.h
    branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/tracks.cc
    branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/tracks.h
    branches/soc-2011-tomato/extern/libmv/libmv/tracking/region_tracker.h
    branches/soc-2011-tomato/extern/libmv/libmv-capi.cpp
    branches/soc-2011-tomato/extern/libmv/patches/series

Removed Paths:
-------------
    branches/soc-2011-tomato/extern/libmv/patches/max_image.patch
    branches/soc-2011-tomato/extern/libmv/patches/max_track.patch

Modified: branches/soc-2011-tomato/extern/libmv/ChangeLog
===================================================================
--- branches/soc-2011-tomato/extern/libmv/ChangeLog	2011-08-09 08:38:14 UTC (rev 39206)
+++ branches/soc-2011-tomato/extern/libmv/ChangeLog	2011-08-09 10:42:39 UTC (rev 39207)
@@ -1,571 +1,445 @@
-commit dec996966d5466717a813da2d8b9962115dfc8ac
+commit c2af303e7bf0dddcb02937323ac5846b1801e6cc
 Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Fri Jul 15 20:04:06 2011 +0200
+Date:   Tue Aug 9 11:13:29 2011 +0200
 
-    Detect API documentation.
+    Remove reconstruction breaking debug code.
 
-commit bfc07bd0940bba0d5439ccd0297368607db514be
+commit 8792a633e5c5f1c1f12e164b9e8897ca0790ac59
 Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Fri Jul 15 16:22:52 2011 +0200
+Date:   Tue Aug 9 10:49:18 2011 +0200
 
-    Refactor Qt Tracker.
-    Create Detect API.
-    Improve CameraIntrinsics API.
-    Put Calibration settings UI in a QDockWidget.
-    Support anamorphic.
-    
-    TODO: Finish new Zoom widget.
+    Remove getchar()s.
 
-commit e59595806c045916ab4ef15ef7047c1a728b2da9
+commit 63a9bdee0cbd1197e0315d01c27bfc2361bd5656
 Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Thu Jul 14 22:29:06 2011 +0200
+Date:   Tue Aug 9 10:35:07 2011 +0200
 
-    Use FAST detector.
-    
-    FAST is much faster and works much better than the "Good Features to Track algorithm".
+    Adapt patch to new PipelineRoutines code generation strategy.
 
-commit 17c036e9f8c6529c2f771fdd9dc73f3022e36c77
+commit 096ff1a4070f7212c50fb0a4b2feec7ca9d97158
 Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Wed Jul 13 22:23:40 2011 +0200
+Date:   Tue Aug 9 09:54:12 2011 +0200
 
-    Add visualization of image filtering operations.
+    Merge max_image and max_track fix from tomato.
 
-commit c4f71e17b6b72acc0f863906c01c87d53e8bbb2c
+commit d8450cd3c37278a397482cd36b1e2419f154cfb9
 Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Wed Jul 13 10:37:26 2011 +0200
+Date:   Tue Aug 9 09:38:49 2011 +0200
 
-    Simplify feature detection.
+    Synchronize tree with Tomato: Merge patch for better resection, keep deprecated KLT tracker.
 
-commit d8109b7a4fede1660e0dbd73735f1a9e3fd79eec
+commit e9b2dca920cf9575c15150a4988634b00e343a41
 Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Wed Jul 13 10:21:52 2011 +0200
+Date:   Mon Aug 8 17:07:08 2011 +0200
 
-    Add feature detection.
-    
-    Remove unused keyframe selection code.
+    Fixes, Documentation.
 
-commit 1088517da70ae9ec2369752fbc17dde4bb869c47
+commit 4fc1c57a2d92442808ac4a3676e6d9a25a51e310
 Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Mon Jul 11 22:42:14 2011 +0200
+Date:   Sun Aug 7 14:35:08 2011 +0200
 
-    Replace system file dialog with custom one which supports multiple file/folder selection.
-    Add Stop button when adding frame from video.
+    Improve tracker resilience by penalizing large motion vectors.
 
-commit 323af7a3a1344e7ef419c72fe22b674c17c578e3
+commit cc8e7e8e08cd91f75c080a0091461ca9fe969664
 Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Mon Jul 11 16:30:59 2011 +0200
+Date:   Sun Aug 7 09:28:09 2011 +0200
 
-    Add stub for feature detection.
+    Leverage SSE2 SAD instruction for 16x speed improvement in integer pixel search resulting in ~1ms per marker for 16x16 pattern on 128x128 region.
 
-commit 739ec729fa8bc6e0ba6a40cc7b89d85e5332e900
+commit f362ab4999a768370fca57552464b459eb9fbddc
 Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Mon Jul 11 16:30:42 2011 +0200
+Date:   Sun Aug 7 09:06:04 2011 +0200
 
-    Fix compilation of Qt Calibration tool.
+    Improve SAD Tracker subpixel precision (avoid drift even when adapting at each frame).
 
-commit 113ccc413db6bdfb75839418bddfba5ce3ba60f7
+commit fce7a214c561b5f5f0e17115c31fb48814bde2db
 Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Mon Jul 11 12:27:47 2011 +0200
+Date:   Sat Aug 6 21:57:06 2011 +0200
 
-    Add raw on-disk video cache.
-    
-    This is useful for faster testing iterations.
-    It avoids waiting for the footage to decode on startup.
-    Using file memory mapping, we let the OS handle caching.
-    The OS disk cache also has the advantage of being kept in memory between runs.
-    A cache is only created for shot < 1GiB (e.g 17s of 1080 at 30).
+    Track using simple Sum of Absolute Differences matching.
+    This method is simpler, more robust, faster and accurate.
 
-commit efbe8b6a3e2a8cff497726e11afffbce0ec6aa53
+commit 620a7a35d9a2818bf6e9dbf5d11debda4be6bc26
 Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Mon Jul 11 11:11:47 2011 +0200
+Date:   Fri Jul 29 12:35:57 2011 +0200
 
-    Miscellaneous UI fixes, faster grayscale conversion, compute window size from pattern size and pyramid level count.
+    Add Intersect unit test.
 
-commit 0c6911831b0a391da14bf1c5833b1e5c0d5056b7
+commit a2bf58fa57be11215eb17ff7f7de58f97d480ec3
 Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Sun Jul 10 22:48:15 2011 +0200
+Date:   Thu Jul 28 11:08:06 2011 +0200
 
-    Add Video support using FFmpeg to Qt Calibration.
+    Remove tests depending on dead code.
+    Fix CameraIntrinsics test.
+    Add Intersect and Resect tests.
 
-commit c9f2bd5a17585f816bf0ef89097ac8f222ad058e
+commit 19bddee10b4879c8cd2238ccdf5b8f7620cf8384
 Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Sun Jul 10 19:44:35 2011 +0200
+Date:   Wed Jul 27 12:07:21 2011 +0200
 
-    Add Video support using FFmpeg to Qt Tracker.
+    Image Distortion: Fixes and more testing.
 
-commit af8f9c412b0592868a0e68a14686651b45de9737
+commit 0454d97da328fb0eda8c6c50511ac31864a6d3d6
 Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Sat Jul 9 12:08:28 2011 +0200
+Date:   Wed Jul 27 10:32:37 2011 +0200
 
-    Update README with instructions to build Qt OpenCV Calibration tool.
+    Test float image distortion.
 
-commit dc4e18b474b024c04fbb0ef6b4f2c2cd642c8715
+commit 8db01595a8721f766d85931a8d92b780461d8741
 Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Fri Jul 8 13:25:14 2011 +0200
+Date:   Wed Jul 27 10:27:07 2011 +0200
 
-    Make Qt OpenCV Calibration Tool optionnal.
+    Image Distortion: Bilinear sampling, Optimization, Instantiate all variants (Distort/Undistort, float/ubyte, 1-4 channels).
 
-commit 86356bd988b1b937082d56330f18a20e4cb26c19
+commit 91916db921e1f2818f0aa2be823bf92c50ad4de9
 Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Fri Jul 8 10:19:30 2011 +0200
+Date:   Tue Jul 26 22:51:21 2011 +0200
 
-    add QCompleter with QFileSystemModel to choose source image folder easily.
+    New Undistortion API in CameraIntrinsics.h.
+    Implement Undistortion API in CameraIntrinsics.cc.
 
-commit 209983a5e74c8b328d22d17668b3ad20d6e87f7a
-Merge: 0396ccf 7bef9ca
+commit 8c47a26072cfa9cf216771e5ae7a1dc60a770f82
 Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Fri Jul 8 10:17:05 2011 +0200
+Date:   Tue Jul 26 22:16:06 2011 +0200
 
-    Merge branch 'master' of git://github.com/libmv/libmv
+    Qt Calibration fixes. Image undistortion experiments.
 
-commit 0396ccf81dee87c3e7a06aa15f05bcaad8dd6ac3
+commit b575d9f68856b4e95a6b0a92ecc4e7d635342f95
 Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Thu Jul 7 18:35:12 2011 +0200
+Date:   Tue Jul 26 22:14:54 2011 +0200
 
-    calibration: Compute intrinsincs, undistort image and corners, output custom XML file.
+    Qt Calibration fixes.
+    Image undistortion experiments.
 
-commit 540a48b1e9f9d4e28fe6b1ef56decf1b29b4811f
+commit fac2b3e88ef8f14fa62149f6fc929c623d73fe39
 Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Thu Jul 7 11:18:25 2011 +0200
+Date:   Mon Jul 25 11:44:17 2011 +0200
 
-    Detect calibration checkerboard using OpenCV Calib3D.
+    Merge uncalibrated reconstruction.
+    UI fixes.
 
-commit d8113dbac2f2156cdfebb5070102f29c26ba9776
+commit d04071ee210baef5ff657441c8c5284c235e93a3
+Merge: 795e50f c4c67db
 Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Wed Jul 6 22:36:12 2011 +0200
+Date:   Sat Jul 23 12:18:58 2011 +0200
 
-    Initial implementation of OpenCV Qt Calibration Tool
+    Merge branch 'master' of git://github.com/keir/libmv
+    
+    Conflicts:
+    	src/libmv/simple_pipeline/initialize_reconstruction.h
+    	src/ui/tracker/main.cc
+    	src/ui/tracker/main.h
+    	src/ui/tracker/scene.cc
+    	src/ui/tracker/scene.h
 
-commit dae6fae16ec4abbaa9826f944c6ae16cc17ba051
+commit 795e50fa1ca9ca4373ad9b5432916edf2f1940a0
 Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Wed Jul 6 16:01:41 2011 +0200
+Date:   Sat Jul 23 12:12:53 2011 +0200
 
-    Fix build.
+    Support creating FloatImage without copying data.
 
-commit 8cdf7aa54f16bf4fb0f0f824c7b5874373831019
-Merge: b8d02b5 df1d54e
-Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Tue Jul 5 09:51:01 2011 +0200
-
-    Merge branch 'master' of git://github.com/keir/libmv
-
-commit df1d54efd23530891851d3573a5126094acea840
+commit c4c67db84cc6e972be19c3e0f495477a1419200e
 Author: Keir Mierle <mierle at gmail.com>
-Date:   Mon Jul 4 13:12:53 2011 -0700
+Date:   Thu Jul 21 10:24:06 2011 -0700
 
-    Fix include ordering.
+    Add an uncalibrated reconstruction pipeline to libmv.
+    
+    Note: The pipeline doesn't actually work yet! It runs, but the resulting
+    reconstruction is wildly broken. I have a number of theories as to why this is,
+    and will write tests to track this down, but this change has grown out of
+    control in the meantime.
 
-commit b8d02b551bca95f4a228a85188f12078cc3bd2f4
+commit 584e0ddc4058a6a4e41b1fd9665654097af177d4
 Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Mon Jul 4 16:34:04 2011 +0200
+Date:   Wed Jul 20 20:21:55 2011 +0200
 
-    Remove momentum in scene view.
+    Latest working revision of simple optimized tracker.
 
-commit 67433907db5537a2e32893ef558c63ab336f59c1
-Merge: 0049521 b027af4
-Author: Keir Mierle <mierle at gmail.com>
-Date:   Mon Jul 4 04:01:44 2011 -0700
+commit 7983f86ff93f1ccd06f78439fb87387aecdfe49e
+Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
+Date:   Wed Jul 20 20:10:12 2011 +0200
 
-    Merge Matthias's branch.

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list