Skip to content

chore(container): build in-tree ffmpeg CLI and route imageio through it (#10091)#10154

Merged
saturley-hall merged 1 commit into
release/1.2.0from
harrison/cherry-pick-pr10091
May 31, 2026
Merged

chore(container): build in-tree ffmpeg CLI and route imageio through it (#10091)#10154
saturley-hall merged 1 commit into
release/1.2.0from
harrison/cherry-pick-pr10091

Conversation

@saturley-hall
Copy link
Copy Markdown
Member

@saturley-hall saturley-hall commented May 30, 2026

Cherry-pick of #10091 onto release/1.2.0.

Closes OPS-6862

What

Builds the ffmpeg CLI in-tree (LGPL-only: h264_nvenc + libvpx_vp9) and routes imageio through it via IMAGEIO_FFMPEG_EXE, replacing the GPL-encumbered prebuilt binary shipped by the imageio-ffmpeg wheel.

Cherry-pick notes

The release/1.2.0 base had refactored the container build since #10091 was authored, so five files conflicted. The resolution applies #10091's intent onto the new structure rather than its original line layout:

  • requirements.trtllm.txt — kept deleted; trtllm now installs requirements.common.txt, which already carries the --no-binary imageio-ffmpeg directive.
  • requirements.vllm.txt — kept the branch's vLLM multimodal deps; imageio handling lives in requirements.common.txt (installed in the same step).
  • vllm_runtime.Dockerfile — added --reinstall-package imageio-ffmpeg to the existing requirements install, forcing a source rebuild that clears the base vllm image's GPL binary.
  • trtllm_runtime.Dockerfile — added the ungated runtime ffmpeg-CLI copy + ENV IMAGEIO_FFMPEG_EXE, since the TRT-LLM diffusion handler unconditionally encodes video.
  • wheel_builder.Dockerfile — added the nv-codec-headers + libvpx source build and switched ffmpeg ./configure to build the CLI with h264_nvenc/libvpx_vp9; the new NV_CODEC_HEADERS_REF/LIBVPX_REF args and the AWS_SDK_CPP_VERSION default now flow from args.Dockerfile/context.yaml.

Verified both the trtllm and vllm templates render cleanly via container/render.py.

🤖 Generated with Claude Code


Open in Devin Review

…it (#10091)

Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
(cherry picked from commit dc2f352)
Signed-off-by: Harrison King Saturley-Hall <hsaturleyhal@nvidia.com>
@saturley-hall saturley-hall requested review from a team as code owners May 30, 2026 02:08
@github-actions github-actions Bot added chore documentation Improvements or additions to documentation backend::sglang Relates to the sglang backend backend::trtllm Relates to the trtllm backend container labels May 30, 2026
@github-actions
Copy link
Copy Markdown
Contributor

@saturley-hall saturley-hall merged commit a069393 into release/1.2.0 May 31, 2026
94 of 97 checks passed
@saturley-hall saturley-hall deleted the harrison/cherry-pick-pr10091 branch May 31, 2026 01:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backend::sglang Relates to the sglang backend backend::trtllm Relates to the trtllm backend chore container documentation Improvements or additions to documentation size/L

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant