comparison vamp/process.py @ 112:9343eee50605

Update to Python 3. Currently crashes during tests (and also, two tests are now failing, even with Py2).

 '''A high-level interface to the vampyhost extension module, for quickly and easily running Vamp audio analysis plugins on audio files and buffers.'''
 
 import vampyhost
-import frames
-import load
+import vamp.frames
+import vamp.load
 
 def process_with_initialised_plugin(ff, sample_rate, step_size, plugin, outputs):
 
     out_indices = dict([(id, plugin.get_output(id)["output_index"])
                         for id in outputs])

         if ix in results:
             for r in results[ix]:
                 yield { o: r }
 
 
-def process(data, sample_rate, key, output = "", parameters = {}):
+def process_audio(data, sample_rate, key, output = "", parameters = {}):
     """Process audio data with a Vamp plugin, and make the results from a
     single plugin output available as a generator.
 
     The provided data should be a 1- or 2-dimensional list or NumPy
     array of floats. If it is 2-dimensional, the first dimension is

 
     If you would prefer to obtain all features in a single output
     structure, consider using vamp.collect() instead.
     """
 
-    plugin, step_size, block_size = load.load_and_configure(data, sample_rate, key, parameters)
+    plugin, step_size, block_size = vamp.load.load_and_configure(data, sample_rate, key, parameters)
 
     if output == "":
         output = plugin.get_output(0)["identifier"]
 
-    ff = frames.frames_from_array(data, step_size, block_size)
+    ff = vamp.frames.frames_from_array(data, step_size, block_size)
 
     for r in process_with_initialised_plugin(ff, sample_rate, step_size, plugin, [output]):
         yield r[output]
     
     plugin.unload()

     represented as a dictionary containing, optionally, timestamp and
     duration (RealTime objects), label (string), and a 1-dimensional
     array of float values.
     """
 
-    plugin, step_size, block_size = load.load_and_configure(data, sample_rate, key, parameters)
-
-    ff = frames.frames_from_array(data, step_size, block_size)
+    plugin, step_size, block_size = vamp.load.load_and_configure(data, sample_rate, key, parameters)
+
+    ff = vamp.frames.frames_from_array(data, step_size, block_size)
 
     for r in process_with_initialised_plugin(ff, sample_rate, step_size, plugin, outputs):
         yield r
 
     plugin.unload()