Commit 77684393 authored by Andrey Filippov's avatar Andrey Filippov

implemented synthetic stereo video generation

parent 7c62f986
...@@ -2227,6 +2227,9 @@ public class EyesisCorrectionParameters { ...@@ -2227,6 +2227,9 @@ public class EyesisCorrectionParameters {
null, // filter null, // filter
this.x3dDirectory); //this.sourceDirectory); this.x3dDirectory); //this.sourceDirectory);
if (dir!=null) { if (dir!=null) {
while (dir.endsWith(Prefs.getFileSeparator())) {
dir = dir.substring(0, dir.length()-1);
}
this.x3dDirectory=dir; this.x3dDirectory=dir;
if (this.use_x3d_subdirs && (name != null) && !name.equals("")) { if (this.use_x3d_subdirs && (name != null) && !name.equals("")) {
// name = this.x3dDirectory + Prefs.getFileSeparator(); // +this.x3dSubdirPrefix + name + this.x3dSubdirSuffix; // name = this.x3dDirectory + Prefs.getFileSeparator(); // +this.x3dSubdirPrefix + name + this.x3dSubdirSuffix;
...@@ -2243,6 +2246,9 @@ public class EyesisCorrectionParameters { ...@@ -2243,6 +2246,9 @@ public class EyesisCorrectionParameters {
name); //this.x3dDirectory + Prefs.getFileSeparator()+name); //this.sourceDirectory); name); //this.x3dDirectory + Prefs.getFileSeparator()+name); //this.sourceDirectory);
} }
} }
while (dir.endsWith(Prefs.getFileSeparator())) {
dir = dir.substring(0, dir.length()-1);
}
return dir; return dir;
} }
......
...@@ -2043,6 +2043,8 @@ public class QuadCLT extends QuadCLTCPU { ...@@ -2043,6 +2043,8 @@ public class QuadCLT extends QuadCLTCPU {
final Rectangle full_woi_in, // show larger than sensor WOI in tiles (or null) final Rectangle full_woi_in, // show larger than sensor WOI in tiles (or null)
CLTParameters clt_parameters, CLTParameters clt_parameters,
double [] disparity_ref, double [] disparity_ref,
// not used, just as null/not null now. All offsets are already in scene_xyz, scene_atr (including ref)
// double [] stereo_offset, // offset reference camera {x,y,z} or null
final double [] scene_xyz, // camera center in world coordinates final double [] scene_xyz, // camera center in world coordinates
final double [] scene_atr, // camera orientation relative to world frame final double [] scene_atr, // camera orientation relative to world frame
final QuadCLT scene, final QuadCLT scene,
...@@ -2052,7 +2054,7 @@ public class QuadCLT extends QuadCLTCPU { ...@@ -2052,7 +2054,7 @@ public class QuadCLT extends QuadCLTCPU {
int threadsMax, int threadsMax,
final int debugLevel){ final int debugLevel){
boolean show_nan = toRGB? clt_parameters.imp.show_color_nan : clt_parameters.imp.show_mono_nan; boolean show_nan = toRGB? clt_parameters.imp.show_color_nan : clt_parameters.imp.show_mono_nan;
double [][] pXpYD =OpticalFlow.transformToScenePxPyD( double [][] pXpYD =OpticalFlow.transformToScenePxPyD( // now should work with offset ref_scene
full_woi_in, // final Rectangle [] extra_woi, // show larger than sensor WOI (or null) full_woi_in, // final Rectangle [] extra_woi, // show larger than sensor WOI (or null)
disparity_ref, // final double [] disparity_ref, // invalid tiles - NaN in disparity disparity_ref, // final double [] disparity_ref, // invalid tiles - NaN in disparity
scene_xyz, // final double [] scene_xyz, // camera center in world coordinates scene_xyz, // final double [] scene_xyz, // camera center in world coordinates
...@@ -2065,7 +2067,7 @@ public class QuadCLT extends QuadCLTCPU { ...@@ -2065,7 +2067,7 @@ public class QuadCLT extends QuadCLTCPU {
rendered_width = full_woi_in.width * GPUTileProcessor.DTT_SIZE; rendered_width = full_woi_in.width * GPUTileProcessor.DTT_SIZE;
} }
//scene_QuadClt.getTileProcessor().getTileSize(); //scene_QuadClt.getTileProcessor().getTileSize();
TpTask[] tp_tasks_ref = GpuQuad.setInterTasks( // inter? TpTask[] tp_tasks_ref = GpuQuad.setInterTasks( // "true" reference, with stereo actual reference will be offset
scene.getNumSensors(), scene.getNumSensors(),
rendered_width, // should match output size, pXpYD.length rendered_width, // should match output size, pXpYD.length
!scene.hasGPU(), // final boolean calcPortsCoordinatesAndDerivatives, // GPU can calculate them centreXY !scene.hasGPU(), // final boolean calcPortsCoordinatesAndDerivatives, // GPU can calculate them centreXY
......
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