Changeset 6ff6d18

Timestamp:

Mar 22, 2013, 5:56:15 PM (12 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

5d16185

Parents:

e5afd47

Message:

python/demos/demo_{mel-energy,mfcc,specdesc}.py: use set_xlabels_sample2time

Location:

python/demos

Files:

• demo_mel-energy.py (modified) (2 diffs)
• demo_mfcc.py (modified) (2 diffs)
• demo_specdesc.py (modified) (4 diffs)

python/demos/demo_mel-energy.py

@@ -4 +4 @@
 from aubio import fvec, source, pvoc, filterbank
 from numpy import vstack, zeros
-from demo_waveform_plot import set_xlabels_sample2time
 
 win_s = 512                 # fft size
@@ -46 +45 @@
     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')

python/demos/demo_mfcc.py

@@ -4 +4 @@
 from aubio import source, pvoc, mfcc
 from numpy import array, vstack, zeros
-from demo_waveform_plot import set_xlabels_sample2time
 
 win_s = 512                 # fft size
@@ -42 +41 @@
 from numpy import arange
 from demo_waveform_plot import get_waveform_plot
+from demo_waveform_plot import set_xlabels_sample2time
 import matplotlib.pyplot as plt
 

python/demos/demo_specdesc.py

@@ -22 +22 @@
 pv = pvoc(win_s, hop_s)
 
-methods = ['default', 'energy', 'hfc', 'complex', 'phase', 'specdiff', 'kl', 'mkl',
-    'specflux', 'centroid', 'spread', 'skewness', 'kurtosis', 'slope', 'decrease',
-    'rolloff', ]
+methods = ['default', 'energy', 'hfc', 'complex', 'phase', 'specdiff', 'kl',
+        'mkl', 'specflux', 'centroid', 'slope', 'rolloff', 'spread', 'skewness',
+        'kurtosis', 'decrease',]
 
 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, ax = wave )
+    get_waveform_plot(filename, samplerate, block_size = hop_s, ax = wave )
     wave.yaxis.set_visible(False)
     wave.xaxis.set_visible(False)
@@ -74 +75 @@
                 horizontalalignment='right', verticalalignment='bottom',
                 )
-    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)
+    set_xlabels_sample2time(ax, all_desc_times[-1], samplerate)
     #plt.ylabel('spectral descriptor value')
     ax.xaxis.set_visible(True)