Speed factor for transcode can be floating point

williamyang98 · Jul 23, 2024 · f1011e4 · f1011e4
1 parent 63d56c4
commit f1011e4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/ffmpeg.rs b/src/ffmpeg.rs
@@ -131,7 +131,7 @@ pub struct TranscodeProgress {
     pub size_bytes: Option<usize>,
     pub total_time_transcoded: Option<Time>,
     pub speed_bits: Option<usize>,
-    pub speed_factor: Option<u32>,
+    pub speed_factor: Option<f32>,
 }
 
 #[derive(Clone,Copy,Debug,Default)]
@@ -150,7 +150,7 @@ pub enum ParsedStderrLine {
 pub fn parse_stderr_line(line: &str) -> Option<ParsedStderrLine> {
     lazy_static! {
         static ref PROGRESS_REGEX: Regex = Regex::new(format!(
-            r"size\s*=\s*(\d+)({0})\s+time\s*=\s*({1})\s+bitrate\s*=\s*({2})({3})\/s\s+speed\s*=\s*(\d+)\s*x",
+            r"size\s*=\s*(\d+)({0})\s+time\s*=\s*({1})\s+bitrate\s*=\s*({2})({3})\/s\s+speed\s*=\s*({2})\s*x",
             BYTES_REGEX, TIME_REGEX, FLOAT32_REGEX, BITS_LONG_REGEX,
         ).as_str()).unwrap();
         static ref SOURCE_INFO_REGEX: Regex = Regex::new(format!(
@@ -177,7 +177,7 @@ pub fn parse_stderr_line(line: &str) -> Option<ParsedStderrLine> {
                 _ => None,
             }
         };
-        let speed_factor: Option<u32> = captures.get(6).and_then(|m| m.as_str().parse().ok());
+        let speed_factor: Option<f32> = captures.get(6).and_then(|m| m.as_str().parse().ok());
         let result = TranscodeProgress {
             size_bytes,
             total_time_transcoded,

diff --git a/src/worker_transcode.rs b/src/worker_transcode.rs
@@ -42,7 +42,7 @@ pub struct TranscodeState {
     pub transcode_duration_milliseconds: Option<u64>,
     pub transcode_size_bytes: Option<usize>,
     pub transcode_speed_bits: Option<usize>,
-    pub transcode_speed_factor: Option<u32>,
+    pub transcode_speed_factor: Option<f32>,
 }
 
 impl Default for TranscodeState {

diff --git a/static/fragments/transcode_progress.js b/static/fragments/transcode_progress.js
@@ -119,7 +119,7 @@ export const TranscodeProgress = {
         table.transcode_size = `${size_bytes.toFixed(2)} ${size_bytes_unit}bytes`;
         let [bitrate, bitrate_units] = convert_to_short_standard_prefix(this.progress.transcode_speed_bits);
         table.transcode_bitrate = `${bitrate.toFixed(2)} ${bitrate_units}b/s`;
-        table.transcode_speed_factor = this.progress.transcode_speed_factor;
+        table.transcode_speed_factor = this.progress.transcode_speed_factor.toFixed(2);
       }
       return table;
     },