diff --git a/bin/ffx.py b/bin/ffx.py index 408c0c4..25c2c21 100755 --- a/bin/ffx.py +++ b/bin/ffx.py @@ -41,7 +41,7 @@ FILE_EXTENSIONS = ['mkv', 'mp4', 'avi', 'flv', 'webm'] COMMAND_TOKENS = ['ffmpeg', '-y'] -NULL_TOKENS = ['-f', 'null', '/dev/null'] +NULL_TOKENS = ['-f', 'null', '/dev/null'] # -f null /dev/null STREAM_TYPE_VIDEO = 'video' STREAM_TYPE_AUDIO = 'audio' @@ -80,6 +80,8 @@ def generateAV1Tokens(q, p): '-svtav1-params', f"crf={q}:preset={p}:tune=0:enable-overlays=1:scd=1:scm=0", '-pix_fmt', 'yuv420p10le'] + +# -c:v:0 libvpx-vp9 -row-mt 1 -crf 32 -pass 1 -speed 4 -frame-parallel 0 -g 9999 -aq-mode 0 def generateVP9Pass1Tokens(q): return ['-c:v:0', 'libvpx-vp9', @@ -91,6 +93,7 @@ def generateVP9Pass1Tokens(q): '-g', '9999', '-aq-mode', '0'] +# -c:v:0 libvpx-vp9 -row-mt 1 -crf 32 -pass 2 -frame-parallel 0 -g 9999 -aq-mode 0 -auto-alt-ref 1 -lag-in-frames 25 def generateVP9Pass2Tokens(q): return ['-c:v:0', 'libvpx-vp9', diff --git a/bin/ffx/model/pattern.py b/bin/ffx/model/pattern.py index 88087d9..ddf32d4 100644 --- a/bin/ffx/model/pattern.py +++ b/bin/ffx/model/pattern.py @@ -32,25 +32,20 @@ class Pattern(Base): media_tags = relationship('MediaTag', back_populates='pattern', cascade="all, delete") - # def getDescriptor(self): -# - # descriptor = {} - # descriptor['id'] = int(self.id) - # descriptor['pattern'] = str(self.pattern) - # descriptor['show_id'] = int(self.show_id) -# - # descriptor['tags'] = {} - # for t in self.media_tags: - # descriptor['tags'][str(t.key)] = str(t.value) -# - # return descriptor + def getId(self): + return int(self.id) + + def getShowId(self): + return int(self.show_id) + def getId(self): + return int(self.id) - def getShow(self): - pass + def getPattern(self): + return str(self.pattern) - def getTracks(self): - pass + def getTags(self): + return {str(t.key):str(t.value) for t in self.media_tags} def getMediaDescriptor(self): @@ -61,16 +56,3 @@ class Pattern(Base): md.appendTrack(t.getDescriptor()) return md - - - def getId(self): - return int(self.id) - - def getPattern(self): - return str(self.pattern) - - def getShowId(self): - return int(self.show_id) - - def getTags(self): - return {str(k.value):str(v.value) for (k,v) in self.media_tags}