[svn r744] one more test for tv trunk
authormorphbr
Fri Jun 01 15:24:34 2007 +0100 (2007-06-01)
branchtrunk
changeset 738293e6c9546e5
parent 737 fe8df7fd5229
child 739 517706c7003e
[svn r744] one more test for tv
gmyth-stream/server/0.3/plugins/transcoders/mencoder.py
     1.1 --- a/gmyth-stream/server/0.3/plugins/transcoders/mencoder.py	Fri Jun 01 15:01:43 2007 +0100
     1.2 +++ b/gmyth-stream/server/0.3/plugins/transcoders/mencoder.py	Fri Jun 01 15:24:34 2007 +0100
     1.3 @@ -162,14 +162,14 @@
     1.4              outfmt = self.params_first("outfmt", "yuy2")
     1.5              vdev = self.params_first("vdev", "/dev/video0")
     1.6              adev = self.params_first("adev", "/dev/dsp")
     1.7 -            print "teste1"
     1.8 -            self.args["input"] = "tv:// -v -tv driver=%s:norm=%s:channel=%s:" \
     1.9 -                                 "chanlist=%s:width=%s:height=%s:outfmt=%s:" \
    1.10 -                                 "device=%s:adevice=%s" % (driver, norm,
    1.11 -                                                           channel, chanlist,
    1.12 -                                                           self.args["width"],
    1.13 -                                                           self.args["height"],
    1.14 -                                                           outfmt, vdev, adev)
    1.15 +            tv = "tv:// -v -tv driver=%s:norm=%s:channel=%s:" \
    1.16 +                 "chanlist=%s:width=%s:height=%s:outfmt=%s:" \
    1.17 +                 "device=%s:adevice=%s" % (driver, norm,
    1.18 +                                           channel, chanlist,
    1.19 +                                           self.args["width"],
    1.20 +                                           self.args["height"],
    1.21 +                                           outfmt, vdev, adev)
    1.22 +            self.args["input"] = tv.split(" ")
    1.23      # _setup_filename()
    1.24  
    1.25  
    1.26 @@ -266,11 +266,10 @@
    1.27          return True
    1.28      # _start()
    1.29  
    1.30 -    def _run_mencoder(self, input=None, output=None, error=os.devnull):
    1.31 +    def _run_mencoder(self, input=None, output=None):
    1.32          try:
    1.33              self.proc = subprocess.Popen(self.mencoder_opts, stdin=input,
    1.34 -                                         stdout=output, stderr=error,
    1.35 -                                         close_fds=True)
    1.36 +                                         stdout=output, close_fds=True)
    1.37          except Exception, e:
    1.38              self.log.error(self.tid, "Error: Mencoder: %s" % e)
    1.39              return False