diff options
author | Nathan Lovato <nathan@gdquest.com> | 2020-02-09 04:59:08 +0300 |
---|---|---|
committer | Nathan Lovato <nathan@gdquest.com> | 2020-02-13 18:19:35 +0300 |
commit | cf9fde2568aa81197d0f36019ee429880430906d (patch) | |
tree | b74875c507001fa41ca979bc689cfd4a0dee0f13 /power_sequencer/scripts | |
parent | 47d56e88240dc330e9173c668f1ee9fee39fb36c (diff) |
power_sequencer: update to the latest master
This commit brings Power Sequencer to the current rolling version, that is
commit 9562eb58d164e234f61225250d6ac5ca858ada7b on
https://github.com/GDQuest/blender-power-sequencer/.
I had already made an intermediate commit that added new features and fixed some
bugs. This commit brings bug fixes and many quality of life improvements.
- Human-readable changelog:
https://github.com/GDQuest/blender-power-sequencer/blob/master/CHANGELOG.md
- 1.4.0 release post:
https://github.com/GDQuest/blender-power-sequencer/releases/tag/1.4.0
- All the commits since v1.3.0 (previous update + this one in this repository):
https://github.com/GDQuest/blender-power-sequencer/compare/1.3.0...master
Diffstat (limited to 'power_sequencer/scripts')
8 files changed, 20 insertions, 19 deletions
diff --git a/power_sequencer/scripts/BPSProxy/bpsproxy/commands.py b/power_sequencer/scripts/BPSProxy/bpsproxy/commands.py index a2f4388e..72c81ccf 100644 --- a/power_sequencer/scripts/BPSProxy/bpsproxy/commands.py +++ b/power_sequencer/scripts/BPSProxy/bpsproxy/commands.py @@ -70,7 +70,7 @@ def get_commands_image_1(cfg, clargs, **kwargs): out: iter(tuple(str)) Iterator containing commands. """ - cmd = "ffmpeg -y -v quiet -stats -i '{path_i_1}' {common_all}" + cmd = "ffmpeg -hwaccel auto -y -v quiet -stats -i '{path_i_1}' {common_all}" common = "-f apng -filter:v scale=iw*{size}:ih*{size} '{path_o_1}'" common_all = map(lambda s: kwargs["path_o_1"].format(size=s), clargs.sizes) common_all = map( @@ -101,7 +101,7 @@ def get_commands_video_1(cfg, clargs, **kwargs): out: iter(tuple(str)) Iterator containing commands. """ - cmd = "ffmpeg -y -v quiet -stats -i '{path_i_1}' {common_all}" + cmd = "ffmpeg -hwaccel auto -y -v quiet -stats -i '{path_i_1}' {common_all}" common = ( "-pix_fmt yuv420p" " -g 1" @@ -186,5 +186,5 @@ def get_commands_vi(cfg, clargs, **kwargs): An iterator with the 1st element as a tag (the `what` parameter) and the 2nd element as the iterator of the actual commands. """ - ws = filter(lambda x: x != "all", cfg["extensions"]) + ws = filter(lambda x: x is not "all", cfg["extensions"]) return chain.from_iterable(map(lambda w: get_commands(cfg, clargs, what=w, **kwargs), ws)) diff --git a/power_sequencer/scripts/BPSProxy/bpsproxy/config.py b/power_sequencer/scripts/BPSProxy/bpsproxy/config.py index eada47d5..28554e85 100644 --- a/power_sequencer/scripts/BPSProxy/bpsproxy/config.py +++ b/power_sequencer/scripts/BPSProxy/bpsproxy/config.py @@ -29,7 +29,7 @@ CONFIG = { }, "presets": { "webm": "-c:v libvpx -crf 25 -speed 16 -threads {}".format(str(mp.cpu_count())), - "mp4": "-c:v libx264 -crf 25 -preset faster", + "mp4": "-c:v libx264 -crf 25 -preset faster -tune fastdecode", "nvenc": "-c:v h264_nvenc -qp 25 -preset fast", }, "pre": {"work": "»", "done": "•", "skip": "~"}, diff --git a/power_sequencer/scripts/BPSProxy/bpsproxy/utils.py b/power_sequencer/scripts/BPSProxy/bpsproxy/utils.py index a33c34a9..832a0beb 100644 --- a/power_sequencer/scripts/BPSProxy/bpsproxy/utils.py +++ b/power_sequencer/scripts/BPSProxy/bpsproxy/utils.py @@ -36,14 +36,14 @@ def checktools(tools): msg = ["BPSProxy couldn't find external dependencies:"] msg += [ "[{check}] {tool}: {path}".format( - check="v" if path != "" else "X", tool=tool, path=path or "NOT FOUND" + check="v" if path is not "" else "X", tool=tool, path=path or "NOT FOUND" ) for tool, path in check["tools"] ] msg += [ ( "Check if you have them properly installed and available in the PATH" - " environment variable." + " environemnt variable." ) ] raise ToolError("\n".join(msg)) diff --git a/power_sequencer/scripts/BPSProxy/setup.py b/power_sequencer/scripts/BPSProxy/setup.py index f1dc3f59..996ba3db 100644 --- a/power_sequencer/scripts/BPSProxy/setup.py +++ b/power_sequencer/scripts/BPSProxy/setup.py @@ -14,22 +14,23 @@ # You should have received a copy of the GNU General Public License along with Power Sequencer. If # not, see <https://www.gnu.org/licenses/>. # +from setuptools import setup + def readme(): - with open("README.rst") as f: + with open("README.md") as f: return f.read() if __name__ == "__main__": - from setuptools import setup - setup( name="bpsproxy", - version="0.1.3.post1", + version="0.2.0", description="Blender Power Sequencer proxy generator tool", long_description=readme(), + long_description_content_type="text/markdown", classifiers=[ - "Development Status :: 4 - Beta", + "Development Status :: 5 - Production/Stable", "Environment :: Console", "Intended Audience :: End Users/Desktop", "License :: OSI Approved :: GNU General Public License v3 (GPLv3)", @@ -43,7 +44,7 @@ if __name__ == "__main__": "Topic :: Multimedia :: Video", "Topic :: Utilities", ], - url="https://gitlab.com/razcore/bpsproxy", + url="https://github.com/GDquest/BPSProxy", keywords="blender proxy vse sequence editor productivity", author="Răzvan C. Rădulescu", author_email="razcore.art@gmail.com", diff --git a/power_sequencer/scripts/BPSRender/bpsrender/commands.py b/power_sequencer/scripts/BPSRender/bpsrender/commands.py index dc669806..910ff021 100644 --- a/power_sequencer/scripts/BPSRender/bpsrender/commands.py +++ b/power_sequencer/scripts/BPSRender/bpsrender/commands.py @@ -249,7 +249,7 @@ def get_commands_join(cfg, clargs, **kwargs): "-c:a", "aac", "-b:a", - "192k", + "320k", "-y", kwargs["render_audiovideo_path"], ) diff --git a/power_sequencer/scripts/BPSRender/bpsrender/helpers.py b/power_sequencer/scripts/BPSRender/bpsrender/helpers.py index df74d333..9ebcf2b0 100644 --- a/power_sequencer/scripts/BPSRender/bpsrender/helpers.py +++ b/power_sequencer/scripts/BPSRender/bpsrender/helpers.py @@ -41,14 +41,14 @@ def checktools(tools): msg = ["BPSRender couldn't find external dependencies:"] msg += [ "[{check}] {tool}: {path}".format( - check="v" if path != "" else "X", tool=tool, path=path or "NOT FOUND" + check="v" if path is not "" else "X", tool=tool, path=path or "NOT FOUND" ) for tool, path in check["tools"] ] msg += [ ( "Check if you have them properly installed and available in the PATH" - " environment variable." + " environemnt variable." ), "Exiting...", ] diff --git a/power_sequencer/scripts/BPSRender/bpsrender/setup.py b/power_sequencer/scripts/BPSRender/bpsrender/setup.py index 9aa044c2..aba30d07 100644 --- a/power_sequencer/scripts/BPSRender/bpsrender/setup.py +++ b/power_sequencer/scripts/BPSRender/bpsrender/setup.py @@ -139,7 +139,7 @@ def setup_folders_hdd(cfg, clargs, **kwargs): ------- out: (iter((str, iter(tuple))), dict) 1st element: see commands.py:get_commands_all - 2nd element: the keyword arguments used by calls.py:call + 2nd elment: the keyword arguments used by calls.py:call """ # create folder structure if it doesn't exist already only if # appropriate command line arguments are given @@ -170,7 +170,7 @@ def setup(cfg, clargs): ------- out: (iter((str, iter(tuple))), dict) 1st element: see commands.py:get_commands_all - 2nd element: the keyword arguments used by calls.py:call + 2nd elment: the keyword arguments used by calls.py:call """ setups_f = (setup_bspy, setup_probe, setup_paths, setup_folders_hdd) lg.basicConfig(level=LOGLEV[min(clargs.verbose, len(LOGLEV) - 1)]) diff --git a/power_sequencer/scripts/BPSRender/setup.py b/power_sequencer/scripts/BPSRender/setup.py index 3d829d64..1f17b9ba 100644 --- a/power_sequencer/scripts/BPSRender/setup.py +++ b/power_sequencer/scripts/BPSRender/setup.py @@ -14,6 +14,8 @@ # You should have received a copy of the GNU General Public License along with Power Sequencer. If # not, see <https://www.gnu.org/licenses/>. # +from setuptools import setup + def readme(): with open("README.rst") as f: @@ -21,8 +23,6 @@ def readme(): if __name__ == "__main__": - from setuptools import setup - setup( name="bpsrender", version="0.1.40.post1", |