[TIDY] Apply autopep8 formatting
This commit is contained in:
Jannik Beyerstedt
parent
909bf79673
commit
b0e83b1134
12 changed files with 405 additions and 329 deletions
103
renderlib.py
103
renderlib.py
|
|
@ -17,7 +17,8 @@ fps = 25
|
|||
debug = True
|
||||
args = None
|
||||
|
||||
scheduleTree=None
|
||||
scheduleTree = None
|
||||
|
||||
|
||||
def loadProject(projectname):
|
||||
sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), projectname))
|
||||
|
|
@ -45,7 +46,7 @@ class Rendertask:
|
|||
self.parameters = parameters
|
||||
self.outfile = outfile
|
||||
self.workdir = workdir
|
||||
self.sequence = sequence # deprecated, use animated()
|
||||
self.sequence = sequence # deprecated, use animated()
|
||||
|
||||
def animated(self, sequence):
|
||||
atask = self
|
||||
|
|
@ -70,6 +71,8 @@ class Rendertask:
|
|||
return None
|
||||
|
||||
# try to create all folders needed and skip, they already exist
|
||||
|
||||
|
||||
def ensurePathExists(path):
|
||||
try:
|
||||
os.makedirs(path)
|
||||
|
|
@ -83,6 +86,7 @@ def ensureFilesRemoved(pattern):
|
|||
for f in glob.glob(pattern):
|
||||
os.unlink(f)
|
||||
|
||||
|
||||
def renderFrame(infile, task, outfile):
|
||||
width = 1920
|
||||
height = 1080
|
||||
|
|
@ -93,61 +97,67 @@ def renderFrame(infile, task, outfile):
|
|||
converted.save(filename=outfile)
|
||||
elif args.resvg:
|
||||
# invoke inkscape to convert the generated svg-file into a png inside the .frames-directory
|
||||
cmd = 'resvg --background white --width={1} --height={2} "{4}" "{3}" 2>&1 >/dev/null'.format(task.workdir, width, height, outfile, infile)
|
||||
errorReturn = subprocess.check_output(cmd, shell=True, universal_newlines=True, stderr=subprocess.STDOUT, cwd=task.workdir)
|
||||
cmd = 'resvg --background white --width={1} --height={2} "{4}" "{3}" 2>&1 >/dev/null'.format(
|
||||
task.workdir, width, height, outfile, infile)
|
||||
errorReturn = subprocess.check_output(
|
||||
cmd, shell=True, universal_newlines=True, stderr=subprocess.STDOUT, cwd=task.workdir)
|
||||
if errorReturn != '':
|
||||
print("resvg exited with error\n" + errorReturn)
|
||||
# sys.exit(42)
|
||||
|
||||
else:
|
||||
# invoke inkscape to convert the generated svg-file into a png inside the .frames-directory
|
||||
cmd = 'inkscape --export-background=white --export-background-opacity=0 --export-width={1} --export-height={2} --export-filename="{3}" "{4}" --pipe 2>&1 >/dev/null'.format(task.workdir, width, height, os.path.abspath(outfile), os.path.abspath(infile))
|
||||
errorReturn = subprocess.check_output(cmd, shell=True, universal_newlines=True, stderr=subprocess.STDOUT, cwd=task.workdir)
|
||||
cmd = 'inkscape --export-background=white --export-background-opacity=0 --export-width={1} --export-height={2} --export-filename="{3}" "{4}" --pipe 2>&1 >/dev/null'.format(
|
||||
task.workdir, width, height, os.path.abspath(outfile), os.path.abspath(infile))
|
||||
errorReturn = subprocess.check_output(
|
||||
cmd, shell=True, universal_newlines=True, stderr=subprocess.STDOUT, cwd=task.workdir)
|
||||
if errorReturn != '':
|
||||
print("inkscape exited with error\n" + errorReturn)
|
||||
# sys.exit(42)
|
||||
|
||||
|
||||
def cachedRenderFrame(frame, frameNr, task, cache):
|
||||
skip_rendering = False
|
||||
# skip first n frames, to speed up rerendering during debugging
|
||||
if 'only_rerender_frames_after' in task.parameters:
|
||||
skip_rendering = (frameNr <= task.parameters['only_rerender_frames_after'])
|
||||
skip_rendering = False
|
||||
# skip first n frames, to speed up rerendering during debugging
|
||||
if 'only_rerender_frames_after' in task.parameters:
|
||||
skip_rendering = (frameNr <= task.parameters['only_rerender_frames_after'])
|
||||
|
||||
if args.skip_frames:
|
||||
skip_rendering = (frameNr <= args.skip_frames)
|
||||
if args.skip_frames:
|
||||
skip_rendering = (frameNr <= args.skip_frames)
|
||||
|
||||
if args.only_frame:
|
||||
skip_rendering = (frameNr != args.only_frame)
|
||||
if args.only_frame:
|
||||
skip_rendering = (frameNr != args.only_frame)
|
||||
|
||||
# print a line for each and every frame generated
|
||||
if debug and not skip_rendering:
|
||||
print("frameNr {0:3d} => {1}".format(frameNr, frame))
|
||||
# print a line for each and every frame generated
|
||||
if debug and not skip_rendering:
|
||||
print("frameNr {0:3d} => {1}".format(frameNr, frame))
|
||||
|
||||
frame = tuple(frame)
|
||||
if frame in cache:
|
||||
if debug:
|
||||
print("cache hit, reusing frame {0}".format(cache[frame]))
|
||||
frame = tuple(frame)
|
||||
if frame in cache:
|
||||
if debug:
|
||||
print("cache hit, reusing frame {0}".format(cache[frame]))
|
||||
|
||||
framedir = task.workdir + "/.frames/"
|
||||
shutil.copyfile("{0}/{1:04d}.png".format(framedir, cache[frame]), "{0}/{1:04d}.png".format(framedir, frameNr))
|
||||
framedir = task.workdir + "/.frames/"
|
||||
shutil.copyfile("{0}/{1:04d}.png".format(framedir,
|
||||
cache[frame]), "{0}/{1:04d}.png".format(framedir, frameNr))
|
||||
|
||||
return
|
||||
elif not skip_rendering:
|
||||
cache[frame] = frameNr
|
||||
return
|
||||
elif not skip_rendering:
|
||||
cache[frame] = frameNr
|
||||
|
||||
svgfile = '{0}/.frames/{1:04d}.svg'.format(task.workdir, frameNr)
|
||||
svgfile = '{0}/.frames/{1:04d}.svg'.format(task.workdir, frameNr)
|
||||
|
||||
if not skip_rendering:
|
||||
with SVGTemplate(task, svgfile) as svg:
|
||||
svg.replacetext()
|
||||
svg.transform(frame)
|
||||
svg.write()
|
||||
if not skip_rendering:
|
||||
with SVGTemplate(task, svgfile) as svg:
|
||||
svg.replacetext()
|
||||
svg.transform(frame)
|
||||
svg.write()
|
||||
|
||||
outfile = '{0}/.frames/{1:04d}.png'.format(task.workdir, frameNr)
|
||||
renderFrame(svgfile, task, outfile)
|
||||
outfile = '{0}/.frames/{1:04d}.png'.format(task.workdir, frameNr)
|
||||
renderFrame(svgfile, task, outfile)
|
||||
|
||||
# increment frame-number
|
||||
frameNr += 1
|
||||
# increment frame-number
|
||||
frameNr += 1
|
||||
|
||||
|
||||
def rendertask_image(task):
|
||||
|
|
@ -157,6 +167,7 @@ def rendertask_image(task):
|
|||
svg.write()
|
||||
renderFrame(svgfile, task, task.outfile)
|
||||
|
||||
|
||||
def rendertask_video(task):
|
||||
# iterate through the animation sequence frame by frame
|
||||
# frame is a ... tbd
|
||||
|
|
@ -171,7 +182,8 @@ def rendertask_video(task):
|
|||
ensureFilesRemoved(os.path.join(task.workdir, task.outfile))
|
||||
|
||||
if task.outfile.endswith('.png'):
|
||||
cmd = 'cd {0} && cp ".frames/{1:04d}.png" "{2}"'.format(task.workdir, args.only_frame, task.outfile)
|
||||
cmd = 'cd {0} && cp ".frames/{1:04d}.png" "{2}"'.format(
|
||||
task.workdir, args.only_frame, task.outfile)
|
||||
|
||||
# invoke avconv aka ffmpeg and renerate a lossles-dv from the frames
|
||||
# if we're not in debug-mode, suppress all output
|
||||
|
|
@ -192,11 +204,14 @@ def rendertask_video(task):
|
|||
cmd += '-shortest -f mpegts "{0}"'.format(task.outfile)
|
||||
elif task.outfile.endswith('.mov'):
|
||||
cmd = 'cd {0} && '.format(task.workdir)
|
||||
cmd += 'ffmpeg -f lavfi -i anullsrc=channel_layout=stereo:sample_rate=44100 -f image2 -i .frames/%04d.png -r 25 -shortest -c:v qtrle -f mov "{0}"'.format(task.outfile)
|
||||
cmd += 'ffmpeg -f lavfi -i anullsrc=channel_layout=stereo:sample_rate=44100 -f image2 -i .frames/%04d.png -r 25 -shortest -c:v qtrle -f mov "{0}"'.format(
|
||||
task.outfile)
|
||||
elif task.outfile.endswith('.mkv'):
|
||||
cmd = 'cd {0} && ffmpeg -ar 48000 -ac 2 -f s16le -i /dev/zero -f image2 -i .frames/%04d.png -aspect 16:9 -c copy -shortest "{1}"'.format(task.workdir, task.outfile)
|
||||
cmd = 'cd {0} && ffmpeg -ar 48000 -ac 2 -f s16le -i /dev/zero -f image2 -i .frames/%04d.png -aspect 16:9 -c copy -shortest "{1}"'.format(
|
||||
task.workdir, task.outfile)
|
||||
else:
|
||||
cmd = 'cd {0} && ffmpeg -ar 48000 -ac 2 -f s16le -i /dev/zero -f image2 -i .frames/%04d.png -target pal-dv -aspect 16:9 -shortest "{1}"'.format(task.workdir, task.outfile)
|
||||
cmd = 'cd {0} && ffmpeg -ar 48000 -ac 2 -f s16le -i /dev/zero -f image2 -i .frames/%04d.png -target pal-dv -aspect 16:9 -shortest "{1}"'.format(
|
||||
task.workdir, task.outfile)
|
||||
|
||||
if debug:
|
||||
print(cmd)
|
||||
|
|
@ -208,15 +223,16 @@ def rendertask_video(task):
|
|||
if r != 0:
|
||||
sys.exit()
|
||||
|
||||
|
||||
def rendertask(task):
|
||||
global args
|
||||
# in debug mode we have no thread-worker which prints its progress
|
||||
if debug:
|
||||
print("generating {0} from {1}".format(task.outfile, task.infile))
|
||||
|
||||
## Hacky workaround: Fix this properly without breaking the
|
||||
## support for partially rendered intros
|
||||
if True: #args.skip_frames and 'only_rerender_frames_after' not in task.parameters:
|
||||
# Hacky workaround: Fix this properly without breaking the
|
||||
# support for partially rendered intros
|
||||
if True: # args.skip_frames and 'only_rerender_frames_after' not in task.parameters:
|
||||
if os.path.isdir(os.path.join(task.workdir, '.frames')):
|
||||
print("Removing", os.path.join(task.workdir, '.frames'))
|
||||
shutil.rmtree(os.path.join(task.workdir, '.frames'))
|
||||
|
|
@ -241,4 +257,3 @@ try:
|
|||
except ImportError:
|
||||
def colored(str, col):
|
||||
return str
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue