Diff of /trunk/tubetutor/ffmpeg.py [r10] .. [r11]  Maximize  Restore

Switch to unified view

a/trunk/tubetutor/ffmpeg.py b/trunk/tubetutor/ffmpeg.py
...
...
18
font=os.path.join("media", "Roboto-Regular.ttf")
18
font=os.path.join("media", "Roboto-Regular.ttf")
19
proc_ffmpeg=None
19
proc_ffmpeg=None
20
20
21
if platform.system() == "Linux":
21
if platform.system() == "Linux":
22
    grabber="-video_size 1920x1080 -f x11grab -framerate 20 -i :0.0 -f pulse -i 1"
22
    grabber="-video_size 1920x1080 -f x11grab -framerate 20 -i :0.0 -f pulse -i 1"
23
    audio=True
23
else:
24
else:
24
    grabber="-f gdigrab -framerate 20 -i desktop"
25
    grabber="-f gdigrab -framerate 20 -i desktop"
26
    audio=False
25
27
26
#
28
#
27
# The following helper functions will retrieve the pathnames for the ffmpeg tools
29
# The following helper functions will retrieve the pathnames for the ffmpeg tools
28
#
30
#
29
def get_cmd_ffmpeg():
31
def get_cmd_ffmpeg():
...
...
198
        params += self.qfilter
200
        params += self.qfilter
199
        self.lastfilename = filename
201
        self.lastfilename = filename
200
        start(filename, params)
202
        start(filename, params)
201
        wait()
203
        wait()
202
204
203
    def mux(self, filename, audiofile):
205
    def mux(self, filename, audiofile, replace=False):
204
        print("*** mux(%s, %s)" % (filename, audiofile))
206
        print("*** mux(%s, %s)" % (filename, audiofile))
205
        duration = video_duration(self.lastfilename)
207
        duration = video_duration(self.lastfilename)
206
        params = " -i %s -i %s -y" % (self.lastfilename, audiofile)
208
        params = " -i %s -i %s -y" % (self.lastfilename, audiofile)
207
        params += " -t %d" % (int(duration)+1)
209
        params += " -t %d" % (int(duration)+1)
208
        params += " -filter_complex \"[0:a][1:a]amerge,afade=out:st=%f:d=3\"" % (duration-3.0)
210
        if replace:
211
            params += " -af \"afade=out:st=%f:d=3\"" % (duration-3.0)
212
        else:
213
            params += " -filter_complex \"[0:a][1:a]amerge,afade=out:st=%f:d=3\"" % (duration-3.0)
209
        params += " -map 0:v:0 -map 1:a:0"
214
        params += " -map 0:v:0 -map 1:a:0"
210
        params += self.qfilter
215
        params += self.qfilter
211
        self.lastfilename = filename
216
        self.lastfilename = filename
212
        start(filename, params)
217
        start(filename, params)
213
        wait()
218
        wait()