From 9cbf1f6c1beeca1f98c7dad982a89d3044a982c0 Mon Sep 17 00:00:00 2001 From: Thomas Fillon Date: Thu, 7 Nov 2013 15:28:48 +0100 Subject: [PATCH] Fix some doctest issues, minor codes changes for processors not already propagated in encoder, and minor id changes in basic graphers --- doc/source/tutorial/AnalyzerResult.rst | 2 +- doc/source/tutorial/quick_start.rst | 6 +++--- timeside/analyzer/core.py | 2 +- timeside/core.py | 3 +-- timeside/encoder/core.py | 3 +++ timeside/grapher/spectrogram_log.py | 2 +- timeside/grapher/waveform_simple.py | 2 +- 7 files changed, 11 insertions(+), 9 deletions(-) diff --git a/doc/source/tutorial/AnalyzerResult.rst b/doc/source/tutorial/AnalyzerResult.rst index 26b3646..f936fca 100644 --- a/doc/source/tutorial/AnalyzerResult.rst +++ b/doc/source/tutorial/AnalyzerResult.rst @@ -40,7 +40,7 @@ This default result has all the metadata and dataObject attribute >>> for key,value in res.items(): ... print '%s : %s' % (key, value) ... - id_metadata : {'description': '', 'author': '', 'version': '', 'date': '', 'id': '', 'unit': '', 'name': ''} + id_metadata : {'description': '', 'author': '', 'uuid': '', 'version': '', 'date': '', 'id': '', 'unit': '', 'name': ''} data_object : {'value': array([], dtype=float64)} audio_metadata : {'is_segment': None, 'uri': '', 'channels': None, 'start': 0, 'channelsManagement': '', 'duration': None} frame_metadata : {'blocksize': None, 'samplerate': None, 'stepsize': None} diff --git a/doc/source/tutorial/quick_start.rst b/doc/source/tutorial/quick_start.rst index 4016184..105358b 100644 --- a/doc/source/tutorial/quick_start.rst +++ b/doc/source/tutorial/quick_start.rst @@ -44,9 +44,9 @@ Spectrogram. All graphers return an image: >>> import timeside >>> decoder = timeside.decoder.FileDecoder('sweep.wav') # doctest: +SKIP - >>> spectrogram = timeside.grapher.Spectrogram(width=400, height=150) + >>> spectrogram = timeside.grapher.SpectrogramLinear(width=400, height=150) >>> (decoder | spectrogram).run() - >>> spectrogram.render().save('graph.png') + >>> spectrogram.render('graph.png') It is possible to create longer pipes, as well as subpipes, here for both analysis and encoding: @@ -59,4 +59,4 @@ analysis and encoding: >>> encoders = timeside.encoder.Mp3Encoder('sweep.mp3') | timeside.encoder.FlacEncoder('sweep.flac') >>> (decoder | levels | encoders).run() >>> print levels.results - {'level.max': GlobalValueResult(id_metadata=IdMetadata(id='level.max', name='Level Analyzer Max', unit='dBFS', description='', date='...', version='0.5.1', author='TimeSide'), data_object=DataObject(value=array([-6.021])), audio_metadata=AudioMetadata(uri='file://...sweep.wav', start=0.0, duration=8.0, is_segment=False, channels=None, channelsManagement=''), parameters={}), 'level.rms': GlobalValueResult(id_metadata=IdMetadata(id='level.rms', name='Level Analyzer RMS', unit='dBFS', description='', date='...', version='0.5.1', author='TimeSide'), data_object=DataObject(value=array([-9.856])), audio_metadata=AudioMetadata(uri='file://...sweep.wav', start=0.0, duration=8.0, is_segment=False, channels=None, channelsManagement=''), parameters={})} + {'level.max': GlobalValueResult(id_metadata=IdMetadata(id='level.max', name='Level Analyzer Max', unit='dBFS', description='', date='...', version='0.5.1', author='TimeSide', uuid='...'), data_object=DataObject(value=array([-6.021])), audio_metadata=AudioMetadata(uri='file://...sweep.wav', start=0.0, duration=8.0, is_segment=False, channels=None, channelsManagement=''), parameters={}), 'level.rms': GlobalValueResult(id_metadata=IdMetadata(id='level.rms', name='Level Analyzer RMS', unit='dBFS', description='', date='...', version='0.5.1', author='TimeSide', uuid='...'), data_object=DataObject(value=array([-9.856])), audio_metadata=AudioMetadata(uri='file://...sweep.wav', start=0.0, duration=8.0, is_segment=False, channels=None, channelsManagement=''), parameters={})} diff --git a/timeside/analyzer/core.py b/timeside/analyzer/core.py index 63fba4b..2e84567 100644 --- a/timeside/analyzer/core.py +++ b/timeside/analyzer/core.py @@ -740,7 +740,7 @@ class AnalyzerResultContainer(dict): >>> a = timeside.analyzer.Analyzer() >>> (d|a).run() #doctest: +ELLIPSIS >>> a.new_result() #doctest: +ELLIPSIS - FrameValueResult(id_metadata=IdMetadata(id='analyzer', name='Generic analyzer', unit='', description='', date='...', version='0.5.1', author='TimeSide'), data_object=DataObject(value=array([], dtype=float64)), audio_metadata=AudioMetadata(uri='file:///...', start=1.0, duration=7.0, is_segment=True, channels=None, channelsManagement=''), frame_metadata=FrameMetadata(samplerate=44100, blocksize=8192, stepsize=8192), parameters={}) + FrameValueResult(id_metadata=IdMetadata(id='analyzer', name='Generic analyzer', unit='', description='', date='...', version='0.5.1', author='TimeSide', uuid='...'), data_object=DataObject(value=array([], dtype=float64)), audio_metadata=AudioMetadata(uri='file:///...', start=1.0, duration=7.0, is_segment=True, channels=None, channelsManagement=''), frame_metadata=FrameMetadata(samplerate=44100, blocksize=8192, stepsize=8192), parameters={}) >>> resContainer = timeside.analyzer.core.AnalyzerResultContainer() ''' diff --git a/timeside/core.py b/timeside/core.py index 426ffae..3ea05ce 100644 --- a/timeside/core.py +++ b/timeside/core.py @@ -307,5 +307,4 @@ class ProcessPipe(object): item.post_process() for item in items: - item.release() - + item.release() \ No newline at end of file diff --git a/timeside/encoder/core.py b/timeside/encoder/core.py index 4a7383b..4577cf1 100644 --- a/timeside/encoder/core.py +++ b/timeside/encoder/core.py @@ -28,6 +28,9 @@ from gst import _gst as gst class GstEncoder(Processor): def __init__(self, output, streaming = False, overwrite = False): + + super(GstEncoder, self).__init__() + if isinstance(output, basestring): import os.path if os.path.isdir(output): diff --git a/timeside/grapher/spectrogram_log.py b/timeside/grapher/spectrogram_log.py index ba5c9db..dce40cc 100644 --- a/timeside/grapher/spectrogram_log.py +++ b/timeside/grapher/spectrogram_log.py @@ -41,7 +41,7 @@ class SpectrogramLog(Grapher): @staticmethod @interfacedoc def id(): - return "spectrogram" + return "spectrogram_log" @staticmethod @interfacedoc diff --git a/timeside/grapher/waveform_simple.py b/timeside/grapher/waveform_simple.py index 321408d..49badfa 100644 --- a/timeside/grapher/waveform_simple.py +++ b/timeside/grapher/waveform_simple.py @@ -39,7 +39,7 @@ class Waveform(Grapher): @staticmethod @interfacedoc def id(): - return "waveform" + return "waveform_simple" @staticmethod @interfacedoc -- 2.39.5