Changes in / [5d16185:18a378e]

Files:

• python/demos/demo_mel-energy.py (deleted)
• python/demos/demo_mfcc.py (deleted)
• python/demos/demo_specdesc.py (modified) (4 diffs)
• python/demos/demo_waveform_plot.py (modified) (4 diffs)
• tests/src/io/test-sink.c (modified) (1 diff)

python/demos/demo_specdesc.py

@@ -22 +22 @@
 pv = pvoc(win_s, hop_s)
 
-methods = ['default', 'energy', 'hfc', 'complex', 'phase', 'specdiff', 'kl',
-        'mkl', 'specflux', 'centroid', 'slope', 'rolloff', 'spread', 'skewness',
-        'kurtosis', 'decrease',]
+methods = ['default', 'energy', 'hfc', 'complex', 'phase', 'specdiff', 'kl', 'mkl',
+    'specflux', 'centroid', 'spread', 'skewness', 'kurtosis', 'slope', 'decrease',
+    'rolloff', ]
 
 all_descs = {}
@@ -40 +40 @@
     samples, read = s()
     fftgrain = pv(samples)
-    #print "%f" % ( total_frames / float(samplerate) ),
+    print "%f" % ( total_frames / float(samplerate) ),
     for method in methods:
         specdesc_val = o[method](fftgrain)[0]
         all_descs[method] = hstack ( [all_descs[method], specdesc_val] )
-        #print "%f" % specdesc_val,
-    #print
+        print "%f" % specdesc_val,
+    print
     total_frames += read
     if read < hop_s: break
@@ -53 +53 @@
     import matplotlib.pyplot as plt
     from demo_waveform_plot import get_waveform_plot
-    from demo_waveform_plot import set_xlabels_sample2time
     fig = plt.figure()
     plt.rc('lines',linewidth='.8')
     wave = plt.axes([0.1, 0.75, 0.8, 0.19])
-    get_waveform_plot(filename, samplerate, block_size = hop_s, ax = wave )
+    get_waveform_plot(filename, samplerate, ax = wave )
     wave.yaxis.set_visible(False)
     wave.xaxis.set_visible(False)
@@ -75 +74 @@
                 horizontalalignment='right', verticalalignment='bottom',
                 )
-    set_xlabels_sample2time(ax, all_desc_times[-1], samplerate)
+    if all_desc_times[-1] / float(samplerate) > 60:
+        plt.xlabel('time (mm:ss)')
+        ax.set_xticklabels([ "%02d:%02d" % (t/float(samplerate)/60, (t/float(samplerate))%60) for t in ax.get_xticks()[:-1]], rotation = 50)
+    else:
+        plt.xlabel('time (ss.mm)')
+        ax.set_xticklabels([ "%02d.%02d" % (t/float(samplerate), 100*((t/float(samplerate))%1) ) for t in ax.get_xticks()[:-1]], rotation = 50)
     #plt.ylabel('spectral descriptor value')
     ax.xaxis.set_visible(True)

python/demos/demo_waveform_plot.py

@@ -5 +5 @@
 from numpy import zeros, hstack
 
-def get_waveform_plot(filename, samplerate = 0, block_size = 4096, ax = None):
+def get_waveform_plot(filename, samplerate = 0, ax = None):
     import matplotlib.pyplot as plt
     if not ax:
         fig = plt.figure()
         ax = fig.add_subplot(111)
-    hop_s = block_size
+    hop_s = 4096 # block size
 
     allsamples_max = zeros(0,)
-    downsample = 2**4  # to plot n samples / hop_s
+    downsample = 2**3  # to plot n samples / hop_s
 
     a = source(filename, samplerate, hop_s)            # source file
@@ -26 +26 @@
         total_frames += read
         if read < hop_s: break
+    print samples.reshape(hop_s/downsample, downsample).shape
+
     allsamples_max = (allsamples_max > 0) * allsamples_max
     allsamples_max_times = [ ( float (t) / downsample ) * hop_s for t in range(len(allsamples_max)) ]
@@ -33 +35 @@
     ax.axis(xmin = allsamples_max_times[0], xmax = allsamples_max_times[-1])
 
-    set_xlabels_sample2time(ax, allsamples_max_times[-1], samplerate)
-    return ax
-
-def set_xlabels_sample2time(ax, latest_sample, samplerate):
-    ax.axis(xmin = 0, xmax = latest_sample)
-    if latest_sample / float(samplerate) > 60:
+    if allsamples_max_times[-1] / float(samplerate) > 60:
         ax.set_xlabel('time (mm:ss)')
         ax.set_xticklabels([ "%02d:%02d" % (t/float(samplerate)/60, (t/float(samplerate))%60) for t in ax.get_xticks()[:-1]], rotation = 50)
@@ -44 +41 @@
         ax.set_xlabel('time (ss.mm)')
         ax.set_xticklabels([ "%02d.%02d" % (t/float(samplerate), 100*((t/float(samplerate))%1) ) for t in ax.get_xticks()[:-1]], rotation = 50)
-
-
 if __name__ == '__main__':
     import matplotlib.pyplot as plt

tests/src/io/test-sink.c

@@ -34 +34 @@
   } while ( read == hop_size );
 
-  PRINT_MSG("wrote %d frames at %dHz from %s written to %s\n",
-      n_frames, samplerate, source_path, sink_path);
+  PRINT_MSG("%d frames read from %s\n written to %s at %dHz\n",
+      n_frames, source_path, sink_path, samplerate);
 
 beach: