adding preemphasizing and resolving packaging issues

astorfi · astorfi · commit f1d8d2c9dcfc · 2017-11-25T21:55:31.000-05:00
diff --git a/docs/source/content/features.rst~ b/docs/source/content/features.rst~
diff --git a/docs/source/content/preprocessing.rst b/docs/source/content/preprocessing.rst
@@ -8,6 +8,10 @@ Preprocessing
 .. automodule:: speechpy.processing
 .. currentmodule:: speechpy.processing
 
+:hidden:`Pre-emphasizing`
+~~~~~~~~~~~~~~~~~~~~~~~~~
+.. autofunction:: speechpy.processing.preemphase
+
 :hidden:`Stacking`
 ~~~~~~~~~~~~~~~~~~
 .. autofunction:: speechpy.processing.stack_frames
diff --git a/docs/source/content/preprocessing.rst~ b/docs/source/content/preprocessing.rst~
@@ -10,11 +10,20 @@ Preprocessing
 
 :hidden:`Stacking`
 ~~~~~~~~~~~~~~~~~~
-
 .. autofunction:: speechpy.processing.stack_frames
 
+:hidden:`Pre-emphasizing`
+~~~~~~~~~~~~~~~~~~~~~~~~~
+.. autofunction:: speechpy.processing.preemphase
+
+:hidden:`FFT Spectrum`
+~~~~~~~~~~~~~~~~~~~~~~
 .. autofunction:: speechpy.processing.fft_spectrum
 
+:hidden:`Power Spectrum`
+~~~~~~~~~~~~~~~~~~~~~~~~
 .. autofunction:: speechpy.processing.power_spectrum
 
+:hidden:`Power Spectrum Log`
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 .. autofunction:: speechpy.processing.log_power_spectrum
diff --git a/setup.py b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 setup(name='speechpy',
-      version='1.3.5',
+      version='1.4.1',
       description='The python package for extracting speech features.',
       author='Amirsina Torfi',
       author_email='amirsina.torfi@gmail.com',
diff --git a/setup.py~ b/setup.py~
@@ -0,0 +1,15 @@
+from setuptools import setup, find_packages
+
+setup(name='speechpy',
+      version='1.3.6',
+      description='The python package for extracting speech features.',
+      author='Amirsina Torfi',
+      author_email='amirsina.torfi@gmail.com',
+      url='https://github.com/astorfi/speech_feature_extraction',
+      packages=find_packages(exclude=('tests', 'docs')),
+      include_package_data=True,
+      install_requires=[
+          'scipy',
+          'numpy',
+      ],
+      zip_safe=False)
diff --git a/speechpy/processing.py b/speechpy/processing.py
@@ -8,6 +8,16 @@ def round_half_up(number):
     return int(decimal.Decimal(number).quantize(decimal.Decimal('1'), rounding=decimal.ROUND_HALF_UP))
 
 
+def preemphase(signal, cof=0.98):
+    """preemphasising on the signal.
+    :param signal: The input signal.
+    :param coeff: The preemphasising coefficient. 0 equals to no filtering.
+    :returns: the pre-emphasized signal.
+    """
+
+    rolled_signal = np.roll(signal, shift=1)
+    return signal - cof * rolled_signal
+
 def stack_frames(sig, sampling_frequency, frame_length=0.020, frame_stride=0.020, Filter=lambda x: np.ones((x,)),
                  zero_padding=True):
     """Frame a signal into overlapping frames.
@@ -221,14 +231,16 @@ def cmvnw(vec, win_size=301, variance_normalization=False):
 
     return output
 
+
+
 # def resample_Fn(wave, fs, f_new=16000):
 #     """This function resample the data to arbitrary frequency
 #     :param fs: Frequency of the sound file.
 #     :param wave: The sound file itself.
 #     :returns:
 #            f_new: The new frequency.
 #            signal_new: The new signal samples at new frequency.
-
+#
 #     dependency: from scikits.samplerate import resample
 #     """
 #
diff --git a/tests/test_local.py b/tests/test_local.py
@@ -12,6 +12,9 @@
 fs, signal = wav.read(file_name)
 signal = signal[:,0]
 
+# Example of pre-emphasizing.
+signal_preemphasized = speechpy.processing.preemphase(signal, cof=0.98)
+
 # Example of staching frames
 frames = speechpy.processing.stack_frames(signal, sampling_frequency=fs, frame_length=0.020, frame_stride=0.01, Filter=lambda x: np.ones((x,)),
          zero_padding=True)
diff --git a/tests/test_package.py b/tests/test_package.py
@@ -7,6 +7,9 @@
 fs, signal = wav.read(file_name)
 signal = signal[:,0]
 
+# Example of pre-emphasizing.
+signal_preemphasized = speechpy.processing.preemphase(signal, cof=0.98)
+
 # Example of staching frames
 frames = speechpy.processing.stack_frames(signal, sampling_frequency=fs, frame_length=0.020, frame_stride=0.01, Filter=lambda x: np.ones((x,)),
          zero_padding=True)
@@ -32,3 +35,4 @@
 
 
 
+
