From 1a0546ed53bd0c05fbc5d3a65c8f0f229d29e88a Mon Sep 17 00:00:00 2001
From: Dave Griffiths <dave@thentrythis.org>
Date: Sat, 17 Sep 2022 13:28:20 +0100
Subject: [PATCH] removed some old code

---
 cooking/python/features/__init__.py  |   1 -
 cooking/python/features/__init__.pyc | Bin 177 -> 0 bytes
 cooking/python/features/base.py      | 173 ---------------------------
 cooking/python/features/base.pyc     | Bin 9726 -> 0 bytes
 cooking/python/features/sigproc.py   | 113 -----------------
 cooking/python/features/sigproc.pyc  | Bin 5732 -> 0 bytes
 6 files changed, 287 deletions(-)
 delete mode 100644 cooking/python/features/__init__.py
 delete mode 100644 cooking/python/features/__init__.pyc
 delete mode 100644 cooking/python/features/base.py
 delete mode 100644 cooking/python/features/base.pyc
 delete mode 100644 cooking/python/features/sigproc.py
 delete mode 100644 cooking/python/features/sigproc.pyc

diff --git a/cooking/python/features/__init__.py b/cooking/python/features/__init__.py
deleted file mode 100644
index 9b5ed21..0000000
--- a/cooking/python/features/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from .base import *
diff --git a/cooking/python/features/__init__.pyc b/cooking/python/features/__init__.pyc
deleted file mode 100644
index b773fc6712be53d85f7b6301a4e4c0697ad647be..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 177
zcmZSn%**w=<!xv(0~9a;X$K%K<^vKbK*Y$9!@v-d!o(1)!3-42WCRi#Afg0BX!$|d
zEI@WrVsWYlkY+#-#pXb+enx(7s(wmhS*m_=eoCr-abj*kPHIw7VrHIxL1jrsex80>
oYGO%gQEIV%e0*kJW=VX!9#Db<sMjVpKczG$)edA=F%UBV0NZvYGXMYp

diff --git a/cooking/python/features/base.py b/cooking/python/features/base.py
deleted file mode 100644
index c3d7f24..0000000
--- a/cooking/python/features/base.py
+++ /dev/null
@@ -1,173 +0,0 @@
-# calculate filterbank features. Provides e.g. fbank and mfcc features for use in ASR applications
-# Author: James Lyons 2012
-import numpy
-from features import sigproc
-from scipy.fftpack import dct
-
-# make it python3.x compatible
-try:
-  xrange(1)
-except:
-  xrange=range
-
-def mfcc(signal,samplerate=16000,winlen=0.025,winstep=0.01,numcep=13,
-          nfilt=26,nfft=512,lowfreq=0,highfreq=None,preemph=0.97,ceplifter=22,appendEnergy=True):
-    """Compute MFCC features from an audio signal.
-
-    :param signal: the audio signal from which to compute features. Should be an N*1 array
-    :param samplerate: the samplerate of the signal we are working with.
-    :param winlen: the length of the analysis window in seconds. Default is 0.025s (25 milliseconds)    
-    :param winstep: the step between successive windows in seconds. Default is 0.01s (10 milliseconds)    
-    :param numcep: the number of cepstrum to return, default 13    
-    :param nfilt: the number of filters in the filterbank, default 26.
-    :param nfft: the FFT size. Default is 512.
-    :param lowfreq: lowest band edge of mel filters. In Hz, default is 0.
-    :param highfreq: highest band edge of mel filters. In Hz, default is samplerate/2
-    :param preemph: apply preemphasis filter with preemph as coefficient. 0 is no filter. Default is 0.97. 
-    :param ceplifter: apply a lifter to final cepstral coefficients. 0 is no lifter. Default is 22. 
-    :param appendEnergy: if this is true, the zeroth cepstral coefficient is replaced with the log of the total frame energy.
-    :returns: A numpy array of size (NUMFRAMES by numcep) containing features. Each row holds 1 feature vector.
-    """            
-    feat,energy = fbank(signal,samplerate,winlen,winstep,nfilt,nfft,lowfreq,highfreq,preemph)
-    feat = numpy.log(feat)
-    feat = dct(feat, type=2, axis=1, norm='ortho')[:,:numcep]
-    feat = lifter(feat,ceplifter)
-    if appendEnergy: feat[:,0] = numpy.log(energy) # replace first cepstral coefficient with log of frame energy
-    return feat
-
-def fbank(signal,samplerate=16000,winlen=0.025,winstep=0.01,
-          nfilt=26,nfft=512,lowfreq=0,highfreq=None,preemph=0.97):
-    """Compute Mel-filterbank energy features from an audio signal.
-
-    :param signal: the audio signal from which to compute features. Should be an N*1 array
-    :param samplerate: the samplerate of the signal we are working with.
-    :param winlen: the length of the analysis window in seconds. Default is 0.025s (25 milliseconds)    
-    :param winstep: the step between successive windows in seconds. Default is 0.01s (10 milliseconds)    
-    :param nfilt: the number of filters in the filterbank, default 26.
-    :param nfft: the FFT size. Default is 512.
-    :param lowfreq: lowest band edge of mel filters. In Hz, default is 0.
-    :param highfreq: highest band edge of mel filters. In Hz, default is samplerate/2
-    :param preemph: apply preemphasis filter with preemph as coefficient. 0 is no filter. Default is 0.97. 
-    :returns: 2 values. The first is a numpy array of size (NUMFRAMES by nfilt) containing features. Each row holds 1 feature vector. The
-        second return value is the energy in each frame (total energy, unwindowed)
-    """          
-    highfreq= highfreq or samplerate/2
-    signal = sigproc.preemphasis(signal,preemph)
-    frames = sigproc.framesig(signal, winlen*samplerate, winstep*samplerate)
-    pspec = sigproc.powspec(frames,nfft)
-    energy = numpy.sum(pspec,1) # this stores the total energy in each frame
-    energy = numpy.where(energy == 0,numpy.finfo(float).eps,energy) # if energy is zero, we get problems with log
-        
-    fb = get_filterbanks(nfilt,nfft,samplerate,lowfreq,highfreq)
-    feat = numpy.dot(pspec,fb.T) # compute the filterbank energies
-    feat = numpy.where(feat == 0,numpy.finfo(float).eps,feat) # if feat is zero, we get problems with log
-    
-    return feat,energy
-
-def logfbank(signal,samplerate=16000,winlen=0.025,winstep=0.01,
-          nfilt=26,nfft=512,lowfreq=0,highfreq=None,preemph=0.97):
-    """Compute log Mel-filterbank energy features from an audio signal.
-
-    :param signal: the audio signal from which to compute features. Should be an N*1 array
-    :param samplerate: the samplerate of the signal we are working with.
-    :param winlen: the length of the analysis window in seconds. Default is 0.025s (25 milliseconds)    
-    :param winstep: the step between successive windows in seconds. Default is 0.01s (10 milliseconds)    
-    :param nfilt: the number of filters in the filterbank, default 26.
-    :param nfft: the FFT size. Default is 512.
-    :param lowfreq: lowest band edge of mel filters. In Hz, default is 0.
-    :param highfreq: highest band edge of mel filters. In Hz, default is samplerate/2
-    :param preemph: apply preemphasis filter with preemph as coefficient. 0 is no filter. Default is 0.97. 
-    :returns: A numpy array of size (NUMFRAMES by nfilt) containing features. Each row holds 1 feature vector. 
-    """          
-    feat,energy = fbank(signal,samplerate,winlen,winstep,nfilt,nfft,lowfreq,highfreq,preemph)
-    return numpy.log(feat)
-
-def ssc(signal,samplerate=16000,winlen=0.025,winstep=0.01,
-          nfilt=26,nfft=512,lowfreq=0,highfreq=None,preemph=0.97):
-    """Compute Spectral Subband Centroid features from an audio signal.
-
-    :param signal: the audio signal from which to compute features. Should be an N*1 array
-    :param samplerate: the samplerate of the signal we are working with.
-    :param winlen: the length of the analysis window in seconds. Default is 0.025s (25 milliseconds)    
-    :param winstep: the step between successive windows in seconds. Default is 0.01s (10 milliseconds)    
-    :param nfilt: the number of filters in the filterbank, default 26.
-    :param nfft: the FFT size. Default is 512.
-    :param lowfreq: lowest band edge of mel filters. In Hz, default is 0.
-    :param highfreq: highest band edge of mel filters. In Hz, default is samplerate/2
-    :param preemph: apply preemphasis filter with preemph as coefficient. 0 is no filter. Default is 0.97. 
-    :returns: A numpy array of size (NUMFRAMES by nfilt) containing features. Each row holds 1 feature vector. 
-    """          
-    highfreq= highfreq or samplerate/2
-    signal = sigproc.preemphasis(signal,preemph)
-    frames = sigproc.framesig(signal, winlen*samplerate, winstep*samplerate)
-    pspec = sigproc.powspec(frames,nfft)
-    pspec = numpy.where(pspec == 0,numpy.finfo(float).eps,pspec) # if things are all zeros we get problems
-    
-    fb = get_filterbanks(nfilt,nfft,samplerate,lowfreq,highfreq)
-    feat = numpy.dot(pspec,fb.T) # compute the filterbank energies
-    R = numpy.tile(numpy.linspace(1,samplerate/2,numpy.size(pspec,1)),(numpy.size(pspec,0),1))
-    
-    return numpy.dot(pspec*R,fb.T) / feat
-    
-def hz2mel(hz):
-    """Convert a value in Hertz to Mels
-
-    :param hz: a value in Hz. This can also be a numpy array, conversion proceeds element-wise.
-    :returns: a value in Mels. If an array was passed in, an identical sized array is returned.
-    """
-    return 2595 * numpy.log10(1+hz/700.0)
-    
-def mel2hz(mel):
-    """Convert a value in Mels to Hertz
-
-    :param mel: a value in Mels. This can also be a numpy array, conversion proceeds element-wise.
-    :returns: a value in Hertz. If an array was passed in, an identical sized array is returned.
-    """
-    return 700*(10**(mel/2595.0)-1)
-
-def get_filterbanks(nfilt=20,nfft=512,samplerate=16000,lowfreq=0,highfreq=None):
-    """Compute a Mel-filterbank. The filters are stored in the rows, the columns correspond
-    to fft bins. The filters are returned as an array of size nfilt * (nfft/2 + 1)
-
-    :param nfilt: the number of filters in the filterbank, default 20.
-    :param nfft: the FFT size. Default is 512.
-    :param samplerate: the samplerate of the signal we are working with. Affects mel spacing.
-    :param lowfreq: lowest band edge of mel filters, default 0 Hz
-    :param highfreq: highest band edge of mel filters, default samplerate/2
-    :returns: A numpy array of size nfilt * (nfft/2 + 1) containing filterbank. Each row holds 1 filter.
-    """
-    highfreq= highfreq or samplerate/2
-    assert highfreq <= samplerate/2, "highfreq is greater than samplerate/2"
-    
-    # compute points evenly spaced in mels
-    lowmel = hz2mel(lowfreq)
-    highmel = hz2mel(highfreq)
-    melpoints = numpy.linspace(lowmel,highmel,nfilt+2)
-    # our points are in Hz, but we use fft bins, so we have to convert
-    #  from Hz to fft bin number
-    bin = numpy.floor((nfft+1)*mel2hz(melpoints)/samplerate)
-
-    fbank = numpy.zeros([nfilt,nfft/2+1])
-    for j in xrange(0,nfilt):
-        for i in xrange(int(bin[j]),int(bin[j+1])):
-            fbank[j,i] = (i - bin[j])/(bin[j+1]-bin[j])
-        for i in xrange(int(bin[j+1]),int(bin[j+2])):
-            fbank[j,i] = (bin[j+2]-i)/(bin[j+2]-bin[j+1])
-    return fbank                 
-    
-def lifter(cepstra,L=22):
-    """Apply a cepstral lifter the the matrix of cepstra. This has the effect of increasing the
-    magnitude of the high frequency DCT coeffs.
-    
-    :param cepstra: the matrix of mel-cepstra, will be numframes * numcep in size.
-    :param L: the liftering coefficient to use. Default is 22. L <= 0 disables lifter.
-    """
-    if L > 0:
-        nframes,ncoeff = numpy.shape(cepstra)
-        n = numpy.arange(ncoeff)
-        lift = 1+ (L/2)*numpy.sin(numpy.pi*n/L)
-        return lift*cepstra
-    else:
-        # values of L <= 0, do nothing
-        return cepstra
-    
diff --git a/cooking/python/features/base.pyc b/cooking/python/features/base.pyc
deleted file mode 100644
index fe944968fb23840f1ccecaec592f452263175f41..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9726
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

diff --git a/cooking/python/features/sigproc.py b/cooking/python/features/sigproc.py
deleted file mode 100644
index ea16ad0..0000000
--- a/cooking/python/features/sigproc.py
+++ /dev/null
@@ -1,113 +0,0 @@
-# This file includes routines for basic signal processing including framing and computing power spectra.
-# Author: James Lyons 2012
-
-import numpy
-import math
-
-def framesig(sig,frame_len,frame_step,winfunc=lambda x:numpy.ones((1,x))):
-    """Frame a signal into overlapping frames.
-
-    :param sig: the audio signal to frame.
-    :param frame_len: length of each frame measured in samples.
-    :param frame_step: number of samples after the start of the previous frame that the next frame should begin.
-    :param winfunc: the analysis window to apply to each frame. By default no window is applied.    
-    :returns: an array of frames. Size is NUMFRAMES by frame_len.
-    """
-    slen = len(sig)
-    frame_len = int(round(frame_len))
-    frame_step = int(round(frame_step))
-    if slen <= frame_len: 
-        numframes = 1
-    else:
-        numframes = 1 + int(math.ceil((1.0*slen - frame_len)/frame_step))
-        
-    padlen = int((numframes-1)*frame_step + frame_len)
-    
-    zeros = numpy.zeros((padlen - slen,))
-    padsignal = numpy.concatenate((sig,zeros))
-    
-    indices = numpy.tile(numpy.arange(0,frame_len),(numframes,1)) + numpy.tile(numpy.arange(0,numframes*frame_step,frame_step),(frame_len,1)).T
-    indices = numpy.array(indices,dtype=numpy.int32)
-    frames = padsignal[indices]
-    win = numpy.tile(winfunc(frame_len),(numframes,1))
-    return frames*win
-    
-    
-def deframesig(frames,siglen,frame_len,frame_step,winfunc=lambda x:numpy.ones((1,x))):
-    """Does overlap-add procedure to undo the action of framesig. 
-
-    :param frames: the array of frames.
-    :param siglen: the length of the desired signal, use 0 if unknown. Output will be truncated to siglen samples.    
-    :param frame_len: length of each frame measured in samples.
-    :param frame_step: number of samples after the start of the previous frame that the next frame should begin.
-    :param winfunc: the analysis window to apply to each frame. By default no window is applied.    
-    :returns: a 1-D signal.
-    """
-    frame_len = round(frame_len)
-    frame_step = round(frame_step)
-    numframes = numpy.shape(frames)[0]
-    assert numpy.shape(frames)[1] == frame_len, '"frames" matrix is wrong size, 2nd dim is not equal to frame_len'
- 
-    indices = numpy.tile(numpy.arange(0,frame_len),(numframes,1)) + numpy.tile(numpy.arange(0,numframes*frame_step,frame_step),(frame_len,1)).T
-    indices = numpy.array(indices,dtype=numpy.int32)
-    padlen = (numframes-1)*frame_step + frame_len   
-    
-    if siglen <= 0: siglen = padlen
-    
-    rec_signal = numpy.zeros((1,padlen))
-    window_correction = numpy.zeros((1,padlen))
-    win = winfunc(frame_len)
-    
-    for i in range(0,numframes):
-        window_correction[indices[i,:]] = window_correction[indices[i,:]] + win + 1e-15 #add a little bit so it is never zero
-        rec_signal[indices[i,:]] = rec_signal[indices[i,:]] + frames[i,:]
-        
-    rec_signal = rec_signal/window_correction
-    return rec_signal[0:siglen]
-    
-def magspec(frames,NFFT):
-    """Compute the magnitude spectrum of each frame in frames. If frames is an NxD matrix, output will be NxNFFT. 
-
-    :param frames: the array of frames. Each row is a frame.
-    :param NFFT: the FFT length to use. If NFFT > frame_len, the frames are zero-padded. 
-    :returns: If frames is an NxD matrix, output will be NxNFFT. Each row will be the magnitude spectrum of the corresponding frame.
-    """    
-    complex_spec = numpy.fft.rfft(frames,NFFT)
-    return numpy.absolute(complex_spec)
-          
-def powspec(frames,NFFT):
-    """Compute the power spectrum of each frame in frames. If frames is an NxD matrix, output will be NxNFFT. 
-
-    :param frames: the array of frames. Each row is a frame.
-    :param NFFT: the FFT length to use. If NFFT > frame_len, the frames are zero-padded. 
-    :returns: If frames is an NxD matrix, output will be NxNFFT. Each row will be the power spectrum of the corresponding frame.
-    """    
-    return 1.0/NFFT * numpy.square(magspec(frames,NFFT))
-    
-def logpowspec(frames,NFFT,norm=1):
-    """Compute the log power spectrum of each frame in frames. If frames is an NxD matrix, output will be NxNFFT. 
-
-    :param frames: the array of frames. Each row is a frame.
-    :param NFFT: the FFT length to use. If NFFT > frame_len, the frames are zero-padded. 
-    :param norm: If norm=1, the log power spectrum is normalised so that the max value (across all frames) is 1.
-    :returns: If frames is an NxD matrix, output will be NxNFFT. Each row will be the log power spectrum of the corresponding frame.
-    """    
-    ps = powspec(frames,NFFT);
-    ps[ps<=1e-30] = 1e-30
-    lps = 10*numpy.log10(ps)
-    if norm:
-        return lps - numpy.max(lps)
-    else:
-        return lps
-    
-def preemphasis(signal,coeff=0.95):
-    """perform preemphasis on the input signal.
-    
-    :param signal: The signal to filter.
-    :param coeff: The preemphasis coefficient. 0 is no filter, default is 0.95.
-    :returns: the filtered signal.
-    """    
-    return numpy.append(signal[0],signal[1:]-coeff*signal[:-1])
-
-
-
diff --git a/cooking/python/features/sigproc.pyc b/cooking/python/features/sigproc.pyc
deleted file mode 100644
index fbf3dbcbbcb2bc9ecf6065bf86ff5c3b7364a4d0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5732
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
H7p{H|ZkND}