Repository navigation
feat(map-inset): opt-in --map-inset route flags on the drive command - #115
Merged
Merged
Conversation
Move the keycut pin from v0.1.0 to v0.2.0. The day-master cut (extract_and_concat_segments) now calls keycut's extract_and_concat_ranges_with_receipt and checks the receipt it returns with our own load_receipt. If the receipt does not validate, the function logs an error naming the failing field and returns None, because an output-to-source time map built from a bad receipt would be wrong. The signature and return type are unchanged. keycut 0.1.2 changed the re-encode fallback to seek on the input side (-ss S -i master -ss 0 -t D). montage_builder.reencode_range_argv mirrors that argv, so it follows; the lead-seam cut gives the same frames without decoding from the start of the file. keycut 0.2.0 also probes piece and output durations for the receipt, so the clean-run command count in the resume test goes from 4 to 7. Add a real-ffmpeg test that runs keycut on a synthetic master, loads the live receipt, maps output time back to source time, and compares the receipt's keys with the frozen assembly_receipt_v1.json fixture.
# Conflicts: # gomoveshift/pipeline/montage_builder.py # pyproject.toml
What: when a drive config selects map_inset="route", each regular long-form video gets a route-only map inset rendered from an offline bundle and composited inside the existing OST encode. The LF cut now keeps its keycut receipt beside the concat (opt-in sidecar), the inset timeline is built from it shifted by the real montage lead, the inset options and route are folded into the LF OST fingerprint, and the inset receipt is recorded in drive state. Refusals happen before the day master is encoded and list every problem in one error: no bundle or a bundle that fails verification, either trim not above zero, an unparsable privacy zone, no usable day GPS trace, or photo/clip inserts on the day. A per-LF renderer refusal stops the run, naming the LF. Why: an LF must never silently ship without the map it was asked for, nor with a partial overlay. With the option off the path is unchanged. The CLI flags and config fields follow in the next commit; until then this is unreachable from a real config.
What: adds --map-inset off|route, --map-inset-bundle, --map-inset-trim-start-m, --map-inset-trim-end-m and a repeatable --map-inset-privacy-zone, with matching config.drive fields and validation (bad mode, negative trim, unparsable zone). All five are registered sentinel flags, so a resume that omits them keeps the first run's choice and a differing value wins. Documents the flags, refusal rules and privacy handling and adds a changelog entry. Why: wires the per-LF inset rendering from the previous commit to the CLI. Default is off, which leaves the pipeline unchanged.
Stills are spliced into the burned LF, so the map stays on its own frames and the inserted stills carry none.
# Conflicts: # gomoveshift/pipeline/day_pipeline.py
Contributor
Author
|
Unclassified (unclassified) and ready to merge -- all checks green. Offending paths:
Human merge (all 7 ready hard-denied PRs in Back-Road-Creative/framegrade): This PR alone: |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
Opt-in
--map-inset off|routeon the drive command, plus--map-inset-bundle,--map-inset-trim-start-m,--map-inset-trim-end-mand a repeatable--map-inset-privacy-zone LAT,LON,R. They thread intoconfig.drive.map_inset*, persist in drive state across a resume, and register in the flag registry. Docs indocs/pipeline/01-per-lf-location-labels.md.Why
#109 landed the render and composite path but left it unreachable. This exposes it as a per-drive choice: a video only gets a map overlay when the operator asks for one. Off (the default) produces the same output as before.
routerefuses before any encode and lists every missing input (bundle, trim, privacy zone, GPS); it never falls back silently. Photo inserts never block an inset, because stills are spliced in after the burn.Tests
tests/test_regular_lf_map_inset_flags.py(new): config defaults and validation, CLI parsing with sentinel defaults, every option registered with a config mirror, a resume without the flags keeps the saved options, a differing flag beats the saved choice. (The refusal listing is covered by feat(map-inset): render and composite a route inset per regular LF #109'stests/test_regular_lf_map_inset.py.)tests/test_flag_registry.py: new flags registered.tools/check_public_tree.pyexits 0.