quicker preview (5d783d7f) · Commits · Elphel / eyesis4pi-393-gui

js/elphel.js

+52 −1

Original line number	Original line	Diff line number	Diff line
	@@ -105,6 +105,55 @@ var Elphel = {
	// Pixel manipulation		// Pixel manipulation
	Pixels:{		Pixels:{

			reorderBlocksJP4_lowres: function(pixels,width,height,format="JP4",mosaic=[["Gr","R"],["B" ,"Gb"]],lowres){

			var oPixels = new Uint8Array(pixels.length/4);

			// check
			if ((lowres!=1)&&(lowres!=2)&&(lowres!=4)&&(lowres!=8)){
			lowres = 4;
			}

			var K0 = 3-Math.log(lowres)/Math.log(2);
			var K1 = 1<<K0;
			var K2 = K1-1;

			for(var y=0;y<height/2;y++){
			for(var x=0;x<width/2;x++){

			offset = y*width/2+x;

			y0 = 2K1(y>>K0)+(y&K2);
			x0 = 4K1(x>>K0)+(x&K2);

			if (x0>=width){
			x0 = x0 - width;
			y0 = y0 + K1;
			}

			offset0 = width*y0 + x0;

			for(var k=0;k<4;k++){
			ym = (k>>1)&1;
			xm = k&1;
			if (mosaic[ym][xm]=="R") r = pixels[4(offset0+K1k)+0];
			else if (mosaic[ym][xm]=="Gr") gr = pixels[4(offset0+K1k)+0];
			else if (mosaic[ym][xm]=="Gb") gb = pixels[4(offset0+K1k)+0];
			else if (mosaic[ym][xm]=="B") b = pixels[4(offset0+K1k)+0];
			}
			g = (gr+gb)>>1;

			oPixels[4(offset)+0] = r;//pixels[4(4*offset+1)+0];
			oPixels[4(offset)+1] = g;//pixels[4(4*offset+0)+0];
			oPixels[4(offset)+2] = b;//pixels[4(4*offset+2)+0];
			oPixels[4*(offset)+3] = 255;
			}
			}

			return oPixels;

			},

	/**		/**
	* Name: reorderJP4Blocks		* Name: reorderJP4Blocks
	* Description: clear from the function's name		* Description: clear from the function's name
	@@ -130,6 +179,8 @@ var Elphel = {
	*/		*/
	reorderBlocksJPx: function(pixels,width,height,format="JP4",mosaic=[["Gr","R"],["B" ,"Gb"]],nwd=false){		reorderBlocksJPx: function(pixels,width,height,format="JP4",mosaic=[["Gr","R"],["B" ,"Gb"]],nwd=false){

			var nwd2 = true;

	var t0 = Date.now();		var t0 = Date.now();

	// pixels is a long 1-D array with the following structure:		// pixels is a long 1-D array with the following structure:

js/eyesis4pi.js

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -569,7 +569,7 @@ function refresh_images_eyesis(){
	for (var i=0;i<cams.length;i++){		for (var i=0;i<cams.length;i++){
	remove_hidden_div(i);		remove_hidden_div(i);
	append_hidden_div(i);		append_hidden_div(i);
	$("#div_"+i).jp4({ip:cams[i].ip,port:cams[i].port,width:200,fast:true});		$("#div_"+i).jp4({ip:cams[i].ip, port:cams[i].port, width:200, fast:true, lowres:4});
	}		}

	}		}

js/jquery-jp4.js

+40 −5

Original line number	Original line	Diff line number	Diff line
	@@ -41,6 +41,7 @@
	mosaic: [["Gr","R"],["B" ,"Gb"]],		mosaic: [["Gr","R"],["B" ,"Gb"]],
	fast: false,		fast: false,
	precise: false,		precise: false,
			lowres: 0, // valid values: 1,2,4,8. 0 to disable
	width: 600,		width: 600,
	channel: "all",		channel: "all",
	diff: false,		diff: false,
	@@ -69,6 +70,13 @@

	// hide working canvas		// hide working canvas
	cnv_working.css({display:"none"});		cnv_working.css({display:"none"});
			/*
			cnv_working.css({
			position:"absolute",
			top: "500px",
			left: "500px"
			});
			*/

	elem.append(cnv_working);		elem.append(cnv_working);
	elem.append(cnv_display);		elem.append(cnv_display);
	@@ -112,17 +120,36 @@
	heavyImage.onload = function(){		heavyImage.onload = function(){

	EXIF.getData(this, function() {		EXIF.getData(this, function() {

			var cnv_w;
			var cnv_h;

			if (settings.lowres!=0){
			cnv_w = this.width/settings.lowres;
			cnv_h = this.height/settings.lowres;
			}else{
			cnv_w = this.width;
			cnv_h = this.height;
			}

	//update canvas size		//update canvas size
	canvas.attr("width",this.width);		canvas.attr("width",cnv_w);
	canvas.attr("height",this.height);		canvas.attr("height",cnv_h);

	parseEXIFMakerNote(this);		parseEXIFMakerNote(this);

	canvas.drawImage({		canvas.drawImage({
	x:0, y:0,		x:0, y:0,
	source: this,		source: this,
			width: cnv_w,
			height: cnv_h,
	//source: heavyImage,		//source: heavyImage,
	load: redraw,		load: redraw,
			sx: 0,
			sy: 0,
			sWidth: this.width,
			sHeight: this.height,
			//scale: scale,
	fromCenter: false		fromCenter: false
	});		});
	});		});
	@@ -208,6 +235,13 @@

	var worker = new Worker('js/webworker.js');		var worker = new Worker('js/webworker.js');

			TX = Date.now();

			//ctx.canvas.width = ctx.canvas.width/2;
			//ctx.canvas.height = ctx.canvas.height/2;
			//ctx.canvas.style.width = ctx.canvas.style.width/4;
			//ctx.canvas.style.height = ctx.canvas.style.height/4;

	var width = ctx.canvas.width;		var width = ctx.canvas.width;
	var height = ctx.canvas.height;		var height = ctx.canvas.height;
	var image = ctx.getImageData(0,0,width,height);		var image = ctx.getImageData(0,0,width,height);
	@@ -226,7 +260,8 @@
	fast: settings.fast,		fast: settings.fast,
	channel: settings.channel,		channel: settings.channel,
	diff: settings.diff,		diff: settings.diff,
	ndvi: settings.ndvi		ndvi: settings.ndvi,
			lowres: settings.lowres
	},		},
	},[pixels.buffer]);		},[pixels.buffer]);

