bugfix and cleanup encoders

diff --git a/timeside/encoder/flac.py b/timeside/encoder/flac.py
index 0f177a12855b3e17dc4e4d7c243856253548a645..60f60423008599f18cbf8ac36dfe0825da267e24 100644 (file)
--- a/timeside/encoder/flac.py
+++ b/timeside/encoder/flac.py
@@ -42,6 +42,8 @@ class FlacEncoder(Processor):
         
         if not self.filename and not self.streaming:
             raise Exception('Must give an output')
+        
+        self.eod = False
 
     @interfacedoc
     def setup(self, channels=None, samplerate=None, nframes=None):
@@ -110,15 +112,12 @@ class FlacEncoder(Processor):
 
     @interfacedoc
     def process(self, frames, eod=False):
+        self.eod = eod
         buf = self.numpy_array_to_gst_buffer(frames)
         self.src.emit('push-buffer', buf)
         if self.streaming:
-            pull = self.sink.emit('pull-buffer')
-#        if eod: self.src.emit('end-of-stream')
-        if not self.streaming:
-            return frames, eod
-        else:
-            return pull, eod
+            self.chunk = pull = self.sink.emit('pull-buffer')
+        return frames, eod
 
     def numpy_array_to_gst_buffer(self, frames):
         """ gstreamer buffer to numpy array conversion """

diff --git a/timeside/encoder/mp3.py b/timeside/encoder/mp3.py
index 8e46e8b69dfa8931f5f21c6790e19d6007c1f1e7..d089f39d2db55013939ae92e742a19bd2584fc7b 100644 (file)
--- a/timeside/encoder/mp3.py
+++ b/timeside/encoder/mp3.py
@@ -119,7 +119,6 @@ class Mp3Encoder(Processor):
     @interfacedoc
     def process(self, frames, eod=False):
         self.eod = eod
-        print frames.shape
         
         buf = self.numpy_array_to_gst_buffer(frames)
         self.src.emit('push-buffer', buf)

diff --git a/timeside/encoder/ogg.py b/timeside/encoder/ogg.py
index f857d0389defbcb6bbe1ca99f166b636d51b4544..3e18ec626db7c90e407ec2d6507212e1ae5c4678 100644 (file)
--- a/timeside/encoder/ogg.py
+++ b/timeside/encoder/ogg.py
@@ -117,10 +117,9 @@ class VorbisEncoder(Processor):
     @interfacedoc
     def process(self, frames, eod=False):
         self.eod = eod
-        print frames.shape
+        
         buf = self.numpy_array_to_gst_buffer(frames)
         self.src.emit('push-buffer', buf)
-#        if eod: self.src.emit('end-of-stream')
         if self.streaming:
             self.chunk = self.app.emit('pull-buffer')
         return frames, eod

diff --git a/timeside/encoder/wav.py b/timeside/encoder/wav.py
index f40c203dfbd3d5fcfab45c1d5799babb0d5fc7c6..a763ba13bac1e371daff254e867a6a20690c43a2 100644 (file)
--- a/timeside/encoder/wav.py
+++ b/timeside/encoder/wav.py
@@ -114,16 +114,13 @@ class WavEncoder(Processor):
 
     @interfacedoc
     def process(self, frames, eod=False):
+        self.eod = eod
         buf = self.numpy_array_to_gst_buffer(frames)
         self.src.emit('push-buffer', buf)
         if self.streaming:
-            pull = self.app.emit('pull-buffer')
-        if eod: self.src.emit('end-of-stream')
-        if not self.streaming:
-            return frames, eod
-        else:
-            return pull, eod
-
+            self.chunk = self.app.emit('pull-buffer')
+        return frames, eod
+        
     def numpy_array_to_gst_buffer(self, frames):
         """ gstreamer buffer to numpy array conversion """
         buf = gst.Buffer(getbuffer(frames))