Commit 78002a6b authored by Andrey Filippov's avatar Andrey Filippov

Center of mass calculation for X/Y motion vector

parent 82ae5d53
...@@ -361,7 +361,7 @@ public class Correlation2d { ...@@ -361,7 +361,7 @@ public class Correlation2d {
* @param fat_zero add to normalization amplitude * @param fat_zero add to normalization amplitude
* @return [4][transform_len] FD CLT data * @return [4][transform_len] FD CLT data
*/ */
public double[][] correlateSingleColorFD( // USED in lwir public double[][] correlateSingleColorFD( // USED in lwir
double [][] clt_data1, double [][] clt_data1,
double [][] clt_data2, double [][] clt_data2,
double [][] tcorr, // null or initialized to [4][transform_len] double [][] tcorr, // null or initialized to [4][transform_len]
...@@ -452,7 +452,7 @@ public class Correlation2d { ...@@ -452,7 +452,7 @@ public class Correlation2d {
tcorr[col], tcorr[col],
fat_zero/scale_value); fat_zero/scale_value);
if (first_col < 0) {// accummulate all channels in first non-null color ( 0 for color, 2 for mono?) if (first_col < 0) {// accumulate all channels in first non-null color ( 0 for color, 2 for mono?)
first_col = col; // first non-empty color (2, green) or 0 for color images first_col = col; // first non-empty color (2, green) or 0 for color images
for (int n = 0; n < 4; n++) { for (int n = 0; n < 4; n++) {
for (int i = 0; i < transform_len; i++) { for (int i = 0; i < transform_len; i++) {
......
...@@ -8297,11 +8297,12 @@ if (debugLevel > -100) return true; // temporarily ! ...@@ -8297,11 +8297,12 @@ if (debugLevel > -100) return true; // temporarily !
double [][][] pair_sets = double [][][] pair_sets =
opticalFlow.get_pair( opticalFlow.get_pair(
k_prev, clt_parameters, // CLTParameters clt_parameters,
quadCLTs[i], k_prev,
qPrev, quadCLTs[i],
corr_scale, qPrev,
1); // -1); // int debug_level); corr_scale,
1); // -1); // int debug_level);
} }
/* /*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment