NyxErinys/crunchy-cli
1
0
Fork 0
mirror of https://github.com/crunchy-labs/crunchy-cli.git synced 2026-01-21 04:02:00 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use -q:v FFmpeg option for Apple hardware acceleration

Browse source
This commit is contained in:
Valentine Briese 2023-10-11 18:54:47 -07:00
parent 610593a795
commit 7095e2b8b6
1 changed files with 45 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

65
crunchy-cli-core/src/utils/ffmpeg.rs
View file

@ -263,6 +263,12 @@ impl FFmpegPreset {
match codec { match codec {
FFmpegCodec::H264 => { FFmpegCodec::H264 => {
let mut crf_quality = || match quality {
FFmpegQuality::Lossless => output.extend(["-crf", "18"]),
FFmpegQuality::Normal => (),
FFmpegQuality::Low => output.extend(["-crf", "35"]),
};
if let Some(hwaccel) = hwaccel_opt { if let Some(hwaccel) = hwaccel_opt {
match hwaccel { match hwaccel {
FFmpegHwAccel::Nvidia => { FFmpegHwAccel::Nvidia => {
@ -274,23 +280,37 @@ impl FFmpegPreset {
"-c:v", "-c:v",
"h264_cuvid", "h264_cuvid",
]); ]);
crf_quality();
output.extend(["-c:v", "h264_nvenc", "-c:a", "copy"]) output.extend(["-c:v", "h264_nvenc", "-c:a", "copy"])
} }
FFmpegHwAccel::Apple => { FFmpegHwAccel::Apple => {
// Apple's Video Toolbox encoders ignore `-crf`,
// use `-q:v` instead. It's on a scale of 1-100,
// 100 being lossless. Just did some math
// ((-a/51+1)*99+1 where `a` is the old crf value)
// so these settings very likely need some more
// tweeking.
match quality {
FFmpegQuality::Lossless => output.extend(["-q:v", "65"]),
FFmpegQuality::Normal => (),
FFmpegQuality::Low => output.extend(["-q:v", "32"]),
}
output.extend(["-c:v", "h264_videotoolbox", "-c:a", "copy"]) output.extend(["-c:v", "h264_videotoolbox", "-c:a", "copy"])
} }
} }
} else { } else {
crf_quality();
output.extend(["-c:v", "libx264", "-c:a", "copy"]) output.extend(["-c:v", "libx264", "-c:a", "copy"])
} }
match quality {
FFmpegQuality::Lossless => output.extend(["-crf", "18"]),
FFmpegQuality::Normal => (),
FFmpegQuality::Low => output.extend(["-crf", "35"]),
}
} }
FFmpegCodec::H265 => { FFmpegCodec::H265 => {
let mut crf_quality = || match quality {
FFmpegQuality::Lossless => output.extend(["-crf", "20"]),
FFmpegQuality::Normal => (),
FFmpegQuality::Low => output.extend(["-crf", "35"]),
};
if let Some(hwaccel) = hwaccel_opt { if let Some(hwaccel) = hwaccel_opt {
match hwaccel { match hwaccel {
FFmpegHwAccel::Nvidia => { FFmpegHwAccel::Nvidia => {
@ -302,6 +322,7 @@ impl FFmpegPreset {
"-c:v", "-c:v",
"h264_cuvid", "h264_cuvid",
]); ]);
crf_quality();
output.extend([ output.extend([
"-c:v", "-c:v",
"hevc_nvenc", "hevc_nvenc",
@ -311,24 +332,28 @@ impl FFmpegPreset {
"hvc1", "hvc1",
]) ])
} }
FFmpegHwAccel::Apple => output.extend([ FFmpegHwAccel::Apple => {
"-c:v", // See the comment that starts on line 287.
"hevc_videotoolbox", match quality {
"-c:a", FFmpegQuality::Lossless => output.extend(["-q:v", "61"]),
"copy", FFmpegQuality::Normal => (),
"-tag:v", FFmpegQuality::Low => output.extend(["-q:v", "32"]),
"hvc1", }
]),
output.extend([
"-c:v",
"hevc_videotoolbox",
"-c:a",
"copy",
"-tag:v",
"hvc1",
])
}
} }
} else { } else {
crf_quality();
output.extend(["-c:v", "libx265", "-c:a", "copy", "-tag:v", "hvc1"]) output.extend(["-c:v", "libx265", "-c:a", "copy", "-tag:v", "hvc1"])
} }
match quality {
FFmpegQuality::Lossless => output.extend(["-crf", "20"]),
FFmpegQuality::Normal => (),
FFmpegQuality::Low => output.extend(["-crf", "35"]),
}
} }
FFmpegCodec::Av1 => { FFmpegCodec::Av1 => {
output.extend(["-c:v", "libsvtav1", "-c:a", "copy"]); output.extend(["-c:v", "libsvtav1", "-c:a", "copy"]);