1.1 --- a/gmyth-stream/plugins/media/ffmpeg.py	Fri Mar 30 23:09:39 2007 +0100
     1.2 +++ b/gmyth-stream/plugins/media/ffmpeg.py	Fri Mar 30 23:12:52 2007 +0100
     1.3 @@ -30,7 +30,7 @@
     1.4  
     1.5          # good one: /tmp/mpg/cpm.mpg mpeg mpeg1video 400 25 mp2 192 320 240 5000
     1.6          self.path = self.config.get("FFmpeg", "path")
     1.7 -        self.path += " -i %s -bufsize 4096 -f %s -vcodec %s -b %d -r %d -acodec %s -ab %d -s %dx%d -" % (
     1.8 +        self.path += " -i %s -f %s -vcodec %s -b %d -r %d -acodec %s -ab %d -s %dx%d -" % (
     1.9              self.filename, self.mux, self.vcodec, self.vbitrate,\
    1.10              self.fps, self.acodec, self.abitrate, self.width, self.height)
    1.11  
    1.12 @@ -57,7 +57,7 @@
    1.13  
    1.14              conn,addr= self.socket.accept()
    1.15              lib.log("Sending Data to client: %s" % addr[0])
    1.16 -            data = child_stdout.read(4096)
    1.17 +            data = child_stdout.read(1024)
    1.18              conn.settimeout(5)
    1.19              retry = 0
    1.20  

     2.1 --- a/gmyth-stream/plugins/media/mencoder.py	Fri Mar 30 23:09:39 2007 +0100
     2.2 +++ b/gmyth-stream/plugins/media/mencoder.py	Fri Mar 30 23:12:52 2007 +0100
     2.3 @@ -49,7 +49,6 @@
     2.4          self.socket = socket.socket(socket.AF_INET,socket.SOCK_STREAM)
     2.5          self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
     2.6          self.socket.bind( ('', self.port) )
     2.7 -        self.socket.settimeout(10)
     2.8          self.socket.listen(1)
     2.9  
    2.10      def play(self):
    2.11 @@ -66,7 +65,7 @@
    2.12              conn,addr= self.socket.accept()
    2.13              lib.log("Sending Data to client: %s" % addr[0])
    2.14  
    2.15 -            data = fifo.read(4096)
    2.16 +            data = fifo.read(1024)
    2.17              conn.settimeout(5)
    2.18              retry = 0
    2.19  
    2.20 @@ -77,7 +76,7 @@
    2.21                      lib.log("Socket error (maybe timeout ?)")
    2.22                      retry += 1
    2.23  
    2.24 -                data = fifo.read(4096)
    2.25 +                data = fifo.read(1024)
    2.26  
    2.27              if (retry < 5):
    2.28                  lib.log("Finished sending Data to client: %s" % addr[0])