Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
render_video_docker
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Dorian Koch
render_video_docker
Commits
afecfb45
Commit
afecfb45
authored
1 year ago
by
Dorian Koch
Browse files
Options
Downloads
Patches
Plain Diff
Remove patches, Checkout specific commit hash
parent
b8becc28
Branches
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#5802
passed with warnings
1 year ago
Stage: build
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
Dockerfile
+3
-6
3 additions, 6 deletions
Dockerfile
docker_patch.diff
+0
-24
0 additions, 24 deletions
docker_patch.diff
svtav1_patch.diff
+0
-19
0 additions, 19 deletions
svtav1_patch.diff
with
3 additions
and
49 deletions
Dockerfile
+
3
−
6
View file @
afecfb45
...
...
@@ -10,12 +10,9 @@ RUN mkdir /app && mkdir /binaries
WORKDIR
/app
RUN
git clone https://msrd0.dev/msrd0/render_video.git /app
COPY
docker_patch.diff /app/docker_patch.diff
COPY
svtav1_patch.diff /app/svtav1_patch.diff
RUN
git apply
--ignore-space-change
--ignore-whitespace
docker_patch.diff
RUN
git apply
--ignore-space-change
--ignore-whitespace
svtav1_patch.diff
RUN
cargo build
--target-dir
/binaries
RUN
cargo build
--release
--target-dir
/binaries
RUN
git checkout 4612cbdfaaa8e1e713aa9f4bc5b19ba3fa721f4d
RUN
cargo build
--no-default-features
--target-dir
/binaries
RUN
cargo build
--no-default-features
--release
--target-dir
/binaries
ENV
RUST_BACKTRACE=full
ENTRYPOINT
[ "/binaries/release/render_video", "-t", "720p", "-T", "1440p" ]
\ No newline at end of file
This diff is collapsed.
Click to expand it.
docker_patch.diff
deleted
100644 → 0
+
0
−
24
View file @
b8becc28
diff --git a/src/render/mod.rs b/src/render/mod.rs
index 279f3c4..674f66d 100644
--- a/src/render/mod.rs
+++ b/src/render/mod.rs
@@ -41,15 +41,15 @@
const LOGO_SIZE: usize = 96;
fn cmd() -> Command {
// we use systemd-run to limit the process memory
// I tried others like ulimit, chpst or isolate, but none worked
- let mut cmd = Command::new("systemd-run");
- cmd.arg("--scope")
+ let mut cmd = Command::new("busybox");
+ /*cmd.arg("--scope")
.arg("-q")
.arg("--expand-environment=no")
.arg("-p")
.arg(format!("MemoryMax={}", MEM_LIMIT.read().unwrap()))
- .arg("--user");
+ .arg("--user");*/
// we use busybox ash for having a shell that outputs commands with -x
- cmd.arg("busybox")
+ cmd
.arg("ash")
.arg("-exuo")
.arg("pipefail")
This diff is collapsed.
Click to expand it.
svtav1_patch.diff
deleted
100644 → 0
+
0
−
19
View file @
b8becc28
diff --git a/src/render/ffmpeg.rs b/src/render/ffmpeg.rs
index b0a63da..8d113bc 100644
--- a/src/render/ffmpeg.rs
+++ b/src/render/ffmpeg.rs
@@ -105,7 +105,13 @@
impl FfmpegOutput {
const QUALITY: &str = "22";
if venc {
let mut vcodec: String = match self.format {
- FfmpegOutputFormat::Av1Flac | FfmpegOutputFormat::Av1Opus => "av1".into(),
+ FfmpegOutputFormat::Av1Flac | FfmpegOutputFormat::Av1Opus => {
+ if vaapi {
+ "av1".into()
+ } else {
+ "libsvtav1".into()
+ }
+ },
FfmpegOutputFormat::AvcAac => "h264".into()
};
if vaapi {
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment