* get a right scaled spectrogram

* begin to scan harmonic levels

git-svn-id: http://svn.parisson.org/svn/CNAQ/trunk@181 5fc3e0e6-29bc-4d03-b52b-c088cb822bde

diff --git a/tools/spectro2hd.m b/tools/spectro2hd.m
index 47ec8009a2a9d3910cd0838928b25a04d9cb207a..c3fd69be7e418d793a80775072012583ab9b8857 100644 (file)
--- a/tools/spectro2hd.m
+++ b/tools/spectro2hd.m
@@ -1,26 +1,31 @@
-function [S, f, t] = spectro2hd(s, f_s, f_max, n_harm)
+function [S, f, t, f_1, h] = spectro2hd(s, f_s, f_min, f_max, n_harm)
 
     ncmap = 128; % number of points for colormap
-    step = 5;   % spectral slice period (ms)
+    step = 10;   % spectral slice period (ms)
     % step_length = fix(5*Fs/1000);
-    window = 100;   % filter window (ms)
+    window = 50;   % filter window (ms)
     % window = fix(40*Fs/1000);
     noise_floor = -60; % (dB)
+    n_harm = 4;
     
-    [S, f, t] = spectrogram(s, f_s, window, step, f_max, 'hanning', noise_floor);
+    [S, f, t] = spectrogram(s, f_s, window, step, f_min, f_max, 'hanning', noise_floor);
     S = 20*log10(S);
     colormap(jet(ncmap));
     
-%      f=flipud(f');
-%      img = imagesc(t, f, S);
-%      
-%      
-    
+    size(t)
+    size(f)
+    size(S)
     t_0 = t(1);
     t_n = t(length(t));
     f_0 = f(1);
     f_n = f(length(f));
-        
+      
+    S=flipud(S);
+    f=flipud(f');
+%      
+    figure(1)
+%    img = imagesc(t, f, S);
+
     mesh(t, f, S);
     view([0,90]);
     shading interp;
@@ -29,11 +34,22 @@ function [S, f, t] = spectro2hd(s, f_s, f_max, n_harm)
     set(gca,'YScale','log');
     
     for t_i=1:length(t)
-        f_1=f_0*exp((t_i/t_0)*log(f_n/f_0));
+        f_1(t_i)=f_0*exp((t(t_i)/t_n)*log(f_n/f_0));
         for h_i=1:n_harm
-            f_i = h_i*f_1;
-            h(t_i,h_i)=S()
-%      
+            f_i = h_i*f_1(t_i);
+            [r,c,V] = findnearest(f_i,f,0);
+            h(h_i,t_i)=S(r,t_i);
+        end
+    end
+    
+    figure(2)
+    semilogx(f_1,h(1,:),'k')
+    hold on
+    semilogx(f_1,h(2,:),'r')
+    semilogx(f_1,h(3,:),'b')
+    semilogx(f_1,h(4,:),'g')
+
+    
 %      pcolor(abs(S));
 %      colorbar;
 %      S(1:10,1:10)

diff --git a/tools/spectrogram.m b/tools/spectrogram.m
index 396eecfdc25ec435034bb9f64b93c089e34799ec..fd02d8b7c63edd97e6bb311122b48ec23588c940 100644 (file)
--- a/tools/spectrogram.m
+++ b/tools/spectrogram.m
@@ -87,63 +87,18 @@
 %% TODO: Consider using step vs. [nT, nF] rather than maxF vs [maxF, nF]
 %% TODO: Figure out why exist() is so slow: 50 ms vs 1 ms for lookup.
 
-function [S_r, f_r, t_r] = spectrogram(x, Fs, window, step, maxF, shape, minE)
-    spectrogram_window=30;
-    spectrogram_step=5;
-    spectrogram_maxF=4000;
-    spectrogram_shape='hanning';
-    spectrogram_minE=-40;
-    spectrogram_maxE=0;
-    spectrogram_nF=[];
-
-  if nargin < 2 || nargin > 7
-    %usage("[S, f, t] = spectrogram(x, fs, window, step, maxF, shape, minE)");
-  end
-
-  if nargin<3 || isempty(window)
-    window=spectrogram_window; 
-  end
-  if nargin<4 || isempty(step)
-    step=spectrogram_step; 
-  end
-  if nargin<5 || isempty(maxF) 
-    maxF=spectrogram_maxF; 
-  end
-  if nargin<6 || isempty(shape) 
-    shape=spectrogram_shape;
-  end
-  if nargin<7 || isempty(minE)
-    minE=spectrogram_minE; 
-  end
-  if any(minE>0)
-    %error("spectrogram clipping range must use values less than 0 dB");
-  end
-  if length(minE)>1
-    maxE=minE(2); 
-    minE=minE(1); 
-  else
-    maxE = spectrogram_maxE;
-  end
-  if length(maxF)>1
-    min_nF=maxF(2);
-    maxF=maxF(1);
-  else
-    min_nF=spectrogram_nF;
-  end
-
-  %% make sure x is a column vector
-  if size(x,2) ~= 1 && size(x,1) ~= 1
-    %error("spectrogram data must be a vector");
-  end
-  if size(x,2) ~= 1, x = x'; end
-
-  if (maxF>Fs/2)
-    %% warning("spectrogram: cannot display frequencies greater than Fs/2");
-    maxF = Fs/2;
-  end
-
+function [S, f, t] = spectrogram(x, Fs, window, step, minF, maxF, shape, minE)
+%      spectrogram_window=30;
+%      spectrogram_step=5;
+%      spectrogram_maxF=4000;
+%      spectrogram_shape='hanning';
+%      spectrogram_minE=-40;
+%      spectrogram_nF=1;
+%       spectrogram_maxE=0;
+    
+  maxE=0;
   step_n = fix(step*Fs/1000);    % one spectral slice every step ms
-
+    
   %% generate window from duration and shape function name
   win_n = fix(window*Fs/1000);
   if shape(length(shape)) == ')' 
@@ -152,8 +107,9 @@ function [S_r, f_r, t_r] = spectrogram(x, Fs, window, step, maxF, shape, minE)
     shape = [shape '(' num2str(win_n) ')'];
   end
   win_vec = eval([shape]);
-  if size(win_vec,2) ~= 1, win_vec = win_vec'; end
-  if size(win_vec,2) ~= 1 || size(win_vec,1) ~= win_n,
+  if size(win_vec,2) ~= 1
+    win_vec = win_vec'; end
+  if size(win_vec,2) ~= 1 || size(win_vec,1) ~= win_n
     %error("spectrogram %s did not return a window of length %d", \ shape, win_n);
   end
          
@@ -161,9 +117,9 @@ function [S_r, f_r, t_r] = spectrogram(x, Fs, window, step, maxF, shape, minE)
   fft_n = 2^nextpow2(win_n);    % next highest power of 2
   dF = Fs/fft_n;                % freq. step with current fft_n
   nF = ceil(maxF(1)/dF);        % freq. pts with current fft_n,maxF
-  if ~isempty(min_nF)           % make sure there are at least n freq. pts
-    if min_nF > nF,             % if not enough
-      dF = maxF/min_nF;            % figure out what freq. step we need
+  if ~isempty(minF)           % make sure there are at least n freq. pts
+    if minF > nF             % if not enough
+      dF = maxF/minF;            % figure out what freq. step we need
       fft_n = 2^nextpow2(Fs/dF);   % figure out what fft_n this requires
       dF = Fs/fft_n;               % freq. step with new fft_n
       nF = ceil(maxF/dF);          % freq. pts with new fft_n,maxF
@@ -184,14 +140,11 @@ function [S_r, f_r, t_r] = spectrogram(x, Fs, window, step, maxF, shape, minE)
   S = max(S, 10^(minE/10));  % clip below minF dB.
   S = min(S, 10^(maxE/10));  % clip above maxF dB.
 
-  f = [0:nF-1]*Fs/fft_n;
+  f = [minF:nF]*Fs/fft_n;
   t = offset/Fs;
 %    if nargout==0
 %      imagesc(f,t,20*log10(flipud(S)));
 %    else
-    S_r = S;
-    f_r = f;
-    t_r = t;
 %  end
 
-end
\ No newline at end of file
+end