more tests with dct-based processing (7e93745b) · Commits · Elphel / imagej-elphel

src/main/java/DttRad2.java

+69 −1

Original line number	Original line	Diff line number	Diff line
	@@ -148,8 +148,59 @@ public class DttRad2 {
	fi[1][0],fi[1][1],fi[1][2], hwindow[fi[0][1]], hwindow[fi[1][1]]));		fi[1][0],fi[1][1],fi[1][2], hwindow[fi[0][1]], hwindow[fi[1][1]]));
	}		}
	}		}
			}

			public double [][] get_fold_2d(
			double scale_hor,
			double scale_vert)
			{
			return get_fold_2d( this.N, scale_hor, scale_vert);
			}
			public double [][] get_fold_2d(
			int n,
			double scale_hor,
			double scale_vert
			){ // n - DCT and window size
			// if ((fold_index != null) && (fold_index.length == n*n)) return;
			// fold_index = new int[n*n][4];

			double [] hwindow_h = new double[n];
			double [] hwindow_v = new double[n];
			double f = Math.PI/(2.0*n);
			for (int i = 0; i < n; i++ ) {
			double ah = fscale_hor (n-i-0.5);
			double av = fscale_vert (n-i-0.5);
			hwindow_h[i] = (ah > (Math.PI/2))? 0.0: Math.cos(ah);
			hwindow_v[i] = (av > (Math.PI/2))? 0.0: Math.cos(av);
			}
			double [][] fold_sk = new double[n*n][4];
			int [] vert_ind = new int[2];
			double [] vert_k = new double[2];
			int [] hor_ind = new int[2];
			double [] hor_k = new double[2];
			int [][] fi;
			for (int i = 0; i < n; i++ ){
			fi = get_fold_indices(i,n);
			vert_ind[0] = fi[0][0];
			vert_ind[1] = fi[1][0];
			vert_k[0] = fi[0][2] * hwindow_v[fi[0][1]];
			vert_k[1] = fi[1][2] * hwindow_v[fi[1][1]];
			for (int j = 0; j < n; j++ ){
			fi = get_fold_indices(j,n);
			hor_ind[0] = fi[0][0];
			hor_ind[1] = fi[1][0];
			hor_k[0] = fi[0][2] * hwindow_h[fi[0][1]];
			hor_k[1] = fi[1][2] * hwindow_h[fi[1][1]];
			int indx = n*i + j;
			for (int k = 0; k<4;k++) {
			fold_sk[indx][k] = vert_k[(k>>1) & 1] * hor_k[k & 1];
	}		}
			}
			}
			return fold_sk;
			}


	// return index+1 and sign for 1-d imdct. x is index (0..2n-1) of the imdct array, value is sign (idct_index+1),		// return index+1 and sign for 1-d imdct. x is index (0..2n-1) of the imdct array, value is sign (idct_index+1),
	// where idct_index (0..n-1) is index in the dct-iv array		// where idct_index (0..n-1) is index in the dct-iv array
	private int get_unfold_index(int x, int n){		private int get_unfold_index(int x, int n){
	@@ -351,6 +402,22 @@ public class DttRad2 {
	return fold_tile(x, 1 << (ilog2(x.length/4)/2));		return fold_tile(x, 1 << (ilog2(x.length/4)/2));
	}		}
	public double [] fold_tile(double [] x, int n) { // x should be 2n*2n		public double [] fold_tile(double [] x, int n) { // x should be 2n*2n
			return fold_tile(x,n,this.fold_k);
			// double [] y = new double [n*n];
			// for (int i = 0; i<y.length;i++) {
			// y[i] = 0;
			// for (int k = 0; k < 4; k++){
			// y[i] += x[fold_index[i][k]] * fold_k[i][k];
			// }
			// }
			// return y;
			}

			public double [] fold_tile(
			double [] x,
			int n,
			double [][] fold_k
			) { // x should be 2n*2n
	double [] y = new double [n*n];		double [] y = new double [n*n];
	for (int i = 0; i<y.length;i++) {		for (int i = 0; i<y.length;i++) {
	y[i] = 0;		y[i] = 0;
	@@ -361,6 +428,7 @@ public class DttRad2 {
	return y;		return y;
	}		}


	public double [] unfold_tile(double [] x) { // x should be n*n		public double [] unfold_tile(double [] x) { // x should be n*n
	return unfold_tile(x, 1 << (ilog2(x.length)/2));		return unfold_tile(x, 1 << (ilog2(x.length)/2));

src/main/java/EyesisCorrectionParameters.java

+22 −18

src/main/java/EyesisDCT.java

+106 −8

Original line number	Original line	Diff line number	Diff line
	@@ -1211,6 +1211,7 @@ public class EyesisDCT {
	threadsMax,		threadsMax,
	debugLevel);		debugLevel);
	} else { // just LPF RGB		} else { // just LPF RGB
			if (dct_parameters.dbg_sigma > 0){ // no filter at all
	for (int chn = 0; chn < dct_data.length; chn++) {		for (int chn = 0; chn < dct_data.length; chn++) {
	image_dtt.dct_lpf(		image_dtt.dct_lpf(
	dct_parameters.dbg_sigma,		dct_parameters.dbg_sigma,
	@@ -1218,6 +1219,7 @@ public class EyesisDCT {
	threadsMax,		threadsMax,
	debugLevel);		debugLevel);
	}		}
			}

	}		}

	@@ -1274,7 +1276,7 @@ public class EyesisDCT {
	(dct_parameters.denoise? dct_parameters.denoise_c:0.0), // final double denoise_c, // = 1.0; // maximal total smoothing of the color differences post-kernel (will compete with edge emphasis)		(dct_parameters.denoise? dct_parameters.denoise_c:0.0), // final double denoise_c, // = 1.0; // maximal total smoothing of the color differences post-kernel (will compete with edge emphasis)
	dct_parameters.denoise_y_corn, // final double denoise_y_corn, // = 0.5; // weight of the 4 corner pixels during denoise y (relative to 4 straight)		dct_parameters.denoise_y_corn, // final double denoise_y_corn, // = 0.5; // weight of the 4 corner pixels during denoise y (relative to 4 straight)
	dct_parameters.denoise_c_corn, // final double denoise_c_corn, // = 0.5; // weight of the 4 corner pixels during denoise y (relative to 4 straight)		dct_parameters.denoise_c_corn, // final double denoise_c_corn, // = 0.5; // weight of the 4 corner pixels during denoise y (relative to 4 straight)
	threadsMax, // final int threadsMax, // maximal number of threads to launch		dct_parameters.dct_size, //, // final int threadsMax, // maximal number of threads to launch
	debugLevel); // final int globalDebugLevel)		debugLevel); // final int globalDebugLevel)
	if (debugLevel > 0) sdfa_instance.showArrays(		if (debugLevel > 0) sdfa_instance.showArrays(
	idct_data,		idct_data,
	@@ -1291,7 +1293,37 @@ public class EyesisDCT {
	(tilesX + 1) * dct_parameters.dct_size);		(tilesX + 1) * dct_parameters.dct_size);

	} else {		} else {
	if (debugLevel > 0) System.out.println("Bypassing nonlinear correction");		if (dct_parameters.post_debayer){ // post_debayer
			if (debugLevel > -1) System.out.println("Applying post-debayer");
			if (debugLevel > -1) sdfa_instance.showArrays(
			idct_data,
			(tilesX + 1) * dct_parameters.dct_size,
			(tilesY + 1) * dct_parameters.dct_size,
			true,
			result.getTitle()+"-rbg_before");

			idct_data = post_debayer( // debayer in pixel domain after aberration correction
			idct_data, // final double [][] rbg, // yPrPb,
			(tilesX + 1) * dct_parameters.dct_size, // final int width,
			dct_parameters.dct_size, // final int step, // just for multi-threading efficiency?
			dct_parameters.dct_size, // final int threadsMax, // maximal number of threads to launch
			debugLevel); // final int globalDebugLevel)
			// add here YPrPb conversion, then edge_emphasis
			if (debugLevel > -1) sdfa_instance.showArrays(
			idct_data,
			(tilesX + 1) * dct_parameters.dct_size,
			(tilesY + 1) * dct_parameters.dct_size,
			true,
			result.getTitle()+"-rbg_after");
			} else {
			if (debugLevel > -1) System.out.println("Applyed LPF, sigma = "+dct_parameters.dbg_sigma);
			if (debugLevel > -1) sdfa_instance.showArrays(
			idct_data,
			(tilesX + 1) * dct_parameters.dct_size,
			(tilesY + 1) * dct_parameters.dct_size,
			true,
			result.getTitle()+"-rbg_sigma");
			}
	}		}

	if (debugLevel > 0) sdfa_instance.showArrays(idct_data,		if (debugLevel > 0) sdfa_instance.showArrays(idct_data,
	@@ -1554,6 +1586,69 @@ public class EyesisDCT {
	}		}


			public double [][] post_debayer( // debayer in pixel domain after aberration correction
			final double [][] rbg, // yPrPb,
			final int width,
			final int step, // just for multi-threading efficiency?
			final int threadsMax, // maximal number of threads to launch
			final int globalDebugLevel)
			{
			final double [][] rbg_new = new double [rbg.length][rbg[0].length];
			final int height = rbg[0].length/width;
			final int tilesY = (height + step - 1) / step;
			final int tilesX = (width + step - 1) / step;
			final int nTiles=tilesX*tilesY;
			final double [] kern_g={
			0.0, 0.125, 0.0 ,
			0.125, 0.5, 0.125,
			0.0, 0.125, 0.0 };
			final double [] kern_rb={
			0.0625, 0.125, 0.0625,
			0.125, 0.25, 0.125,
			0.0625, 0.125, 0.0625};
			final double [][] kerns = {kern_rb,kern_rb,kern_g};

			final int [] neib_indices = {-width-1,-width,-width+1,-1,0,1,width-1,width,width+1};

			final Thread[] threads = ImageDtt.newThreadArray(threadsMax);
			final AtomicInteger ai = new AtomicInteger(0);

			for (int ithread = 0; ithread < threads.length; ithread++) {
			threads[ithread] = new Thread() {
			public void run() {
			int tileY,tileX;
			double [] neibs = new double[9]; // pixels around current, first Y, then each color diff
			for (int nTile = ai.getAndIncrement(); nTile < nTiles; nTile = ai.getAndIncrement()) {
			tileY = nTile/tilesX;
			tileX = nTile - tileY * tilesX;
			int y1 = (tileY +1) * step;
			if (y1 > height) y1 = height;
			int x1 = (tileX +1) * step;
			if (x1 > width) x1 = width;
			for (int y = tileY * step; y < y1; y++) {
			for (int x = tileX * step; x < x1; x++) {
			int indx = y*width + x;
			for (int n = 0; n < rbg.length; n++) {
			rbg_new[n][indx] = rbg[n][indx]; // default - just copy old value
			}
			if ((y > 0) && (y < (height - 1)) && (x > 0) && (x < (width - 1))) { // only correct those not on the edge
			for (int n = 0; n < rbg.length; n++) {
			rbg_new[n][indx] = 0.0;
			for (int i = 0; i < neibs.length; i++){
			rbg_new[n][indx] += kerns[n][i]*rbg[n][indx+neib_indices[i]];
			}
			}
			}
			}
			}
			}
			}
			};
			}
			ImageDtt.startAndJoin(threads);
			return rbg_new;
			}

	public double [][] edge_emphasis(		public double [][] edge_emphasis(
	final double [][] yPrPb,		final double [][] yPrPb,
	final int width,		final int width,
	@@ -1731,6 +1826,9 @@ public class EyesisDCT {
	ImageDtt.startAndJoin(threads);		ImageDtt.startAndJoin(threads);
	return yPrPb_new;		return yPrPb_new;
	}		}



	public void debayer_rbg(		public void debayer_rbg(
	ImageStack stack_rbg){		ImageStack stack_rbg){
	debayer_rbg(stack_rbg, 1.0);		debayer_rbg(stack_rbg, 1.0);

src/main/java/Eyesis_Correction.java

+98 −0

File changed.

Preview size limit exceeded, changes collapsed.

src/main/java/ImageDtt.java

+248 −0

File changed.

Preview size limit exceeded, changes collapsed.

Original line number	Original line	Diff line number	Diff line
	@@ -1785,6 +1785,9 @@ public class EyesisCorrectionParameters {
	public double dbg_x1 = -1.3;		public double dbg_x1 = -1.3;
	public double dbg_y1 = 2.0;		public double dbg_y1 = 2.0;
	public double dbg_sigma = 0.8;		public double dbg_sigma = 0.8;
			public double dbg_src_size = 8.0; // trying to slightly scale in dct space. == dct = 1:1, dct+1.0 - shrink dct(dct+1.0)
			public double dbg_scale = 1.0; // Should ==DCT_PARAMETERS.dct_size / DCT_PARAMETERS.dbg_src_size
			public double dbg_fold_scale = 1.0; // Modifies window during MDCT->DCT-IV folding
	public String dbg_mask = ".........:::::::::.........:::::::::........::::::::.........:::::::::.........";		public String dbg_mask = ".........:::::::::.........:::::::::........::::::::.........:::::::::.........";
	public int dbg_mode = 1; // 0 - old LMA, 1 - new LMA - * not used anymore *		public int dbg_mode = 1; // 0 - old LMA, 1 - new LMA - * not used anymore *
	public int dbg_window_mode = 1; // 0 - none, 1 - square, 2 - sin 3 - sin^2 Now _should_ be square !!!		public int dbg_window_mode = 1; // 0 - none, 1 - square, 2 - sin 3 - sin^2 Now _should_ be square !!!
	@@ -1814,6 +1817,7 @@ public class EyesisCorrectionParameters {
	public double vignetting_max = 0.4; // value in vignetting data to correspond to 1x in the kernel		public double vignetting_max = 0.4; // value in vignetting data to correspond to 1x in the kernel
	public double vignetting_range = 5.0; // do not try to correct vignetting less than vignetting_max/vignetting_range		public double vignetting_range = 5.0; // do not try to correct vignetting less than vignetting_max/vignetting_range

			public boolean post_debayer = false; // perform de-bayer after aberrations in pixel domain
	public boolean color_DCT = true; // false - use old color processing mode		public boolean color_DCT = true; // false - use old color processing mode
	public double sigma_rb = 0.9; // additional (to G) blur for R and B		public double sigma_rb = 0.9; // additional (to G) blur for R and B
	public double sigma_y = 0.7; // blur for G contribution to Y		public double sigma_y = 0.7; // blur for G contribution to Y
	@@ -1871,6 +1875,9 @@ public class EyesisCorrectionParameters {
	properties.setProperty(prefix+"dbg_x1", this.dbg_x1+"");		properties.setProperty(prefix+"dbg_x1", this.dbg_x1+"");
	properties.setProperty(prefix+"dbg_y1", this.dbg_y1+"");		properties.setProperty(prefix+"dbg_y1", this.dbg_y1+"");
	properties.setProperty(prefix+"dbg_sigma", this.dbg_sigma+"");		properties.setProperty(prefix+"dbg_sigma", this.dbg_sigma+"");
			properties.setProperty(prefix+"dbg_src_size",this.dbg_src_size+"");
			properties.setProperty(prefix+"dbg_scale", this.dbg_scale+"");
			properties.setProperty(prefix+"dbg_fold_scale", this.dbg_fold_scale+"");
	properties.setProperty(prefix+"dbg_mask", this.dbg_mask+"");		properties.setProperty(prefix+"dbg_mask", this.dbg_mask+"");
	properties.setProperty(prefix+"dbg_mode", this.dbg_mode+"");		properties.setProperty(prefix+"dbg_mode", this.dbg_mode+"");
	properties.setProperty(prefix+"dbg_window_mode", this.dbg_window_mode+"");		properties.setProperty(prefix+"dbg_window_mode", this.dbg_window_mode+"");
	@@ -1886,32 +1893,26 @@ public class EyesisCorrectionParameters {
	properties.setProperty(prefix+"antiwindow", this.antiwindow+"");		properties.setProperty(prefix+"antiwindow", this.antiwindow+"");
	properties.setProperty(prefix+"skip_sym", this.skip_sym+"");		properties.setProperty(prefix+"skip_sym", this.skip_sym+"");
	properties.setProperty(prefix+"convolve_direct", this.convolve_direct+"");		properties.setProperty(prefix+"convolve_direct", this.convolve_direct+"");

	properties.setProperty(prefix+"novignetting_r", this.novignetting_r+"");		properties.setProperty(prefix+"novignetting_r", this.novignetting_r+"");
	properties.setProperty(prefix+"novignetting_g", this.novignetting_g+"");		properties.setProperty(prefix+"novignetting_g", this.novignetting_g+"");
	properties.setProperty(prefix+"novignetting_b", this.novignetting_b+"");		properties.setProperty(prefix+"novignetting_b", this.novignetting_b+"");


	properties.setProperty(prefix+"scale_r", this.scale_r+"");		properties.setProperty(prefix+"scale_r", this.scale_r+"");
	properties.setProperty(prefix+"scale_g", this.scale_g+"");		properties.setProperty(prefix+"scale_g", this.scale_g+"");