revert(pipeline): back out picture-lock trimming from the preview build
Deploy / deploy (push) Successful in 6m19s
Deploy / deploy (push) Successful in 6m19s
Production fallout after enabling it: the trimmed EXR footage started
after the head handle as intended, but the overlay's burn-in timecode
(hardcoded to start at frame 1001) did not shift with it, so the
delivered burn-in no longer matched the footage. The picture-lock
reference render also never worked correctly in practice. Reverts the
AE panel checkbox, the preview-build script's trim/reference logic, and
the server/worker plumbing around it back to their pre-feature state
(82dfaee) — untrimmed previews, no picture-lock reference, overlay
timecode correct again.
The noPictureLock/piclockRefKey schema columns and their migration are
deliberately left in place: they're already applied in production, and
dropping an applied migration's file risks the next `prisma migrate
deploy`. They sit unused and harmless until this is revisited.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
@@ -157,19 +157,6 @@ public sealed class PreviewManifest
|
||||
public string? SlateSubmissionProp { get; set; }
|
||||
public SlateInfo Slate { get; set; } = new();
|
||||
|
||||
/// <summary>Skip picture-lock trimming and the reference render entirely.</summary>
|
||||
public bool NoPictureLock { get; set; }
|
||||
/// <summary>"{footageRoot}/{showId}/_PICLOCKS" — empty when not configured.</summary>
|
||||
public string? PiclockDir { get; set; }
|
||||
/// <summary>e.g. "UNG_106" — the picture-lock file glob prefix.</summary>
|
||||
public string? PiclockGlobPrefix { get; set; }
|
||||
public string? SeqTimecodeStart { get; set; }
|
||||
public string? SeqTimecodeEnd { get; set; }
|
||||
/// <summary>Studio-standard head/tail handle count, applied symmetrically.</summary>
|
||||
public int HandleFrames { get; set; }
|
||||
/// <summary>Full-duration (handles included), ungraded picture-lock reference render.</summary>
|
||||
public string? PiclockRefOutput { get; set; }
|
||||
|
||||
public int TotalFrames => FrameEnd - FrameStart + 1;
|
||||
}
|
||||
|
||||
@@ -199,10 +186,6 @@ public sealed class PreviewBuildResult
|
||||
public int? FrameCount { get; set; }
|
||||
public int? Width { get; set; }
|
||||
public int? Height { get; set; }
|
||||
/// <summary>Whether the picture-lock reference comp was found, positioned and queued.</summary>
|
||||
public bool PiclockRefBuilt { get; set; }
|
||||
/// <summary>Why the picture-lock reference/trim was skipped, when it was (non-fatal).</summary>
|
||||
public string? PiclockSkippedReason { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>The Render Manifest (§6.2) — the fields the render and validation stages need; the rest is preserved raw.</summary>
|
||||
|
||||
@@ -438,19 +438,6 @@ public sealed class JobExecutor
|
||||
job.Id, machineId, "thumbnail", result.ThumbnailPath, "image/jpeg", shutdown);
|
||||
}
|
||||
|
||||
// Diagnostic sidecar, not a deliverable — an upload failure here must
|
||||
// never hold back the mov/mp4/thumbnail that already succeeded.
|
||||
string? piclockRefKey = null;
|
||||
if (result.PiclockRefPath is not null)
|
||||
{
|
||||
piclockRefKey = await _api.UploadArtifactAsync(
|
||||
job.Id, machineId, "piclockRef", result.PiclockRefPath, "video/mp4", shutdown);
|
||||
if (piclockRefKey is null)
|
||||
{
|
||||
_log.LogWarning("Picture-lock reference upload failed for job {JobId} (non-fatal)", job.Id);
|
||||
}
|
||||
}
|
||||
|
||||
_spooler.Enqueue("finalize", job.Id, new Dictionary<string, object?>
|
||||
{
|
||||
["machineId"] = machineId,
|
||||
@@ -459,9 +446,7 @@ public sealed class JobExecutor
|
||||
["deliveryMovPath"] = manifest.MovOutput,
|
||||
["previewMovKey"] = previewKey,
|
||||
["thumbnailKey"] = thumbKey,
|
||||
["piclockRefKey"] = piclockRefKey,
|
||||
},
|
||||
["piclockSkippedReason"] = result.Build?.PiclockSkippedReason,
|
||||
["renderStats"] = new Dictionary<string, object?>
|
||||
{
|
||||
["previewSeconds"] = (int)result.Seconds,
|
||||
|
||||
@@ -14,8 +14,7 @@ public sealed record PreviewStageResult(
|
||||
string? ThumbnailPath,
|
||||
string? TempAep,
|
||||
PreviewBuildResult? Build,
|
||||
double Seconds,
|
||||
string? PiclockRefPath = null);
|
||||
double Seconds);
|
||||
|
||||
/// <summary>
|
||||
/// Stage 3 — preview generation (RenderPipeline2 §9), the second half of a
|
||||
@@ -60,8 +59,6 @@ public sealed class PreviewStage
|
||||
|
||||
var movLocal = mapper.Map(manifest.MovOutput);
|
||||
var mp4Local = mapper.Map(manifest.Mp4Output);
|
||||
var piclockDirLocal = string.IsNullOrWhiteSpace(manifest.PiclockDir) ? null : mapper.Map(manifest.PiclockDir);
|
||||
var piclockRefLocal = string.IsNullOrWhiteSpace(manifest.PiclockRefOutput) ? null : mapper.Map(manifest.PiclockRefOutput);
|
||||
|
||||
// Everything the script needs, in machine-local paths.
|
||||
var context = new
|
||||
@@ -86,13 +83,6 @@ public sealed class PreviewStage
|
||||
slateScopeProp = manifest.SlateScopeProp,
|
||||
slateSubmissionProp = manifest.SlateSubmissionProp,
|
||||
slate = manifest.Slate,
|
||||
noPictureLock = manifest.NoPictureLock,
|
||||
piclockDir = piclockDirLocal,
|
||||
piclockGlobPrefix = manifest.PiclockGlobPrefix,
|
||||
seqTimecodeStart = manifest.SeqTimecodeStart,
|
||||
seqTimecodeEnd = manifest.SeqTimecodeEnd,
|
||||
handleFrames = manifest.HandleFrames,
|
||||
piclockRefOutput = piclockRefLocal,
|
||||
};
|
||||
|
||||
await File.WriteAllTextAsync(contextPath, JsonSerializer.Serialize(context, WorkerOptions.JsonOpts), shutdown);
|
||||
@@ -191,29 +181,12 @@ public sealed class PreviewStage
|
||||
|
||||
var thumbnail = await TryMakeThumbnailAsync(job.Id, mp4Local, shutdown);
|
||||
|
||||
// Non-fatal by design: the picture-lock reference is a diagnostic aid,
|
||||
// not part of the deliverable, so a missing file here must never hold
|
||||
// back the mov/mp4 that already rendered successfully.
|
||||
string? piclockRefResult = null;
|
||||
if (build.PiclockRefBuilt)
|
||||
{
|
||||
if (!string.IsNullOrWhiteSpace(piclockRefLocal) && File.Exists(piclockRefLocal))
|
||||
{
|
||||
piclockRefResult = piclockRefLocal;
|
||||
}
|
||||
else
|
||||
{
|
||||
_log.LogWarning("Picture-lock reference was queued but is missing after render: {Path}", piclockRefLocal);
|
||||
}
|
||||
}
|
||||
|
||||
sw.Stop();
|
||||
_log.LogInformation("Preview complete for job {JobId} in {Sec:F0}s (mov + mp4{Thumb}{Piclock})",
|
||||
job.Id, sw.Elapsed.TotalSeconds, thumbnail is null ? "" : " + thumbnail",
|
||||
piclockRefResult is null ? "" : " + piclock ref");
|
||||
_log.LogInformation("Preview complete for job {JobId} in {Sec:F0}s (mov + mp4{Thumb})",
|
||||
job.Id, sw.Elapsed.TotalSeconds, thumbnail is null ? "" : " + thumbnail");
|
||||
|
||||
return new PreviewStageResult(true, true, null, movLocal, mp4Local, thumbnail,
|
||||
build.TempAep, build, sw.Elapsed.TotalSeconds, piclockRefResult);
|
||||
build.TempAep, build, sw.Elapsed.TotalSeconds);
|
||||
}
|
||||
|
||||
private async Task<int> RunAfterFxAsync(
|
||||
|
||||
Reference in New Issue
Block a user