improve ffmpeg version parser

Author: Wumpf

crates/store/re_video/src/decode/ffmpeg_h264/ffmpeg.rs

@@ -587,28 +587,43 @@ fn read_ffmpeg_output(
             FfmpegEvent::ParsedVersion(ffmpeg_version) => {
                 re_log::debug_once!("FFmpeg version is {}", ffmpeg_version.version);
 
-                let mut version_parts = ffmpeg_version.version.split(".");
-                if let (Some(major), Some(minor)) = (
-                    version_parts
-                        .next()
-                        .and_then(|part| part.parse::<u32>().ok()),
-                    version_parts
+                fn download_advice() -> String {
+                    if let Ok(download_url) = ffmpeg_sidecar::download::ffmpeg_download_url() {
+                        format!("\nYou can download an up to date version for your system at {download_url}.")
+                    } else {
+                        String::new()
+                    }
+                }
+
+                // Version strings can get pretty wild!
+                // E.g. choco installed ffmpeg on Windows gives me "7.1-essentials_build-www.gyan.dev".
+                let mut version_parts = ffmpeg_version.version.split('.');
+                let major = version_parts
+                    .next()
+                    .and_then(|part| part.parse::<u32>().ok());
+                let minor = version_parts.next().and_then(|part| {
+                    part.split('-')
                         .next()
-                        .and_then(|part| part.parse::<u32>().ok()),
-                ) {
+                        .and_then(|part| part.parse::<u32>().ok())
+                });
+
+                if let (Some(major), Some(minor)) = (major, minor) {
+                    re_log::debug_once!("Parsed FFmpeg version as {}.{}", major, minor);
+
                     if major < FFMPEG_MINIMUM_VERSION_MAJOR
                         || (major == FFMPEG_MINIMUM_VERSION_MAJOR
                             && minor < FFMPEG_MINIMUM_VERSION_MINOR)
                     {
                         re_log::warn_once!(
-                            "FFmpeg version is {}. Only versions >= {FFMPEG_MINIMUM_VERSION_MAJOR}.{FFMPEG_MINIMUM_VERSION_MINOR} are officially supported",
-                            ffmpeg_version.version
+                            "FFmpeg version is {}. Only versions >= {FFMPEG_MINIMUM_VERSION_MAJOR}.{FFMPEG_MINIMUM_VERSION_MINOR} are officially supported.{}",
+                            ffmpeg_version.version, download_advice()
                         );
                     }
                 } else {
                     re_log::warn_once!(
-                        "Failed to parse FFmpeg version: {}",
-                        ffmpeg_version.raw_log_message
+                        "Failed to parse FFmpeg version: {}{}",
+                        ffmpeg_version.version,
+                        download_advice()
                     );
                 }
             }
@@ -791,12 +806,13 @@ fn write_avc_chunk_to_nalu_stream(
             return Err(Error::BadVideoData("Not enough bytes to".to_owned()));
         }
 
-        let nal_header = NalHeader(chunk.data[data_start]);
-        re_log::trace!(
-            "nal_header: {:?}, {}",
-            nal_header.unit_type(),
-            nal_header.ref_idc()
-        );
+        // Can be useful for finding issues, but naturally very spammy.
+        // let nal_header = NalHeader(chunk.data[data_start]);
+        // re_log::trace!(
+        //     "nal_header: {:?}, {}",
+        //     nal_header.unit_type(),
+        //     nal_header.ref_idc()
+        // );
 
         let data = &chunk.data[data_start..data_end];
 
@@ -868,7 +884,7 @@ fn should_ignore_log_msg(msg: &str) -> bool {
     false
 }
 
-/// Strips out buffer addresses from FFmpeg log messages so that we can use it with the log-once family of methods.
+/// Strips out buffer addresses from `FFmpeg` log messages so that we can use it with the log-once family of methods.
 fn sanitize_ffmpeg_log_message(msg: &str) -> String {
     // Make warn_once work on `[swscaler @ 0x148db8000]` style warnings even if the address is different every time.
     // In older versions of FFmpeg this may happen several times in the same message (happend in 5.1, did not happen in 7.1).
@@ -889,9 +905,8 @@ fn sanitize_ffmpeg_log_message(msg: &str) -> String {
     msg
 }
 
+#[cfg(test)]
 mod tests {
-    use super::sanitize_ffmpeg_log_message;
-
     #[test]
     fn test_sanitize_ffmpeg_log_message() {
         assert_eq!(