2011-11-07 12:55:18 +00:00
|
|
|
# ***** 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,
|
2012-02-11 04:05:00 +00:00
|
|
|
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
2011-11-07 12:55:18 +00:00
|
|
|
#
|
|
|
|
# The Original Code is Copyright (C) 2011, Blender Foundation
|
|
|
|
# All rights reserved.
|
|
|
|
#
|
|
|
|
# Contributor(s): Blender Foundation,
|
|
|
|
# Sergey Sharybin
|
|
|
|
#
|
|
|
|
# ***** END GPL LICENSE BLOCK *****
|
|
|
|
|
2012-01-11 07:19:44 +00:00
|
|
|
# NOTE: This file is automatically generated by bundle.sh script
|
2011-12-15 12:44:05 +00:00
|
|
|
# If you're doing changes in this file, please update template
|
|
|
|
# in that script too
|
|
|
|
|
2011-11-07 12:55:18 +00:00
|
|
|
set(INC
|
|
|
|
.
|
2012-06-10 15:27:41 +00:00
|
|
|
third_party/ceres/include
|
2011-11-07 12:55:18 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
set(INC_SYS
|
2012-10-17 04:13:03 +00:00
|
|
|
../Eigen3
|
2011-11-07 12:55:18 +00:00
|
|
|
${PNG_INCLUDE_DIR}
|
|
|
|
${ZLIB_INCLUDE_DIRS}
|
|
|
|
)
|
|
|
|
|
|
|
|
set(SRC
|
|
|
|
libmv-capi.cpp
|
2012-02-17 15:39:32 +00:00
|
|
|
libmv/image/array_nd.cc
|
|
|
|
libmv/image/convolve.cc
|
|
|
|
libmv/multiview/conditioning.cc
|
|
|
|
libmv/multiview/euclidean_resection.cc
|
|
|
|
libmv/multiview/fundamental.cc
|
2012-12-20 11:03:39 +00:00
|
|
|
libmv/multiview/homography.cc
|
2013-04-05 09:23:20 +00:00
|
|
|
libmv/multiview/panography.cc
|
2012-02-17 15:39:32 +00:00
|
|
|
libmv/multiview/projection.cc
|
|
|
|
libmv/multiview/triangulation.cc
|
2011-11-07 12:55:18 +00:00
|
|
|
libmv/numeric/numeric.cc
|
|
|
|
libmv/numeric/poly.cc
|
2012-02-17 15:39:32 +00:00
|
|
|
libmv/simple_pipeline/bundle.cc
|
2011-11-07 12:55:18 +00:00
|
|
|
libmv/simple_pipeline/camera_intrinsics.cc
|
|
|
|
libmv/simple_pipeline/detect.cc
|
2012-02-17 15:39:32 +00:00
|
|
|
libmv/simple_pipeline/initialize_reconstruction.cc
|
|
|
|
libmv/simple_pipeline/intersect.cc
|
2012-04-14 12:02:39 +00:00
|
|
|
libmv/simple_pipeline/modal_solver.cc
|
2012-02-17 15:39:32 +00:00
|
|
|
libmv/simple_pipeline/pipeline.cc
|
|
|
|
libmv/simple_pipeline/reconstruction.cc
|
|
|
|
libmv/simple_pipeline/resect.cc
|
2011-11-07 12:55:18 +00:00
|
|
|
libmv/simple_pipeline/tracks.cc
|
2011-12-04 13:26:11 +00:00
|
|
|
libmv/tracking/brute_region_tracker.cc
|
Assorted camera tracker improvements
- Add support for refining the camera's intrinsic parameters
during a solve. Currently, refining supports only the following
combinations of intrinsic parameters:
f
f, cx, cy
f, cx, cy, k1, k2
f, k1
f, k1, k2
This is not the same as autocalibration, since the user must
still make a reasonable initial guess about the focal length and
other parameters, whereas true autocalibration would eliminate
the need for the user specify intrinsic parameters at all.
However, the solver works well with only rough guesses for the
focal length, so perhaps full autocalibation is not that
important.
Adding support for the last two combinations, (f, k1) and (f,
k1, k2) required changes to the library libmv depends on for
bundle adjustment, SSBA. These changes should get ported
upstream not just to libmv but to SSBA as well.
- Improved the region of convergence for bundle adjustment by
increasing the number of Levenberg-Marquardt iterations from 50
to 500. This way, the solver is able to crawl out of the bad
local minima it gets stuck in when changing from, for example,
bundling k1 and k2 to just k1 and resetting k2 to 0.
- Add several new region tracker implementations. A region tracker
is a libmv concept, which refers to tracking a template image
pattern through frames. The impact to end users is that tracking
should "just work better". I am reserving a more detailed
writeup, and maybe a paper, for later.
- Other libmv tweaks, such as detecting that a tracker is headed
outside of the image bounds.
This includes several changes made directly to the libmv extern
code rather expecting to get those changes through normal libmv
channels, because I, the libmv BDFL, decided it was faster to work
on libmv directly in Blender, then later reverse-port the libmv
changes from Blender back into libmv trunk. The interesting part
is that I added a full Levenberg-Marquardt loop to the region
tracking code, which should lead to a more stable solutions. I
also added a hacky implementation of "Efficient Second-Order
Minimization" for tracking, which works nicely. A more detailed
quantitative evaluation will follow.
Original patch by Keir, cleaned a bit by myself.
2011-11-14 06:41:23 +00:00
|
|
|
libmv/tracking/esm_region_tracker.cc
|
2012-02-17 15:39:32 +00:00
|
|
|
libmv/tracking/hybrid_region_tracker.cc
|
2011-11-07 12:55:18 +00:00
|
|
|
libmv/tracking/klt_region_tracker.cc
|
Assorted camera tracker improvements
- Add support for refining the camera's intrinsic parameters
during a solve. Currently, refining supports only the following
combinations of intrinsic parameters:
f
f, cx, cy
f, cx, cy, k1, k2
f, k1
f, k1, k2
This is not the same as autocalibration, since the user must
still make a reasonable initial guess about the focal length and
other parameters, whereas true autocalibration would eliminate
the need for the user specify intrinsic parameters at all.
However, the solver works well with only rough guesses for the
focal length, so perhaps full autocalibation is not that
important.
Adding support for the last two combinations, (f, k1) and (f,
k1, k2) required changes to the library libmv depends on for
bundle adjustment, SSBA. These changes should get ported
upstream not just to libmv but to SSBA as well.
- Improved the region of convergence for bundle adjustment by
increasing the number of Levenberg-Marquardt iterations from 50
to 500. This way, the solver is able to crawl out of the bad
local minima it gets stuck in when changing from, for example,
bundling k1 and k2 to just k1 and resetting k2 to 0.
- Add several new region tracker implementations. A region tracker
is a libmv concept, which refers to tracking a template image
pattern through frames. The impact to end users is that tracking
should "just work better". I am reserving a more detailed
writeup, and maybe a paper, for later.
- Other libmv tweaks, such as detecting that a tracker is headed
outside of the image bounds.
This includes several changes made directly to the libmv extern
code rather expecting to get those changes through normal libmv
channels, because I, the libmv BDFL, decided it was faster to work
on libmv directly in Blender, then later reverse-port the libmv
changes from Blender back into libmv trunk. The interesting part
is that I added a full Levenberg-Marquardt loop to the region
tracking code, which should lead to a more stable solutions. I
also added a hacky implementation of "Efficient Second-Order
Minimization" for tracking, which works nicely. A more detailed
quantitative evaluation will follow.
Original patch by Keir, cleaned a bit by myself.
2011-11-14 06:41:23 +00:00
|
|
|
libmv/tracking/lmicklt_region_tracker.cc
|
2012-02-17 15:39:32 +00:00
|
|
|
libmv/tracking/pyramid_region_tracker.cc
|
2011-11-07 12:55:18 +00:00
|
|
|
libmv/tracking/retrack_region_tracker.cc
|
Planar tracking support for motion tracking
===========================================
Major list of changes done in tomato branch:
- Add a planar tracking implementation to libmv
This adds a new planar tracking implementation to libmv. The
tracker is based on Ceres[1], the new nonlinear minimizer that
myself and Sameer released from Google as open source. Since
the motion model is more involved, the interface is
different than the RegionTracker interface used previously
in Blender.
The start of a C API in libmv-capi.{cpp,h} is also included.
- Migrate from pat_{min,max} for markers to 4 corners representation
Convert markers in the movie clip editor / 2D tracker from using
pat_min and pat_max notation to using the a more general, 4-corner
representation.
There is still considerable porting work to do; in particular
sliding from preview widget does not work correct for rotated
markers.
All other areas should be ported to new representation:
* Added support of sliding individual corners. LMB slide + Ctrl
would scale the whole pattern
* S would scale the whole marker, S-S would scale pattern only
* Added support of marker's rotation which is currently rotates
only patterns around their centers or all markers around median,
Rotation or other non-translation/scaling transformation of search
area doesn't make sense.
* Track Preview widget would display transformed pattern which
libmv actually operates with.
- "Efficient Second-order Minimization" for the planar tracker
This implements the "Efficient Second-order Minimization"
scheme, as supported by the existing translation tracker.
This increases the amount of per-iteration work, but
decreases the number of iterations required to converge and
also increases the size of the basin of attraction for the
optimization.
- Remove the use of the legacy RegionTracker API from Blender,
and replaces it with the new TrackRegion API. This also
adds several features to the planar tracker in libmv:
* Do a brute-force initialization of tracking similar to "Hybrid"
mode in the stable release, but using all floats. This is slower
but more accurate. It is still necessary to evaluate if the
performance loss is worth it. In particular, this change is
necessary to support high bit depth imagery.
* Add support for masks over the search window. This is a step
towards supporting user-defined tracker masks. The tracker masks
will make it easy for users to make a mask for e.g. a ball.
Not exposed into interface yet/
* Add Pearson product moment correlation coefficient checking (aka
"Correlation" in the UI. This causes tracking failure if the
tracked patch is not linearly related to the template.
* Add support for warping a few points in addition to the supplied
points. This is useful because the tracking code deliberately
does not expose the underlying warp representation. Instead,
warps are specified in an aparametric way via the correspondences.
- Replace the old style tracker configuration panel with the
new planar tracking panel. From a users perspective, this means:
* The old "tracking algorithm" picker is gone. There is only 1
algorithm now. We may revisit this later, but I would much
prefer to have only 1 algorithm. So far no optimization work
has been done so the speed is not there yet.
* There is now a dropdown to select the motion model. Choices:
* Translation
* Translation, rotation
* Translation, scale
* Translation, rotation, scale
* Affine
* Perspective
* The old "Hybrid" mode is gone; instead there is a toggle to
enable or disable translation-only tracker initialization. This
is the equivalent of the hyrbid mode before, but rewritten to work
with the new planar tracking modes.
* The pyramid levels setting is gone. At a future date, the planar
tracker will decide to use pyramids or not automatically. The
pyramid setting was ultimately a mistake; with the brute force
initialization it is unnecessary.
- Add light-normalized tracking
Added the ability to normalize patterns by their average value while
tracking, to make them invariant to global illumination changes.
Additional details could be found at wiki page [2]
[1] http://code.google.com/p/ceres-solver
[2] http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.64/Motion_Tracker
2012-06-10 15:28:19 +00:00
|
|
|
libmv/tracking/track_region.cc
|
2012-12-20 11:03:39 +00:00
|
|
|
libmv/tracking/trklt_region_tracker.cc
|
2011-11-07 12:55:18 +00:00
|
|
|
|
|
|
|
third_party/fast/fast_10.c
|
|
|
|
third_party/fast/fast_11.c
|
|
|
|
third_party/fast/fast_12.c
|
2012-02-17 15:39:32 +00:00
|
|
|
third_party/fast/fast_9.c
|
2011-11-07 12:55:18 +00:00
|
|
|
third_party/fast/fast.c
|
|
|
|
third_party/fast/nonmax.c
|
2012-02-17 15:39:32 +00:00
|
|
|
third_party/gflags/gflags.cc
|
|
|
|
third_party/gflags/gflags_completions.cc
|
|
|
|
third_party/gflags/gflags_reporting.cc
|
2011-11-07 12:55:18 +00:00
|
|
|
|
|
|
|
libmv-capi.h
|
2012-02-17 15:39:32 +00:00
|
|
|
libmv/base/id_generator.h
|
|
|
|
libmv/base/scoped_ptr.h
|
|
|
|
libmv/base/vector.h
|
|
|
|
libmv/base/vector_utils.h
|
|
|
|
libmv/image/array_nd.h
|
|
|
|
libmv/image/convolve.h
|
2012-03-30 10:37:39 +00:00
|
|
|
libmv/image/correlation.h
|
2012-04-11 13:51:37 +00:00
|
|
|
libmv/image/image.h
|
2012-02-17 15:39:32 +00:00
|
|
|
libmv/image/sample.h
|
|
|
|
libmv/image/tuple.h
|
2011-11-07 12:55:18 +00:00
|
|
|
libmv/logging/logging.h
|
2012-02-17 15:39:32 +00:00
|
|
|
libmv/multiview/conditioning.h
|
|
|
|
libmv/multiview/euclidean_resection.h
|
|
|
|
libmv/multiview/fundamental.h
|
2012-12-04 14:43:42 +00:00
|
|
|
libmv/multiview/homography.h
|
|
|
|
libmv/multiview/homography_parameterization.h
|
2012-02-17 15:39:32 +00:00
|
|
|
libmv/multiview/nviewtriangulation.h
|
2013-02-28 14:24:42 +00:00
|
|
|
libmv/multiview/panography.h
|
2012-02-17 15:39:32 +00:00
|
|
|
libmv/multiview/projection.h
|
|
|
|
libmv/multiview/resection.h
|
|
|
|
libmv/multiview/triangulation.h
|
2011-11-07 12:55:18 +00:00
|
|
|
libmv/numeric/dogleg.h
|
|
|
|
libmv/numeric/function_derivative.h
|
2012-02-17 15:39:32 +00:00
|
|
|
libmv/numeric/levenberg_marquardt.h
|
2011-11-07 12:55:18 +00:00
|
|
|
libmv/numeric/numeric.h
|
2012-02-17 15:39:32 +00:00
|
|
|
libmv/numeric/poly.h
|
|
|
|
libmv/simple_pipeline/bundle.h
|
2011-11-28 13:49:42 +00:00
|
|
|
libmv/simple_pipeline/callbacks.h
|
2011-11-07 12:55:18 +00:00
|
|
|
libmv/simple_pipeline/camera_intrinsics.h
|
|
|
|
libmv/simple_pipeline/detect.h
|
|
|
|
libmv/simple_pipeline/initialize_reconstruction.h
|
2012-02-17 15:39:32 +00:00
|
|
|
libmv/simple_pipeline/intersect.h
|
2012-04-14 12:02:39 +00:00
|
|
|
libmv/simple_pipeline/modal_solver.h
|
2012-02-17 15:39:32 +00:00
|
|
|
libmv/simple_pipeline/pipeline.h
|
|
|
|
libmv/simple_pipeline/reconstruction.h
|
|
|
|
libmv/simple_pipeline/resect.h
|
|
|
|
libmv/simple_pipeline/tracks.h
|
2011-12-04 13:26:11 +00:00
|
|
|
libmv/tracking/brute_region_tracker.h
|
2012-02-17 15:39:32 +00:00
|
|
|
libmv/tracking/esm_region_tracker.h
|
2011-12-04 13:26:11 +00:00
|
|
|
libmv/tracking/hybrid_region_tracker.h
|
2012-02-17 15:39:32 +00:00
|
|
|
libmv/tracking/klt_region_tracker.h
|
|
|
|
libmv/tracking/lmicklt_region_tracker.h
|
|
|
|
libmv/tracking/pyramid_region_tracker.h
|
|
|
|
libmv/tracking/region_tracker.h
|
2011-11-07 12:55:18 +00:00
|
|
|
libmv/tracking/retrack_region_tracker.h
|
2012-12-04 14:43:42 +00:00
|
|
|
libmv/tracking/track_region.h
|
2011-11-07 12:55:18 +00:00
|
|
|
libmv/tracking/trklt_region_tracker.h
|
|
|
|
|
2012-02-17 15:39:32 +00:00
|
|
|
third_party/fast/fast.h
|
2011-11-07 12:55:18 +00:00
|
|
|
third_party/gflags/config.h
|
2012-03-11 19:52:25 +00:00
|
|
|
third_party/gflags/gflags/gflags_completions.h
|
|
|
|
third_party/gflags/gflags/gflags_declare.h
|
|
|
|
third_party/gflags/gflags/gflags.h
|
2012-02-17 15:39:32 +00:00
|
|
|
third_party/gflags/mutex.h
|
2012-03-11 19:52:25 +00:00
|
|
|
third_party/gflags/util.h
|
2011-11-07 12:55:18 +00:00
|
|
|
third_party/msinttypes/inttypes.h
|
2012-02-17 15:39:32 +00:00
|
|
|
third_party/msinttypes/stdint.h
|
2011-11-07 12:55:18 +00:00
|
|
|
)
|
|
|
|
|
2011-11-08 01:32:34 +00:00
|
|
|
if(WIN32)
|
2011-11-07 12:55:18 +00:00
|
|
|
list(APPEND SRC
|
|
|
|
third_party/glog/src/logging.cc
|
|
|
|
third_party/glog/src/raw_logging.cc
|
|
|
|
third_party/glog/src/utilities.cc
|
|
|
|
third_party/glog/src/vlog_is_on.cc
|
|
|
|
third_party/glog/src/windows/port.cc
|
|
|
|
|
2012-02-17 15:39:32 +00:00
|
|
|
third_party/glog/src/utilities.h
|
2011-12-11 00:53:37 +00:00
|
|
|
third_party/glog/src/stacktrace_generic-inl.h
|
2012-02-17 15:39:32 +00:00
|
|
|
third_party/glog/src/stacktrace.h
|
2011-11-07 12:55:18 +00:00
|
|
|
third_party/glog/src/stacktrace_x86_64-inl.h
|
|
|
|
third_party/glog/src/base/googleinit.h
|
|
|
|
third_party/glog/src/base/mutex.h
|
2012-02-17 15:39:32 +00:00
|
|
|
third_party/glog/src/base/commandlineflags.h
|
|
|
|
third_party/glog/src/stacktrace_powerpc-inl.h
|
|
|
|
third_party/glog/src/stacktrace_x86-inl.h
|
|
|
|
third_party/glog/src/config.h
|
|
|
|
third_party/glog/src/stacktrace_libunwind-inl.h
|
2011-11-07 12:55:18 +00:00
|
|
|
third_party/glog/src/windows/glog/raw_logging.h
|
|
|
|
third_party/glog/src/windows/glog/vlog_is_on.h
|
2012-02-17 15:39:32 +00:00
|
|
|
third_party/glog/src/windows/glog/logging.h
|
|
|
|
third_party/glog/src/windows/glog/log_severity.h
|
|
|
|
third_party/glog/src/windows/port.h
|
|
|
|
third_party/glog/src/windows/config.h
|
2011-11-07 12:55:18 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
list(APPEND INC
|
2011-11-08 01:32:34 +00:00
|
|
|
third_party/glog/src/windows
|
2011-11-07 12:55:18 +00:00
|
|
|
)
|
|
|
|
|
2011-11-08 01:32:34 +00:00
|
|
|
if(NOT MINGW)
|
2011-11-07 18:14:50 +00:00
|
|
|
list(APPEND INC
|
2011-11-08 01:32:34 +00:00
|
|
|
third_party/msinttypes
|
2011-11-07 18:14:50 +00:00
|
|
|
)
|
2011-11-08 01:32:34 +00:00
|
|
|
endif()
|
2011-12-11 00:53:37 +00:00
|
|
|
else()
|
2011-11-07 12:55:18 +00:00
|
|
|
list(APPEND SRC
|
|
|
|
third_party/glog/src/demangle.cc
|
2012-02-17 15:39:32 +00:00
|
|
|
third_party/glog/src/logging.cc
|
2011-11-07 12:55:18 +00:00
|
|
|
third_party/glog/src/raw_logging.cc
|
2012-02-17 15:39:32 +00:00
|
|
|
third_party/glog/src/signalhandler.cc
|
|
|
|
third_party/glog/src/symbolize.cc
|
|
|
|
third_party/glog/src/utilities.cc
|
|
|
|
third_party/glog/src/vlog_is_on.cc
|
2011-11-07 12:55:18 +00:00
|
|
|
|
2012-02-17 15:39:32 +00:00
|
|
|
third_party/glog/src/base/commandlineflags.h
|
|
|
|
third_party/glog/src/base/googleinit.h
|
|
|
|
third_party/glog/src/base/mutex.h
|
2011-12-11 00:53:37 +00:00
|
|
|
third_party/glog/src/config_freebsd.h
|
2012-02-17 15:39:32 +00:00
|
|
|
third_party/glog/src/config.h
|
2012-04-11 13:51:37 +00:00
|
|
|
third_party/glog/src/config_hurd.h
|
2011-12-11 00:53:37 +00:00
|
|
|
third_party/glog/src/config_linux.h
|
2011-11-07 12:55:18 +00:00
|
|
|
third_party/glog/src/config_mac.h
|
2011-12-11 00:53:37 +00:00
|
|
|
third_party/glog/src/demangle.h
|
2012-02-17 15:39:32 +00:00
|
|
|
third_party/glog/src/glog/logging.h
|
|
|
|
third_party/glog/src/glog/log_severity.h
|
|
|
|
third_party/glog/src/glog/raw_logging.h
|
|
|
|
third_party/glog/src/glog/vlog_is_on.h
|
2011-12-11 00:53:37 +00:00
|
|
|
third_party/glog/src/stacktrace_generic-inl.h
|
2012-02-17 15:39:32 +00:00
|
|
|
third_party/glog/src/stacktrace.h
|
2011-12-11 00:53:37 +00:00
|
|
|
third_party/glog/src/stacktrace_libunwind-inl.h
|
|
|
|
third_party/glog/src/stacktrace_powerpc-inl.h
|
2011-11-07 12:55:18 +00:00
|
|
|
third_party/glog/src/stacktrace_x86_64-inl.h
|
2012-02-17 15:39:32 +00:00
|
|
|
third_party/glog/src/stacktrace_x86-inl.h
|
2011-11-07 12:55:18 +00:00
|
|
|
third_party/glog/src/symbolize.h
|
2011-12-11 00:53:37 +00:00
|
|
|
third_party/glog/src/utilities.h
|
2011-11-07 12:55:18 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
list(APPEND INC
|
2011-11-08 01:32:34 +00:00
|
|
|
third_party/glog/src
|
2011-11-07 12:55:18 +00:00
|
|
|
)
|
2011-11-08 01:32:34 +00:00
|
|
|
endif()
|
2011-11-07 12:55:18 +00:00
|
|
|
|
2011-12-11 00:53:37 +00:00
|
|
|
add_definitions(
|
|
|
|
-DGOOGLE_GLOG_DLL_DECL=
|
|
|
|
)
|
2011-11-07 12:55:18 +00:00
|
|
|
|
|
|
|
blender_add_lib(extern_libmv "${SRC}" "${INC}" "${INC_SYS}")
|
2013-02-20 11:29:43 +00:00
|
|
|
|
|
|
|
add_subdirectory(third_party)
|