Skip to content

Commit

Permalink
testbench: strip after "-" in ffmpeg version
Browse files Browse the repository at this point in the history
we are getting versions like
"7.1-full_build-www.gyan.dev" and "7.0.2-static"
which are valid
  • Loading branch information
astraw committed Dec 6, 2024
1 parent 130e8a2 commit 6434ada
Showing 1 changed file with 19 additions and 1 deletion.
20 changes: 19 additions & 1 deletion testbench/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ pub fn ffmpeg_to_frame(
assert_eq!(ffmpeg_stderr_iter.next(), Some("version"));

if let Some(version_str) = ffmpeg_stderr_iter.next() {
dbg!(&version_str);
let version_str = fix_ffmpeg_vers(version_str)?;
let version = match semver::Version::parse(version_str) {
Ok(version) => version,
Err(orig_err) => {
Expand Down Expand Up @@ -519,3 +519,21 @@ pub fn ffmpeg_to_frame(
let decoder = tiff::decoder::Decoder::new(rdr)?;
Ok(decoder)
}

fn fix_ffmpeg_vers(version_str: &str) -> Result<&str> {
dbg!(&version_str);
let version_str = if let Some(v) = version_str.split("-").next() {
v
} else {
anyhow::bail!("unknown version_str: {version_str:?}");
};
dbg!(&version_str);
Ok(version_str)
}

#[test]
fn test_fix_ffmpeg_vers() -> Result<()> {
assert_eq!(fix_ffmpeg_vers("7.0.2-static")?, "7.0.2");
assert_eq!(fix_ffmpeg_vers("7.1-full_build-www.gyan.dev")?, "7.1");
Ok(())
}

0 comments on commit 6434ada

Please sign in to comment.