From d2a47856f63847441b00eeddab2309717f00c56d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=9D=9A=E6=9E=9C?= <753610399@qq.com>
Date: Tue, 14 Jan 2020 18:21:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96FrequencyHistogramView?=
 =?UTF-8?q?=E6=89=A9=E5=B1=95=E5=A2=9E=E5=BC=BA0-10khz=E8=AF=AD=E9=9F=B3?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E7=9A=84=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/npm-home/hash-history.txt            | 8 ++++----
 dist/extensions/frequency.histogram.view.js | 2 +-
 src/extensions/frequency.histogram.view.js  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/assets/npm-home/hash-history.txt b/assets/npm-home/hash-history.txt
index e3aebbf..5279c21 100644
--- a/assets/npm-home/hash-history.txt
+++ b/assets/npm-home/hash-history.txt
@@ -1,4 +1,8 @@
 [
+	{
+		"sha1": "2c9728442cfe5e6ba97e73fff21dee502e24f9e5",
+		"time": "2020-1-14 18:20:47"
+	},
 	{
 		"sha1": "bad5a11c405b2766887f5a68bab7c0ce6ea14013",
 		"time": "2020-1-14 17:40:50"
@@ -14,9 +18,5 @@
 	{
 		"sha1": "49a3e316c57542696a81f0d413ffe9c9ea08053a",
 		"time": "2020-1-10 17:05:41"
-	},
-	{
-		"sha1": "226d35b7411af5c504cea70625413f764eff07d5",
-		"time": "2020-1-10 13:44:43"
 	}
 ]
\ No newline at end of file
diff --git a/dist/extensions/frequency.histogram.view.js b/dist/extensions/frequency.histogram.view.js
index e0306c6..44bee37 100644
--- a/dist/extensions/frequency.histogram.view.js
+++ b/dist/extensions/frequency.histogram.view.js
@@ -3,4 +3,4 @@
 https://github.com/xiangyuecn/Recorder
 src: extensions/frequency.histogram.view.js
 */
-!function(){"use strict";var t=function(t){return new e(t)},e=function(t){var e=this,r={scale:2,fps:20,lineCount:30,lineWidth:6,minHeight:0,position:-1,stripeEnable:!0,stripeHeight:3,stripeMargin:6,fallDuration:1e3,stripeFallDuration:3500,linear:[0,"rgba(0,187,17,1)",.5,"rgba(255,215,0,1)",1,"rgba(255,102,0,1)"],stripeLinear:null,shadowBlur:0,shadowColor:"#bbb",stripeShadowBlur:-1,stripeShadowColor:"",onDraw:function(t,e){}};for(var a in t)r[a]=t[a];e.set=t=r;var i=t.elem;i&&("string"==typeof i?i=document.querySelector(i):i.length&&(i=i[0])),i&&(t.width=i.offsetWidth,t.height=i.offsetHeight);var o=t.scale,l=t.width*o,n=t.height*o,h=e.elem=document.createElement("div"),s=["","transform-origin:0 0;","transform:scale("+1/o+");"];h.innerHTML='<div style="width:'+t.width+"px;height:"+t.height+'px;overflow:hidden"><div style="width:'+l+"px;height:"+n+"px;"+s.join("-webkit-")+s.join("-ms-")+s.join("-moz-")+s.join("")+'"><canvas/></div></div>';var f=e.canvas=h.querySelector("canvas");e.ctx=f.getContext("2d");if(f.width=l,f.height=n,i&&(i.innerHTML="",i.appendChild(h)),!Recorder.LibFFT)throw new Error("需要lib.fft.js支持");e.fft=Recorder.LibFFT(1024),e.lastH=[],e.stripesH=[]};e.prototype=t.prototype={genLinear:function(t,e,r,a){for(var i=t.createLinearGradient(0,r,0,a),o=0;o<e.length;)i.addColorStop(e[o++],e[o++]);return i},input:function(t,e,r){var a=this;a.sampleRate=r,a.pcmData=t,a.pcmPos=0,a.inputTime=Date.now(),a.schedule()},schedule:function(){var t=this,e=t.set,r=Math.floor(1e3/e.fps);t.timer||(t.timer=setInterval(function(){t.schedule()},r));var a=Date.now(),i=t.drawTime||0;if(a-t.inputTime>1.3*e.stripeFallDuration)return clearInterval(t.timer),void(t.timer=0);if(!(a-i<r)){t.drawTime=a;for(var o=t.fft.bufferSize,l=t.pcmData,n=t.pcmPos,h=new Int16Array(o),s=0;s<o&&n<l.length;s++,n++)h[s]=l[n];t.pcmPos=n;var f=t.fft.transform(h);t.draw(f,t.sampleRate)}},draw:function(t,e){var r=this,a=r.set,i=r.ctx,o=a.scale,l=a.width*o,n=a.height*o,h=a.lineCount,s=r.fft.bufferSize,f=a.position,d=Math.abs(a.position),p=1==f?0:n,c=n;d<1&&(p=c/=2,c=Math.floor(c*(1+d)),p=Math.floor(0<f?p*(1-d):p*(1+d)));for(var u=r.lastH,g=r.stripesH,v=Math.ceil(c/(a.fallDuration/(1e3/a.fps))),w=Math.ceil(c/(a.stripeFallDuration/(1e3/a.fps))),m=a.stripeMargin*o,M=1<<(Math.round(Math.log(s)/Math.log(2)+3)<<1),b=Math.log(M)/Math.log(10),L=20*Math.log(32767)/Math.log(10),y=s/2,S=Math.floor(1e4*y/e),C=Math.round(.8*h),H=S/C,D=(y-S)/(h-C),x=0,R=0;R<h;R++){var F=Math.ceil(x);x+=R<C?H:D;for(var T=Math.floor(x),B=0,j=F;j<T;j++)B=Math.max(B,Math.abs(t[j]));var E=M<B?Math.floor(17*(Math.log(B)/Math.log(10)-b)):0,q=c*Math.min(E/L,1);u[R]=(u[R]||0)-v,q<u[R]&&(q=u[R]),q<0&&(q=0),u[R]=q;var z=g[R]||0;if(q&&z<q+m)g[R]=q+m;else{var I=z-w;I<0&&(I=0),g[R]=I}}i.clearRect(0,0,l,n);var P=r.genLinear(i,a.linear,p,p-c),W=a.stripeLinear&&r.genLinear(i,a.stripeLinear,p,p-c)||P,k=r.genLinear(i,a.linear,p,p+c),A=a.stripeLinear&&r.genLinear(i,a.stripeLinear,p,p+c)||k;i.shadowBlur=a.shadowBlur*o,i.shadowColor=a.shadowColor;var G=a.lineWidth*o;l<G*h+(h+1)*o&&(G=Math.max(1*o,Math.floor((l-(h+1)*o)/h)));for(var V=(l-h*G)/(h+1),J=a.minHeight*o,K=(R=0,0);R<h;R++)K+=V,O=Math.floor(K),q=Math.max(u[R],J),0!=p&&(Q=p-q,i.fillStyle=P,i.fillRect(O,Q,G,q)),p!=n&&(i.fillStyle=k,i.fillRect(O,p,G,q)),K+=G;if(a.stripeEnable){var N=a.stripeShadowBlur;i.shadowBlur=(-1==N?a.shadowBlur:N)*o,i.shadowColor=a.stripeShadowColor||a.shadowColor;var O,Q,U=a.stripeHeight*o;for(R=0,K=0;R<h;R++)K+=V,O=Math.floor(K),q=g[R],0!=p&&((Q=p-q-U)<0&&(Q=0),i.fillStyle=W,i.fillRect(O,Q,G,U)),p!=n&&(n<(Q=p+q)+U&&(Q=n-U),i.fillStyle=A,i.fillRect(O,Q,G,U)),K+=G}a.onDraw(t)}},Recorder.FrequencyHistogramView=t}();
\ No newline at end of file
+!function(){"use strict";var t=function(t){return new e(t)},e=function(t){var e=this,r={scale:2,fps:20,lineCount:30,lineWidth:6,minHeight:0,position:-1,stripeEnable:!0,stripeHeight:3,stripeMargin:6,fallDuration:1e3,stripeFallDuration:3500,linear:[0,"rgba(0,187,17,1)",.5,"rgba(255,215,0,1)",1,"rgba(255,102,0,1)"],stripeLinear:null,shadowBlur:0,shadowColor:"#bbb",stripeShadowBlur:-1,stripeShadowColor:"",onDraw:function(t,e){}};for(var i in t)r[i]=t[i];e.set=t=r;var a=t.elem;a&&("string"==typeof a?a=document.querySelector(a):a.length&&(a=a[0])),a&&(t.width=a.offsetWidth,t.height=a.offsetHeight);var o=t.scale,n=t.width*o,l=t.height*o,h=e.elem=document.createElement("div"),s=["","transform-origin:0 0;","transform:scale("+1/o+");"];h.innerHTML='<div style="width:'+t.width+"px;height:"+t.height+'px;overflow:hidden"><div style="width:'+n+"px;height:"+l+"px;"+s.join("-webkit-")+s.join("-ms-")+s.join("-moz-")+s.join("")+'"><canvas/></div></div>';var f=e.canvas=h.querySelector("canvas");e.ctx=f.getContext("2d");if(f.width=n,f.height=l,a&&(a.innerHTML="",a.appendChild(h)),!Recorder.LibFFT)throw new Error("需要lib.fft.js支持");e.fft=Recorder.LibFFT(1024),e.lastH=[],e.stripesH=[]};e.prototype=t.prototype={genLinear:function(t,e,r,i){for(var a=t.createLinearGradient(0,r,0,i),o=0;o<e.length;)a.addColorStop(e[o++],e[o++]);return a},input:function(t,e,r){var i=this;i.sampleRate=r,i.pcmData=t,i.pcmPos=0,i.inputTime=Date.now(),i.schedule()},schedule:function(){var t=this,e=t.set,r=Math.floor(1e3/e.fps);t.timer||(t.timer=setInterval(function(){t.schedule()},r));var i=Date.now(),a=t.drawTime||0;if(i-t.inputTime>1.3*e.stripeFallDuration)return clearInterval(t.timer),void(t.timer=0);if(!(i-a<r)){t.drawTime=i;for(var o=t.fft.bufferSize,n=t.pcmData,l=t.pcmPos,h=new Int16Array(o),s=0;s<o&&l<n.length;s++,l++)h[s]=n[l];t.pcmPos=l;var f=t.fft.transform(h);t.draw(f,t.sampleRate)}},draw:function(t,e){var r=this,i=r.set,a=r.ctx,o=i.scale,n=i.width*o,l=i.height*o,h=i.lineCount,s=r.fft.bufferSize,f=i.position,d=Math.abs(i.position),p=1==f?0:l,c=l;d<1&&(p=c/=2,c=Math.floor(c*(1+d)),p=Math.floor(0<f?p*(1-d):p*(1+d)));for(var u=r.lastH,g=r.stripesH,v=Math.ceil(c/(i.fallDuration/(1e3/i.fps))),w=Math.ceil(c/(i.stripeFallDuration/(1e3/i.fps))),m=i.stripeMargin*o,M=1<<(Math.round(Math.log(s)/Math.log(2)+3)<<1),b=Math.log(M)/Math.log(10),L=20*Math.log(32767)/Math.log(10),y=s/2,S=Math.floor(1e4*y/e),C=Math.round(.8*h),H=S/C,D=(y-S)/(h-C),x=0,R=0;R<h;R++){var F=Math.ceil(x);x+=R<C?H:D;for(var T=Math.min(Math.ceil(x),y),B=0,j=F;j<T;j++)B=Math.max(B,Math.abs(t[j]));var E=M<B?Math.floor(17*(Math.log(B)/Math.log(10)-b)):0,q=c*Math.min(E/L,1);u[R]=(u[R]||0)-v,q<u[R]&&(q=u[R]),q<0&&(q=0),u[R]=q;var z=g[R]||0;if(q&&z<q+m)g[R]=q+m;else{var I=z-w;I<0&&(I=0),g[R]=I}}a.clearRect(0,0,n,l);var P=r.genLinear(a,i.linear,p,p-c),W=i.stripeLinear&&r.genLinear(a,i.stripeLinear,p,p-c)||P,k=r.genLinear(a,i.linear,p,p+c),A=i.stripeLinear&&r.genLinear(a,i.stripeLinear,p,p+c)||k;a.shadowBlur=i.shadowBlur*o,a.shadowColor=i.shadowColor;var G=i.lineWidth*o;n<G*h+(h+1)*o&&(G=Math.max(1*o,Math.floor((n-(h+1)*o)/h)));for(var V=(n-h*G)/(h+1),J=i.minHeight*o,K=(R=0,0);R<h;R++)K+=V,O=Math.floor(K),q=Math.max(u[R],J),0!=p&&(Q=p-q,a.fillStyle=P,a.fillRect(O,Q,G,q)),p!=l&&(a.fillStyle=k,a.fillRect(O,p,G,q)),K+=G;if(i.stripeEnable){var N=i.stripeShadowBlur;a.shadowBlur=(-1==N?i.shadowBlur:N)*o,a.shadowColor=i.stripeShadowColor||i.shadowColor;var O,Q,U=i.stripeHeight*o;for(R=0,K=0;R<h;R++)K+=V,O=Math.floor(K),q=g[R],0!=p&&((Q=p-q-U)<0&&(Q=0),a.fillStyle=W,a.fillRect(O,Q,G,U)),p!=l&&(l<(Q=p+q)+U&&(Q=l-U),a.fillStyle=A,a.fillRect(O,Q,G,U)),K+=G}i.onDraw(t)}},Recorder.FrequencyHistogramView=t}();
\ No newline at end of file
diff --git a/src/extensions/frequency.histogram.view.js b/src/extensions/frequency.histogram.view.js
index ba24588..4332e70 100644
--- a/src/extensions/frequency.histogram.view.js
+++ b/src/extensions/frequency.histogram.view.js
@@ -205,7 +205,7 @@ fn.prototype=FrequencyHistogramView.prototype={
 				//10khz以上
 				fftIdx+=fftSizeStep2;
 			};
-			var end=Math.floor(fftIdx);
+			var end=Math.min(Math.ceil(fftIdx),fftSize);
 			
 			
 			//参考AudioGUI.java .drawHistogram方法