1.1 --- a/gmyth-stream/server/plugins/transcoders/gmencoder.py	Fri Aug 31 18:31:09 2007 +0100
     1.2 +++ b/gmyth-stream/server/plugins/transcoders/gmencoder.py	Wed Nov 21 13:10:19 2007 +0000
     1.3 @@ -46,14 +46,14 @@
     1.4          self._insert_param("-i", \
     1.5              "%s://%s" % (self.params_first("type", "file"),
     1.6                           self.params_first("uri", "")))
     1.7 -        self._insert_param("--video-encode", self.params_first("ve", "ffenc_mpeg1video"))
     1.8 -        self._insert_param("--video-opts", "bitrate=300000,pass=512,quantizer=0.01,quant-type=1")
     1.9 -        #self._insert_param("--video-fps", self.params_first("fps", ""))
    1.10 +        self._insert_param("--video-encode", self.params_first("ve", "theoraenc"))
    1.11 +        self._insert_param("--video-opts", self.params_first ("video-opts", "quality=30,sharpness=2"))
    1.12          self._insert_param("--video-fps", self.params_first("fps", "10"))
    1.13 -        self._insert_param("--video-width", self.params_first("width", "320"))
    1.14 -        self._insert_param("--video-height", self.params_first("height", "240"))
    1.15 -        self._insert_param("--audio-rate", "32000")
    1.16 -        self._insert_param("--audio-encode", self.params_first("ae", ""))
    1.17 +        self._insert_param("--video-width", self.params_first("width", "240"))
    1.18 +        self._insert_param("--video-height", self.params_first("height", "144"))
    1.19 +        self._insert_param("--audio-encode", self.params_first("ae", "vorbisenc"))
    1.20 +        self._insert_param("--audio-opts", self.params_first ("audio-opts", "managed=true"))
    1.21 +        self._insert_param("--mux-element", self.params_first("mux", "oggmux"))
    1.22      # _parse_params
    1.23  
    1.24      def start(self, outfd):
    1.25 @@ -72,8 +72,8 @@
    1.26              self.proc = subprocess.Popen(self.opts, stdin=subprocess.PIPE,
    1.27                                           stdout=subprocess.PIPE)
    1.28  
    1.29 -	    if outfile:
    1.30 -           	outfd.write("OK   ")
    1.31 +            if outfile:
    1.32 +               outfd.write("OK   ")
    1.33  
    1.34          except Exception, e:
    1.35              self.log.error(self.tid, "Error: executing GMencoder: %s" % e)