[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50757] trunk/blender/extern/libmv/libmv/ tracking/track_region.cc: Cleanup for when trackers fall out of the search window.
Keir Mierle
mierle at gmail.com
Thu Sep 20 00:01:44 CEST 2012
Revision: 50757
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50757
Author: keir
Date: 2012-09-19 22:01:42 +0000 (Wed, 19 Sep 2012)
Log Message:
-----------
Cleanup for when trackers fall out of the search window.
Sergey originally left a TODO() here, but his fix is the correct
one. I removed the TODO and fixed some comment issues.
Modified Paths:
--------------
trunk/blender/extern/libmv/libmv/tracking/track_region.cc
Modified: trunk/blender/extern/libmv/libmv/tracking/track_region.cc
===================================================================
--- trunk/blender/extern/libmv/libmv/tracking/track_region.cc 2012-09-19 19:53:16 UTC (rev 50756)
+++ trunk/blender/extern/libmv/libmv/tracking/track_region.cc 2012-09-19 22:01:42 UTC (rev 50757)
@@ -18,7 +18,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
// IN THE SOFTWARE.
//
-// Author: mierle at google.com (Keir Mierle)
+// Author: mierle at gmail.com (Keir Mierle)
//
// TODO(keir): While this tracking code works rather well, it has some
// outragous inefficiencies. There is probably a 5-10x speedup to be had if a
@@ -41,7 +41,11 @@
#include "libmv/multiview/homography.h"
#include "libmv/numeric/numeric.h"
+// Expand the Jet functionality of Ceres to allow mixed numeric/autodiff.
+//
+// TODO(keir): Push this (or something similar) into upstream Ceres.
namespace ceres {
+
// A jet traits class to make it easier to work with mixed auto / numeric diff.
template<typename T>
struct JetOps {
@@ -113,8 +117,9 @@
return jet_f;
}
};
-}
+} // namespace ceres
+
namespace libmv {
using ceres::Jet;
@@ -1364,12 +1369,6 @@
// TODO(keir): Update the result statistics.
// TODO(keir): Add a normalize-cross-correlation variant.
- // TODO(sergey): in previous bundled Ceres from Windows branch our callback
- // wasn't called, so USER_ABORT was never happen.
- // now callback is calling and in some cases it returns SOLVER_ABORT
- // not sure if it's bug somewhere or we could just mark tracking
- // result as failed without causing general panic
- // CHECK_NE(summary.termination_type, ceres::USER_ABORT) << "Libmv bug.";
if (summary.termination_type == ceres::USER_ABORT) {
result->termination = TrackRegionResult::FELL_OUT_OF_BOUNDS;
return;
More information about the Bf-blender-cvs
mailing list