* docs(playback): plan protocol v3 server implementation * docs(playback): incorporate protocol v3 review * feat(playback): implement protocol v3 server * fix(playback): persist empty route diagnostics * feat(playback): harden protocol v3 HDR routing * feat(playback): complete protocol v3 client contract * fix(playback): harden protocol v3 recovery * fix(playback): restore dovi_rpu strip filter for DV remuxes The v3 work renamed the Dolby Vision strip recipe to a dovi_split=mode=bl bitstream filter that does not exist in stock FFmpeg or jellyfin-ffmpeg; the probe failed closed on every deployment, disabling the new validated DV7-to-HDR10 route and regressing the previously working dovi_rpu=strip=1 remux path from main. Restore dovi_rpu across the probe, remux and HLS copy arguments, and the recipe-card constant. Also from review: validate the remux DV mode for every profile (garbage modes on non-P7 sources silently no-opped), reject preserve mode for P7 outright (a base-layer-only remux cannot preserve dual-layer DV), tag dvhe sample entries only for the explicit v3 preserve recipe so legacy web/jellycompat remuxes keep their pre-v3 hev1 labeling, and honor the token-frozen DV mode in the proxy remux path instead of legacy-auto. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(playback): correct v3 planner policy and contract validation Review fixes to the v3 planner and wire contracts: - Bar Profile 7 sources from the non-strip progressive remux route: a base-layer-only remux can never deliver native dual-layer DV, so the planner no longer emits plans claiming validated Dolby Vision while the executed remux drops the enhancement layer. - Accept the device-quirks feature flag from either capability location, matching every other dual-location feature check. - Treat legacy hdr_unknown rows as HDR10 for HDR10-capable clients with a degradation warning instead of leaving them unplayable under v3. - Honor bandwidth_cap_kbps as a hard ceiling in every quality mode and wire the previously dead Metered signal into conservative auto rungs. - Degrade to the validated source-quality route instead of a terminal when only an implicit quality reduction demanded an unsupported transcode; explicit user-selected rungs keep terminal behavior. - Bound inner capability lists and strings; compare attempt keys exactly instead of case-folded; make ParseTrackIDV3 strict about canonical numerics; accept dvdsub/pgssub/dvbsub aliases and stop promising burn-in for unknown subtitle codecs; probe every h264 encoder rather than requiring libx264; normalize the file-level bitrate fallback. - Evaluate subtitle renderability against the engine each candidate route executes on, not always media3_direct. - Pin the with-quirks attempt-key preimage arity in the cross-language fixture so the Kotlin client stays in lockstep. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(playback): harden v3 control-plane reliability Review fixes to the v3 session, store, and handler layer: - Bound concurrent replans with a slot semaphore: each replan pins a pooled connection for its advisory lock while issuing further store queries from the same pool, so an unbounded recovery storm could turn every connection into a lock holder and deadlock the server. - Make CompleteReplan a real compare-and-swap (base-revision predicate, ErrReplanSupersededV3) and map BeginReplan insert races to a replay instead of a raw unique violation. - Fingerprint start requests (request_digest column): an attempt ID reused with different input is now a 409-style conflict rather than a silent replay, and both replay paths check session liveness so dead sessions surface as retryable terminals. - Pre-delete expired attempt rows on SaveAttempt so a retry during the cleanup window cannot wedge on an unreachable conflict. - Align the in-memory store's semantics with Postgres and add DB-backed planstore tests (SILO_TEST_DATABASE_URL), including a regression test inserting every route-event name against the real CHECK constraint. - Session manager: v3 route-set updates own RemuxDVMode outright so a replan onto an SDR source clears a stale strip mode; replacement reservations survive unrelated legacy stream updates; replacement admission excludes the replaced session explicitly instead of decrementing totals it may no longer be part of; the admission CAS loop is bounded and decider errors are logged. - Map transient store failures to 500s instead of terminal 404/403s; authorize route events via identity-only projections after the rate limiter; keep sanitized diagnostics deterministic. - Merge the server-computed durable plan key into replan exclusions so unreproducible client history cannot re-select the failed route. - Remap tracks only when the effective edition changes (a same-file replan no longer switches audio to a lookalike track) and remap ID-only subtitle selections on edition fallback. - Cache the v3/shadow feature flags for five seconds instead of one settings SELECT per playback request; stop remote transports best-effort when the start call times out; carry dvm/tid claims and the transport-scoped job identity through the legacy audio-change re-mint; index playback_route_events(received_at) for the retention delete; run store maintenance for DB-less deployments too. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(transcode): reap idle node jobs and gate WebVTT conversion - Add an idle reaper to the transcode node: a job untouched by manifest or segment requests for ten minutes is closed and unregistered. After a v3 replan retires a transport ID, a stale in-flight stream token could resurrect the old job via reconstruct and encode to end-of-file for nobody; jobs waiting on readiness count registration as access and are never reaped mid-wait, and reaping keeps the recipe so a still-valid token reconstructs on the next hit. - Reject bitmap subtitle tracks (PGS) on the .vtt conversion path with 415 before headers are written instead of spawning an ffmpeg command that always fails mid-response, and make the extract-format override fall back to source-driven mapping for bitmap codecs. - Drain error bodies on non-202 node responses so the HTTP transport can reuse connections. - Pin the transcode-dir cleanup separator-boundary semantics with a regression test (a session ID sharing another's prefix must not retain foreign directories). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(playback): close v3 planner policy gaps from review - Clamp the final transcode bitrate to bandwidth_cap_kbps: the ladder has no rung below 480p/1500kbps, so lower caps were silently exceeded even though the cap is documented as a hard delivery ceiling. - Treat video-only media as audio-compatible instead of forcing an AAC conversion (or an audio_conversion_unsupported terminal) onto a file with no audio stream. Tracks whose codec failed to probe keep the gate. - Only promise a bitmap subtitle sidecar for embedded PGS with an engine that renders embedded bitmap: external/downloaded bitmap and embedded DVD/DVB published artifact URLs that always failed at fetch. They now fall through to burn-in or its terminal. - Accept client_video_transformations_v1 from either client_features or the nested context when validating client-executor transformations, matching the planner's dual-source reads. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(playback): probe and execute DV remuxes with one ffmpeg binary The v3 transformation registry probed the configured playback.ffmpeg_path while progressive remux execution resolved the process-global discovery path, so a deployment where only one binary carries dovi_rpu could plan a server_dv7_to_hdr10 route and then fail it at stream time. Resolution now goes through a shared ResolveFFmpegPath (configured path first, discovery fallback — the same rule the transcode pipeline already used), the dovi_rpu probe is cached per binary path, and the stream handler and proxy worker pass their configured path into ServeRemuxWithDVMode. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(playback): harden v3 replan identity and control-plane limits - Seed failure-replan track selections from the durable current plan before overlaying the request: after an alternate-version fallback the normalized request still carries requested-edition track IDs, so a replan omitting unchanged tracks was rejected as a track/file mismatch. - Remap ID-only audio selections across edition changes (parse the ID to an index like the subtitle remap already does) instead of leaving a stale file-bound ID to fail validation. - Release the node planner reservation when a prepared remote transport rolls back after the node accepted the job; repeated failed starts could otherwise pin max-job/bandwidth budgets for the full reservation age. - Size the replan semaphore below the PostgreSQL pool via a store capacity advisor: with max_connections at or below the fixed bound, advisory-lock holders could starve the inner store queries they need to finish. - Contain shadow-planner panics with a recover boundary; it runs on a bare goroutine where an escaped panic kills the process for what is telemetry-only work. Document why the memory store's session lock is deliberately a no-op. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(transcode): serialize node job teardown against reconstructs - Look up and touch manifest/segment sessions in one critical section so the idle reaper cannot unregister a job between the lookup and its liveness refresh. - Re-validate each reap candidate under the per-session lifecycle lock before closing it: Close removes the output directory, and without the lock it could race a token reconstruct and wipe the segments the fresh ffmpeg is writing. - Take the lifecycle lock in handleStop so a stop racing a RequireReady start's readiness wait blocks until registration and tears the job down, instead of 404ing and orphaning the ffmpeg until the reaper. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
291 lines
11 KiB
Go
291 lines
11 KiB
Go
package playback
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"log/slog"
|
|
"net/http"
|
|
"net/url"
|
|
"os/exec"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
)
|
|
|
|
// StreamExtractOpts configures a single streaming subtitle extract.
|
|
type StreamExtractOpts struct {
|
|
// InputPath is the path to the source media file.
|
|
InputPath string
|
|
// TrackIndex is the subtitle stream ordinal within the container
|
|
// (matches ffmpeg's `0:s:N` specifier). Callers pass the same index
|
|
// they would to ExtractSubtitle.
|
|
TrackIndex int
|
|
// SourceCodec is the codec name reported during probe (e.g. "subrip",
|
|
// "ass"). Controls whether we copy the stream (for ASS, which carries
|
|
// styling) or remux to WebVTT (for everything else).
|
|
SourceCodec string
|
|
// TargetFormat optionally forces a compatible converted artifact (currently
|
|
// WebVTT). Empty preserves the legacy source-driven behavior.
|
|
TargetFormat string
|
|
// SeekSeconds asks ffmpeg to start demuxing at this position. For
|
|
// text-event codecs this is the key win — ffmpeg skips the prefix of
|
|
// the container instead of scanning from byte 0 to produce earlier
|
|
// cues the client will never display. Ignored for ASS because ASS
|
|
// output needs the script header that only appears at offset 0.
|
|
SeekSeconds float64
|
|
// DurationSeconds bounds the extract to a window of this length
|
|
// (passed as ffmpeg's `-t`). Zero means "until end of file". A
|
|
// bounded window lets the client consume one fetch to completion
|
|
// while keeping memory and in-flight state finite; the client
|
|
// requests subsequent windows as playback approaches the tail.
|
|
DurationSeconds float64
|
|
// AllowWindow lets SeekSeconds/DurationSeconds apply to PGS extracts.
|
|
// By default PGS is never windowed because clients fetch the .sup
|
|
// stream exactly once and consume it whole; a client that explicitly
|
|
// opts in (via ?windowed=1) re-requests fresh windows itself as
|
|
// playback moves outside coverage. ASS ignores this flag — its
|
|
// [Script Info] header exists only at stream offset 0, so a seeked
|
|
// extract would be structurally broken.
|
|
AllowWindow bool
|
|
// InputIsExtractedSup marks InputPath as a cached full-track .sup
|
|
// elementary stream (a previous full extract, produced with -copyts so
|
|
// its timestamps are absolute source PTS) rather than the original
|
|
// media container. The input format is forced with `-f sup` — the
|
|
// headerless stream is probeable via its "PG" magic, but an explicit
|
|
// format is robust against probe-size edge cases — and the stream
|
|
// mapping is forced to `0:s:0`: a .sup holds exactly one stream, so
|
|
// TrackIndex (which names the ordinal in the *original* container) no
|
|
// longer applies. Seeking such an input with -copyts re-emits the same
|
|
// absolute timestamps, so windowed output is byte-compatible with a
|
|
// window cut from the original file.
|
|
InputIsExtractedSup bool
|
|
// FFmpegPath overrides the ffmpeg binary lookup.
|
|
FFmpegPath string
|
|
// Writer receives ffmpeg's stdout bytes as they arrive. When it
|
|
// implements http.Flusher, each chunk is flushed so cues reach the
|
|
// browser in real time.
|
|
Writer io.Writer
|
|
}
|
|
|
|
// StreamExtractSubtitle runs ffmpeg to extract a single subtitle track,
|
|
// seeked to SeekSeconds, and pipes its stdout to opts.Writer. The process
|
|
// exits when ffmpeg finishes; the function returns nil on clean exit or
|
|
// an error that includes truncated ffmpeg stderr on failure.
|
|
//
|
|
// Unlike ExtractSubtitle this does not buffer the full output — the
|
|
// writer sees cues as ffmpeg emits them. The first cue typically lands
|
|
// within a second even on network storage because the `-ss` input seek
|
|
// lets ffmpeg skip most of the container.
|
|
func StreamExtractSubtitle(ctx context.Context, opts StreamExtractOpts) error {
|
|
if opts.Writer == nil {
|
|
return errors.New("StreamExtractSubtitle: Writer is required")
|
|
}
|
|
if opts.InputPath == "" {
|
|
return errors.New("StreamExtractSubtitle: InputPath is required")
|
|
}
|
|
|
|
bin := opts.FFmpegPath
|
|
if bin == "" {
|
|
bin = "ffmpeg"
|
|
}
|
|
|
|
cmd := exec.CommandContext(ctx, bin, streamExtractArgs(opts)...)
|
|
stdout, err := cmd.StdoutPipe()
|
|
if err != nil {
|
|
return fmt.Errorf("stdout pipe: %w", err)
|
|
}
|
|
stderrBuf := &strings.Builder{}
|
|
cmd.Stderr = stderrBuf
|
|
|
|
start := time.Now()
|
|
if err := cmd.Start(); err != nil {
|
|
return fmt.Errorf("start ffmpeg: %w", err)
|
|
}
|
|
|
|
// Copy stdout → writer with per-chunk flush so the browser receives
|
|
// cues as they're produced rather than at ffmpeg exit.
|
|
copyErr := copyAndFlush(opts.Writer, stdout)
|
|
|
|
waitErr := cmd.Wait()
|
|
slog.DebugContext(ctx, "subtitle stream extract finished", "component", "playback",
|
|
"track", opts.TrackIndex,
|
|
"seek", opts.SeekSeconds,
|
|
"elapsed_ms", time.Since(start).Milliseconds(),
|
|
"ffmpeg_err", waitErr,
|
|
)
|
|
|
|
if waitErr != nil {
|
|
// ExitError with non-zero status is ffmpeg reporting a real
|
|
// problem. Client disconnect (copy failed) manifests as the
|
|
// context being cancelled, which surfaces here as ffmpeg being
|
|
// killed — propagate it as a regular cancellation error.
|
|
if ctx.Err() != nil {
|
|
return ctx.Err()
|
|
}
|
|
return fmt.Errorf("ffmpeg subtitle stream failed: %w (stderr: %s)",
|
|
waitErr, truncateStderr(stderrBuf.String()))
|
|
}
|
|
if copyErr != nil && !errors.Is(copyErr, io.EOF) {
|
|
return copyErr
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// streamExtractArgs builds the ffmpeg argument list for a streaming
|
|
// subtitle extract.
|
|
func streamExtractArgs(opts StreamExtractOpts) []string {
|
|
outCodec, outFormat := streamExtractOutput(opts.SourceCodec, opts.TargetFormat)
|
|
|
|
args := []string{
|
|
"-hide_banner", "-nostats", "-loglevel", "error",
|
|
}
|
|
|
|
// Input seek (before -i) is the fast variant: ffmpeg jumps near the
|
|
// requested position before demuxing. ASS can't use it because the
|
|
// output needs the [Script Info] header which only sits at offset 0.
|
|
// PGS defaults to non-windowed too: a client that fetches the .sup
|
|
// stream exactly once and consumes it whole needs the complete track
|
|
// from offset 0 — windowing would silently drop every cue outside
|
|
// the window. Clients that manage their own sliding window opt in
|
|
// via AllowWindow; -copyts below keeps the windowed output on
|
|
// absolute source timestamps so cues stay in sync. The same logic
|
|
// governs the -t duration cap below.
|
|
windowable := !IsASS(opts.SourceCodec) && (!IsPGS(opts.SourceCodec) || opts.AllowWindow)
|
|
seekApplied := opts.SeekSeconds > 0 && windowable
|
|
if seekApplied {
|
|
args = append(args, "-ss", strconv.FormatFloat(opts.SeekSeconds, 'f', 3, 64))
|
|
}
|
|
|
|
// Duration limit must be an *input* option (placed before -i) so it
|
|
// caps how much of the file we read. Placed as an output option, -t
|
|
// combined with -copyts stops output when PTS reaches the given
|
|
// value — which with a non-zero seek is already in the past, so
|
|
// ffmpeg would emit only the WEBVTT header and zero cues.
|
|
if opts.DurationSeconds > 0 && windowable {
|
|
args = append(args, "-t", strconv.FormatFloat(opts.DurationSeconds, 'f', 3, 64))
|
|
}
|
|
|
|
// A cached .sup input has no container magic worth probing and exactly
|
|
// one stream: force the demuxer and remap to the sole stream ordinal.
|
|
trackIndex := opts.TrackIndex
|
|
if opts.InputIsExtractedSup {
|
|
args = append(args, "-f", "sup")
|
|
trackIndex = 0
|
|
}
|
|
args = append(args,
|
|
"-i", opts.InputPath,
|
|
"-map", fmt.Sprintf("0:s:%d", trackIndex),
|
|
"-c:s", outCodec,
|
|
)
|
|
|
|
// When we seek the input, preserve the absolute source timestamps
|
|
// in the output. Without this ffmpeg rebases cues to start at 0,
|
|
// which makes every cue play `opts.SeekSeconds` earlier than it
|
|
// should — the symptom is subtitles that look "out of sync" with
|
|
// the video the player is showing at the same media time.
|
|
if seekApplied {
|
|
args = append(args, "-copyts", "-avoid_negative_ts", "disabled")
|
|
}
|
|
|
|
return append(args,
|
|
"-f", outFormat,
|
|
"pipe:1",
|
|
)
|
|
}
|
|
|
|
// PGSWindowRequest reports whether a subtitle request explicitly opts in
|
|
// to windowed PGS extraction (?windowed=1) and, if so, the seek position
|
|
// and window duration to use. Only explicit query params count — there is
|
|
// deliberately no session-position fallback, because a client that did
|
|
// not ask for a window expects the complete track from offset 0 and would
|
|
// silently lose every cue outside an implicit window. Absent or invalid
|
|
// params leave the existing (non-windowed) behavior byte-identical.
|
|
//
|
|
// Shared by the API stream handler and the standalone proxy so both
|
|
// endpoints gate the window identically.
|
|
func PGSWindowRequest(q url.Values) (allow bool, seekSeconds, durationSeconds float64) {
|
|
if q.Get("windowed") != "1" {
|
|
return false, 0, 0
|
|
}
|
|
const maxDuration = 3600.0
|
|
if raw := q.Get("position"); raw != "" {
|
|
if v, err := strconv.ParseFloat(raw, 64); err == nil && v >= 0 {
|
|
seekSeconds = v
|
|
}
|
|
}
|
|
if raw := q.Get("duration"); raw != "" {
|
|
if v, err := strconv.ParseFloat(raw, 64); err == nil && v > 0 && v <= maxDuration {
|
|
durationSeconds = v
|
|
}
|
|
}
|
|
return true, seekSeconds, durationSeconds
|
|
}
|
|
|
|
// copyAndFlush streams from src to dst in 32KB chunks, calling Flush on
|
|
// dst after each successful write when dst implements http.Flusher.
|
|
func copyAndFlush(dst io.Writer, src io.Reader) error {
|
|
flusher, _ := dst.(http.Flusher)
|
|
buf := make([]byte, 32*1024)
|
|
for {
|
|
n, readErr := src.Read(buf)
|
|
if n > 0 {
|
|
if _, writeErr := dst.Write(buf[:n]); writeErr != nil {
|
|
return writeErr
|
|
}
|
|
if flusher != nil {
|
|
flusher.Flush()
|
|
}
|
|
}
|
|
if readErr != nil {
|
|
if errors.Is(readErr, io.EOF) {
|
|
return nil
|
|
}
|
|
return readErr
|
|
}
|
|
}
|
|
}
|
|
|
|
// streamExtractOutput picks the ffmpeg output codec and muxer format for
|
|
// a given source codec. ASS/SSA is copied so styling survives; PGS is
|
|
// copied into a .sup elementary stream for client-side bitmap rendering
|
|
// (libpgs); everything else is transmuxed to WebVTT for direct `<track>`
|
|
// consumption.
|
|
func streamExtractOutput(codec string, targetFormat ...string) (outCodec, outFormat string) {
|
|
// A forced WebVTT target only applies to text sources: bitmap codecs
|
|
// carry no text for ffmpeg's webvtt encoder, so honoring the override
|
|
// would build a command that always fails mid-response. Fall through to
|
|
// the source-driven mapping instead (handlers reject bitmap-to-vtt
|
|
// requests before headers are written).
|
|
if len(targetFormat) > 0 && strings.EqualFold(targetFormat[0], "vtt") && !NeedsBurnIn(codec) {
|
|
return "webvtt", "webvtt"
|
|
}
|
|
switch {
|
|
case IsASS(codec):
|
|
return "copy", "ass"
|
|
case IsPGS(codec):
|
|
return "copy", "sup"
|
|
}
|
|
return "webvtt", "webvtt"
|
|
}
|
|
|
|
// LogSubtitleStreamError writes a non-fatal warning for subtitle stream
|
|
// failures. Handlers that already committed HTTP headers call this so
|
|
// the user sees a truncated subtitle instead of an error response, and
|
|
// operators still have a log trail to debug from.
|
|
func LogSubtitleStreamError(ctx context.Context, err error, fileID, trackIndex int) {
|
|
if err == nil {
|
|
return
|
|
}
|
|
if ctx.Err() != nil {
|
|
// Normal client disconnect mid-stream — don't warn.
|
|
return
|
|
}
|
|
slog.WarnContext(ctx, "subtitle stream extract failed", "component", "playback",
|
|
"file_id", fileID,
|
|
"track", trackIndex,
|
|
"error", err,
|
|
)
|
|
}
|