[svn r834] - Bug fix trunk
authormorphbr
Tue Aug 28 08:30:10 2007 +0100 (2007-08-28)
branchtrunk
changeset 8282061bf4c30c7
parent 827 30368d31696e
child 829 0a4e6b811acc
[svn r834] - Bug fix
gmyth-stream/server/0.3/lib/request_handler.py
gmyth-stream/server/0.3/plugins/transcoders/mencoder.py
     1.1 --- a/gmyth-stream/server/0.3/lib/request_handler.py	Tue Aug 28 08:16:13 2007 +0100
     1.2 +++ b/gmyth-stream/server/0.3/lib/request_handler.py	Tue Aug 28 08:30:10 2007 +0100
     1.3 @@ -360,13 +360,14 @@
     1.4  	    self.send_error(404, "File not found")
     1.5  	    return
     1.6  
     1.7 -        filename = args[0];	
     1.8 +        filename = args[0];
     1.9          if not filename:
    1.10              self.send_error(404, "File not found")
    1.11              return
    1.12  
    1.13          #Only stream files on .transcode dir
    1.14 -        filename = os.path.join (utils.config.get_transcoded_location(), os.path.basename(filename))
    1.15 +        filename = os.path.join (utils.config.get_transcoded_location(),
    1.16 +                                 os.path.basename(filename))
    1.17          self.log.error("Stream file: %s" % filename)
    1.18          if not os.path.exists (filename):
    1.19              self.send_error(404, "File not found")
    1.20 @@ -377,7 +378,6 @@
    1.21          self.send_header("Content-Type", mimetypes.guess_type(filename)[0])
    1.22          self.send_header("Cache-Control","no-cache")
    1.23          self.send_header("Content-Length", size)
    1.24 -        #self.send_header("Connection", "close")
    1.25          self.end_headers()
    1.26  
    1.27          media = open(filename)
    1.28 @@ -429,7 +429,6 @@
    1.29          if (obj.name == "gmencoder"):
    1.30              self.send_header("Transfer-Encoding", "chunked")
    1.31  
    1.32 -        #self.send_header("Connection", "close")
    1.33          self.end_headers()
    1.34  
    1.35          if body:
     2.1 --- a/gmyth-stream/server/0.3/plugins/transcoders/mencoder.py	Tue Aug 28 08:16:13 2007 +0100
     2.2 +++ b/gmyth-stream/server/0.3/plugins/transcoders/mencoder.py	Tue Aug 28 08:30:10 2007 +0100
     2.3 @@ -91,7 +91,7 @@
     2.4          if self.args["mux"] == "mpeg":
     2.5              video += " -mpegopts format=%s" % self.args["format"]
     2.6  
     2.7 -        video += " -vf kerndint,scale=%s:%s" % (self.args["width"], self.args["height"])
     2.8 +        video += " -vf scale=%s:%s" % (self.args["width"], self.args["height"])
     2.9          return video
    2.10      # _setup_video()
    2.11