js/webworker.js

+14 −18

Original line number	Original line	Diff line number	Diff line
	@@ -12,13 +12,18 @@ self.onmessage = function(e) {

	var Pixels = new Uint8Array(e.data.pixels);		var Pixels = new Uint8Array(e.data.pixels);

	if (Format!="JPEG"){		if (settings.lowres==0){
	var reorderedPixels = Elphel.Pixels.reorderBlocksJPx(Pixels,W,H,Format,Mosaic,settings.fast);		var reorderedPixels = Elphel.Pixels.reorderBlocksJPx(Pixels,W,H,Format,Mosaic,settings.fast);
	//reorder first then downscale		//reorder first then downscale
	if (settings.fast){		if (settings.fast){
	W = W/2;		W = W/2;
	H = H/2;		H = H/2;
	}		}
			}else{
			var reorderedPixels = Elphel.Pixels.reorderBlocksJP4_lowres(Pixels,W,H,Format,Mosaic,settings.lowres);
			W = W/2;
			H = H/2;
			}

	Elphel.Pixels.applySaturation(reorderedPixels,W,H,2);		Elphel.Pixels.applySaturation(reorderedPixels,W,H,2);

	@@ -28,15 +33,6 @@ self.onmessage = function(e) {
	pixels: reorderedPixels.buffer		pixels: reorderedPixels.buffer
	},[reorderedPixels.buffer]);		},[reorderedPixels.buffer]);

	}else{		//Elphel.test();

	//just send back
	postMessage({
	width: W,
	height: H,
	pixels: Pixels.buffer
	},[Pixels.buffer]);

	}

	};		};
			No newline at end of file

preview.html

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -67,7 +67,7 @@
	// init hidden canvases		// init hidden canvases
	for(var i=0;i<cams.length;i++){		for(var i=0;i<cams.length;i++){
	append_hidden_div(i);		append_hidden_div(i);
	$("#div_"+i).jp4({ip:cams[i].ip,port:cams[i].port,width:baseWidth,fast:true});		$("#div_"+i).jp4({ip:cams[i].ip,port:cams[i].port,width:baseWidth,fast:true,lowres:4});
	}		}
	}		}

Admin message