Retrieve out suffix without creating a renderer

This commit is contained in:
Steven Robertson 2017-05-15 11:56:37 -07:00
parent 636efcd059
commit 9bcfc36b7a
2 changed files with 8 additions and 33 deletions

View File

@ -64,14 +64,6 @@ class Output(object):
""" """
raise NotImplementedError() raise NotImplementedError()
@property
def suffix(self):
"""
Return the file suffix that will be used. If more than one suffix will
be used, the value returned is the one considered to be "primary".
"""
raise NotImplementedError()
class PILOutput(Output, ClsMod): class PILOutput(Output, ClsMod):
lib = pixfmtlib lib = pixfmtlib
@ -112,13 +104,6 @@ class PILOutput(Output, ClsMod):
return {'.jpg': out}, {} return {'.jpg': out}, {}
return {'.'+self.type: self._convert_buf(buf)}, [] return {'.'+self.type: self._convert_buf(buf)}, []
@property
def suffix(self):
if self.type == 'jpeg':
if self.alpha: return '_color.jpg'
return '.jpg'
return '.'+self.type
class TiffOutput(Output, ClsMod): class TiffOutput(Output, ClsMod):
lib = pixfmtlib lib = pixfmtlib
@ -149,10 +134,6 @@ class TiffOutput(Output, ClsMod):
out.seek(0) out.seek(0)
return {'.tiff': out}, [] return {'.tiff': out}, []
@property
def suffix(self):
return '.tiff'
class ProResOutput(Output, ClsMod): class ProResOutput(Output, ClsMod):
lib = pixfmtlib lib = pixfmtlib
@ -203,10 +184,6 @@ class ProResOutput(Output, ClsMod):
self._subp.stdin.write(buffer(host_frame)) self._subp.stdin.write(buffer(host_frame))
return {}, [] return {}, []
@property
def suffix(self):
return '.mov'
class X264Output(Output, ClsMod): class X264Output(Output, ClsMod):
lib = pixfmtlib lib = pixfmtlib
@ -314,11 +291,6 @@ class X264Output(Output, ClsMod):
self._write(buffer(self.zeros), self.asubp) self._write(buffer(self.zeros), self.asubp)
return out return out
@property
def suffix(self):
if self.alpha: return '_color.h264'
return '.h264'
class VPxOutput(Output, ClsMod): class VPxOutput(Output, ClsMod):
lib = pixfmtlib lib = pixfmtlib
@ -435,10 +407,13 @@ class VPxOutput(Output, ClsMod):
self._write(buf, self.subp) self._write(buf, self.subp)
return out return out
@property def get_suffix_for_profile(gprof):
def suffix(self): opts = dict(gprof.output._val)
return '.webm' ext = dict(jpeg='.jpg', png='.png', tiff='.tiff', x264='.h264',
prores='.mov', vp8='.webm', vp9='.webm')[opts.get('type', 'jpeg')]
if opts.get('alpha'):
ext = '_color' + ext
return ext
def get_output_for_profile(gprof): def get_output_for_profile(gprof):
opts = dict(gprof.output._val) opts = dict(gprof.output._val)

View File

@ -62,7 +62,7 @@ def main(args, prof):
m = os.path.getmtime(args.flame) m = os.path.getmtime(args.flame)
for name, times in frames: for name, times in frames:
if args.resume: if args.resume:
fp = name + rdr.out.suffix fp = name + output.get_suffix_for_profile(gprof)
if os.path.isfile(fp) and m < os.path.getmtime(fp): if os.path.isfile(fp) and m < os.path.getmtime(fp):
continue continue