Make video transition durations floats, not intervals

Almost all code was already expecting this.
pull/401/head
Mike Lang 3 months ago
parent 649a0fb2dd
commit 69bfa79e24

@ -180,7 +180,7 @@ columns | type | role
`upload_location` | `TEXT` | edit input | The upload location to upload the cut video to. This is used by the cutter, and must match one of the cutter's configured upload locations. If it does not, the cutter will not claim the event. `upload_location` | `TEXT` | edit input | The upload location to upload the cut video to. This is used by the cutter, and must match one of the cutter's configured upload locations. If it does not, the cutter will not claim the event.
`public` | `BOOLEAN NOT NULL DEFAULT TRUE` | edit input | Whether the uploaded video should be public or not, if the upload location supports that distinction. For example, on youtube, non-public videos are "unlisted". It also controls whether the video will be added to playlists, only public videos are added to playlists. `public` | `BOOLEAN NOT NULL DEFAULT TRUE` | edit input | Whether the uploaded video should be public or not, if the upload location supports that distinction. For example, on youtube, non-public videos are "unlisted". It also controls whether the video will be added to playlists, only public videos are added to playlists.
`video_ranges` | `{start TIMESTAMP, end TIMESTAMP}[]` | edit input | A non-zero number of start and end times, describing the ranges of video to cut. They will be cut back-to-back in the given order, with the transitions between as per `video_transitions`. If already set, used as the default range settings when editing. `video_ranges` | `{start TIMESTAMP, end TIMESTAMP}[]` | edit input | A non-zero number of start and end times, describing the ranges of video to cut. They will be cut back-to-back in the given order, with the transitions between as per `video_transitions`. If already set, used as the default range settings when editing.
`video_transitions` | `{type TEXT, duration INTERVAL}[]` | edit input | Defines how to transition between each range defined in `video_ranges`, and must be exactly the length of `video_ranges` minus 1. Each index in `video_transitions` defines the transition between the range with the same index in `video_ranges` and the next one. Transitions either specify a transition type as understood by `ffmpeg`'s `xfade` filter and a duration (amount of overlap), or can be NULL to indicate a hard cut. `video_transitions` | `{type TEXT, duration DOUBLE PRECISION}[]`| edit input | Defines how to transition between each range defined in `video_ranges`, and must be exactly the length of `video_ranges` minus 1. Each index in `video_transitions` defines the transition between the range with the same index in `video_ranges` and the next one. Transitions either specify a transition type as understood by `ffmpeg`'s `xfade` filter and a duration (amount of overlap), or can be NULL to indicate a hard cut.
`video_title` | `TEXT` | edit input | The title of the video. If already set, used as the default title when editing instead of `description`. `video_title` | `TEXT` | edit input | The title of the video. If already set, used as the default title when editing instead of `description`.
`video_description` | `TEXT` | edit input | The description field of the video. If already set, used as the default description when editing instead of `description`. `video_description` | `TEXT` | edit input | The description field of the video. If already set, used as the default description when editing instead of `description`.
`video_tags` | `TEXT[]` | edit input | Custom tags to annotate the video with. If already set, used as the default when editing instead of `tags`. `video_tags` | `TEXT[]` | edit input | Custom tags to annotate the video with. If already set, used as the default when editing instead of `tags`.

@ -89,15 +89,15 @@ def get_duration(job):
# Each range overlaps the previous by duration, so we add all the ranges # Each range overlaps the previous by duration, so we add all the ranges
# then subtract all the durations. # then subtract all the durations.
without_transitions = sum([ without_transitions = sum([
range.end - range.start (range.end - range.start).total_seconds()
for range in job.video_ranges for range in job.video_ranges
], datetime.timedelta()) ])
overlap = sum([ overlap = sum([
transition.duration transition.duration
for transition in job.video_transitions for transition in job.video_transitions
if transition is not None if transition is not None
], datetime.timedelta()) ])
return (without_transitions - overlap).total_seconds() return without_transitions - overlap
def format_job(job): def format_job(job):

@ -16,7 +16,7 @@ CREATE TYPE video_range as (
CREATE TYPE video_transition as ( CREATE TYPE video_transition as (
type TEXT, type TEXT,
duration INTERVAL duration DOUBLE PRECISON
); );
CREATE TYPE thumbnail_mode as ENUM ( CREATE TYPE thumbnail_mode as ENUM (

Loading…
Cancel
Save