From 4ccc0a38947fee370c7040acb583335fc2b3d228 Mon Sep 17 00:00:00 2001 From: WyattBlue Date: Wed, 5 Mar 2025 23:05:44 -0500 Subject: [PATCH] Release 26.3.3 --- CHANGELOG.md | 11 +++++++++- auto_editor/__init__.py | 2 +- auto_editor/__main__.py | 12 +++++++++++ auto_editor/cmds/test.py | 46 ++++++++++++++++++++++------------------ auto_editor/edit.py | 18 ++++++++++------ 5 files changed, 59 insertions(+), 30 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 10c5348ea..8e6cc43a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,17 @@ +# 26.3.3 + +## Fixes + - Suppress warnings if movflags do not apply. + - Add `--faststart` and `--no-faststart` to enable/disable ffmpeg's `-movflags +faststart`. + +**Full Changelog**: https://github.com/WyattBlue/auto-editor/compare/26.3.2...26.3.3 + + # 26.3.2 ## Fixes - Fix regression in 26.3.0 that caused audio-only exports to have no data. - - Support outputting fragmented mp4/mov files with `--fragmented` + - Support outputting fragmented mp4/mov files with `--fragmented`. **Full Changelog**: https://github.com/WyattBlue/auto-editor/compare/26.3.1...26.3.2 diff --git a/auto_editor/__init__.py b/auto_editor/__init__.py index aaa8a73a7..d03f40a3e 100644 --- a/auto_editor/__init__.py +++ b/auto_editor/__init__.py @@ -1 +1 @@ -__version__ = "26.3.2" +__version__ = "26.3.3" diff --git a/auto_editor/__main__.py b/auto_editor/__main__.py index 7619a3be5..d2ad0cd31 100755 --- a/auto_editor/__main__.py +++ b/auto_editor/__main__.py @@ -61,6 +61,8 @@ class Args: # Container Settings sn: bool = False dn: bool = False + faststart: bool = False + no_faststart: bool = False fragmented: bool = False no_fragmented: bool = False @@ -274,6 +276,16 @@ def speed_range(val: str) -> tuple[float, str, str]: flag=True, help="Disable the inclusion of data streams in the output file", ) + parser.add_argument( + "--faststart", + flag=True, + help="Enable movflags +faststart, recommended for web (default)", + ) + parser.add_argument( + "--no-faststart", + flag=True, + help="Disable movflags +faststart, will be faster for large files", + ) parser.add_argument( "--fragmented", flag=True, diff --git a/auto_editor/cmds/test.py b/auto_editor/cmds/test.py index 32917372c..db0e849a7 100644 --- a/auto_editor/cmds/test.py +++ b/auto_editor/cmds/test.py @@ -153,36 +153,42 @@ def subdump(self): def desc(self): self.raw(["desc", "example.mp4"]) - def test_example(self) -> None: - out = self.main(["example.mp4"], [], output="example_ALTERED.mp4") + def test_movflags(self) -> None: + file = "resources/testsrc.mp4" + out = self.main([file], ["--faststart"]) + ".mp4" + fast = calculate_sha256(out) with av.open(out) as container: - video = container.streams[0] - audio = container.streams[1] + assert isinstance(container.streams[0], av.VideoStream) + assert isinstance(container.streams[1], av.AudioStream) - assert isinstance(video, av.VideoStream) - assert isinstance(audio, av.AudioStream) - assert video.base_rate == 30 - assert video.average_rate is not None - assert video.average_rate == 30, video.average_rate - assert (video.width, video.height) == (1280, 720) - assert video.codec.name == "h264" - assert video.language == "eng" - assert audio.codec.name == "aac" - assert audio.sample_rate == 48000 - assert audio.language == "eng" + out = self.main([file], ["--no-faststart"]) + ".mp4" + nofast = calculate_sha256(out) + with av.open(out) as container: + assert isinstance(container.streams[0], av.VideoStream) + assert isinstance(container.streams[1], av.AudioStream) + + out = self.main([file], ["--fragmented"]) + ".mp4" + frag = calculate_sha256(out) + with av.open(out) as container: + assert isinstance(container.streams[0], av.VideoStream) + assert isinstance(container.streams[1], av.AudioStream) - out1_sha = calculate_sha256(out) + assert fast != nofast, "+faststart is not being applied" + assert frag not in (fast, nofast), "fragmented output should diff." - out = self.main(["example.mp4"], ["--fragmented"], output="example_ALTERED.mp4") + def test_example(self) -> None: + out = self.main(["example.mp4"], [], output="example_ALTERED.mp4") with av.open(out) as container: + assert container.duration is not None + assert container.duration > 17300000 and container.duration < 2 << 24 + video = container.streams[0] audio = container.streams[1] - assert isinstance(video, av.VideoStream) assert isinstance(audio, av.AudioStream) assert video.base_rate == 30 assert video.average_rate is not None - assert round(video.average_rate) == 30, video.average_rate + assert video.average_rate == 30, video.average_rate assert (video.width, video.height) == (1280, 720) assert video.codec.name == "h264" assert video.language == "eng" @@ -190,8 +196,6 @@ def test_example(self) -> None: assert audio.sample_rate == 48000 assert audio.language == "eng" - assert calculate_sha256(out) != out1_sha, "Fragmented output should be diff." - # PR #260 def test_high_speed(self): self.check(["example.mp4", "--video-speed", "99998"], "empty") diff --git a/auto_editor/edit.py b/auto_editor/edit.py index 503f3a59f..92d39238d 100644 --- a/auto_editor/edit.py +++ b/auto_editor/edit.py @@ -299,14 +299,18 @@ def edit_media(paths: list[str], args: Args, log: Log) -> None: def make_media(tl: v3, output_path: str) -> None: assert src is not None + options = {} + mov_flags = [] if args.fragmented and not args.no_fragmented: - log.debug("Enabling fragmented mp4/mov") - options = { - "movflags": "+default_base_moof+faststart+frag_keyframe+separate_moof", - "frag_duration": "0.2", - } - else: - options = {"movflags": "faststart"} + mov_flags.extend(["default_base_moof", "frag_keyframe", "separate_moof"]) + options["frag_duration"] = "0.2" + if args.faststart: + log.warning("Fragmented is enabled, will not apply faststart.") + elif not args.no_faststart: + mov_flags.append("faststart") + if mov_flags: + options["movflags"] = "+".join(mov_flags) + output = av.open(output_path, "w", container_options=options) if ctr.default_sub != "none" and not args.sn: