format and test

nomalab · Aug 17, 2023 · a1c331f · a1c331f
1 parent ef57a64
commit a1c331f
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 37 deletions.
diff --git a/src/probe/black_detect.rs b/src/probe/black_detect.rs
@@ -118,7 +118,8 @@ pub fn detect_black_frames(
             if let Some(stream_duration) = stream.get_duration() {
               end_from_duration = ((stream_duration - frame_duration) * 1000.0).round() as i64;
             } else {
-              end_from_duration = ((results.len() as f32 - 1.0) / frame_rate * 1000.0).round() as i64;
+              end_from_duration =
+                ((results.len() as f32 - 1.0) / frame_rate * 1000.0).round() as i64;
             }
           }
         }
@@ -143,8 +144,10 @@ pub fn detect_black_frames(
             }
             if let Some(value) = entry_map.get("lavfi.black_end") {
               if let Some(last_detect) = detected_black.last_mut() {
-                last_detect.end = ((value.parse::<f32>().unwrap() - frame_duration) * 1000.0).round() as i64;
-                let black_duration = last_detect.end - last_detect.start + (frame_duration * 1000.0).round() as i64;
+                last_detect.end =
+                  ((value.parse::<f32>().unwrap() - frame_duration) * 1000.0).round() as i64;
+                let black_duration =
+                  last_detect.end - last_detect.start + (frame_duration * 1000.0).round() as i64;
                 if let Some(max) = max_duration {
                   if black_duration > max as i64 {
                     detected_black.pop();

diff --git a/src/probe/deep.rs b/src/probe/deep.rs
@@ -394,7 +394,7 @@ impl DeepProbe {
           video_indexes.clone(),
           audio_indexes.clone(),
           black_and_silence_parameters,
-          frame_duration
+          frame_duration,
         );
       }
     }

diff --git a/src/probe/dualmono_detect.rs b/src/probe/dualmono_detect.rs
@@ -168,8 +168,10 @@ pub fn detect_dualmono<S: ::std::hash::BuildHasher>(
           if let AVMediaType::AVMEDIA_TYPE_VIDEO = context.get_stream_type(index as isize) {
             let frame_rate = stream.get_frame_rate().to_float() as f64;
             frame_duration = stream.get_frame_rate().invert().to_float() as f64;
-            end_from_duration = (((results.len() as f64 / audio_stream_qualif_number as f64) - 1.0) / frame_rate
-              * 1000.0).round() as i64;
+            end_from_duration = (((results.len() as f64 / audio_stream_qualif_number as f64) - 1.0)
+              / frame_rate
+              * 1000.0)
+              .round() as i64;
           }
         }
       }
@@ -195,7 +197,8 @@ pub fn detect_dualmono<S: ::std::hash::BuildHasher>(
             }
             if let Some(value) = entry_map.get("lavfi.aphasemeter.mono_end") {
               if let Some(last_detect) = detected_dualmono.last_mut() {
-                last_detect.end = ((value.parse::<f64>().unwrap() - frame_duration) * 1000.0).round() as i64;
+                last_detect.end =
+                  ((value.parse::<f64>().unwrap() - frame_duration) * 1000.0).round() as i64;
               }
             }
             if let Some(value) = entry_map.get("lavfi.aphasemeter.mono_duration") {
@@ -215,7 +218,8 @@ pub fn detect_dualmono<S: ::std::hash::BuildHasher>(
           .as_mut()
           .unwrap();
         if let Some(last_detect) = detected_dualmono.last() {
-          let duration = last_detect.end - last_detect.start + (frame_duration * 1000.0).round() as i64;
+          let duration =
+            last_detect.end - last_detect.start + (frame_duration * 1000.0).round() as i64;
           if let Some(max) = max_duration {
             if duration > max as i64 {
               detected_dualmono.pop();

diff --git a/src/probe/silence_detect.rs b/src/probe/silence_detect.rs
@@ -113,8 +113,10 @@ pub fn detect_silence<S: ::std::hash::BuildHasher>(
           if let AVMediaType::AVMEDIA_TYPE_VIDEO = context.get_stream_type(index as isize) {
             let frame_rate = stream.get_frame_rate().to_float() as f64;
             frame_duration = stream.get_frame_rate().invert().to_float() as f64;
-            end_from_duration = (((results.len() as f64 / audio_indexes.clone().len() as f64) - 1.0) / frame_rate
-              * 1000.0).round() as i64;
+            end_from_duration =
+              (((results.len() as f64 / audio_indexes.clone().len() as f64) - 1.0) / frame_rate
+                * 1000.0)
+                .round() as i64;
           }
         }
       }
@@ -142,7 +144,8 @@ pub fn detect_silence<S: ::std::hash::BuildHasher>(
             }
             if let Some(value) = entry_map.get("lavfi.silence_end") {
               if let Some(last_detect) = detected_silence.last_mut() {
-                last_detect.end = ((value.parse::<f64>().unwrap() - frame_duration) * 1000.0).round() as i64;
+                last_detect.end =
+                  ((value.parse::<f64>().unwrap() - frame_duration) * 1000.0).round() as i64;
               }
             }
             if let Some(value) = entry_map.get("lavfi.silence_duration") {
@@ -165,7 +168,8 @@ pub fn detect_silence<S: ::std::hash::BuildHasher>(
         }
         if let Some(max) = max_duration {
           if let Some(last_detect) = detected_silence.last() {
-            let silence_duration = last_detect.end - last_detect.start + (frame_duration * 1000.0).round() as i64;
+            let silence_duration =
+              last_detect.end - last_detect.start + (frame_duration * 1000.0).round() as i64;
             if silence_duration > max as i64 {
               detected_silence.pop();
             }

diff --git a/src/probe/sine_detect.rs b/src/probe/sine_detect.rs
@@ -144,7 +144,8 @@ pub fn detect_sine(
           if let AVMediaType::AVMEDIA_TYPE_VIDEO = context.get_stream_type(index as isize) {
             frame_rate = stream.get_frame_rate().to_float() as f64;
             end_from_duration =
-              (((results.len() as f64 / audio_indexes.len() as f64) - 1.0) / frame_rate * 1000.0).round() as i64;
+              (((results.len() as f64 / audio_indexes.len() as f64) - 1.0) / frame_rate * 1000.0)
+                .round() as i64;
           }
         }
       }
@@ -217,7 +218,8 @@ pub fn detect_sine(
                         sine.end = end_from_duration;
                         //check if sine is a 1000Hz => push and reset
                         if let Some(zero_crossing) = zero_cross.get(&audio_stream_key.clone()) {
-                          let sine_duration = ((frame + 1.0) / frame_rate * 1000.0).round() as i64 - sine.start;
+                          let sine_duration =
+                            ((frame + 1.0) / frame_rate * 1000.0).round() as i64 - sine.start;
                           if (zero_crossing / sine_duration as f64) == 2.0 {
                             detected_sine.push(sine);
                             last_starts.insert(audio_stream_key.clone(), None);

diff --git a/tests/deep_probe.json b/tests/deep_probe.json
@@ -16,11 +16,11 @@
             "detected_black": [
                {
                   "start": 0,
-                  "end": 4960
+                  "end": 4920
                },
                {
                   "start": 9960,
-                  "end": 14960
+                  "end": 14920
                }
             ],
             "detected_scene": [
@@ -63,15 +63,15 @@
             "detected_silence": [
                {
                   "start": 3000,
-                  "end": 6000
+                  "end": 5960
                },
                {
                   "start": 9000,
-                  "end": 12000
+                  "end": 11960
                },
                {
                   "start": 15000,
-                  "end": 18000
+                  "end": 17960
                }
             ],
             "detected_loudness": [
@@ -88,32 +88,32 @@
             "detected_black_and_silence": [
                {
                   "start": 3000,
-                  "end": 4960
+                  "end": 4920
                },
                {
                   "start": 9960,
-                  "end": 12000
+                  "end": 11960
                }
             ],
             "detected_sine": [
                {
                   "channel": 1,
-                  "end": 3000,
+                  "end": 2960,
                   "start": 0
                },
                {
                   "channel": 1,
-                  "end": 9000,
+                  "end": 8960,
                   "start": 6000
                },
                {
                   "channel": 1,
-                  "end": 15000,
+                  "end": 14960,
                   "start": 12000
                },
                {
                   "channel": 1,
-                  "end": 20000,
+                  "end": 19960,
                   "start": 18000
                }
             ]
@@ -131,7 +131,7 @@
             "detected_silence": [
                {
                   "start": 9000,
-                  "end": 18000
+                  "end": 17960
                }
             ],
             "detected_loudness": [
@@ -148,18 +148,18 @@
             "detected_black_and_silence": [
                {
                   "start": 9960,
-                  "end": 14960
+                  "end": 14920
                }
             ],
             "detected_sine": [
                {
                   "channel": 1,
-                  "end": 9000,
+                  "end": 8960,
                   "start": 0
                },
                {
                   "channel": 1,
-                  "end": 20000,
+                  "end": 19960,
                   "start": 18000
                }
             ]
@@ -219,19 +219,19 @@
             "detected_dualmono": [
                {
                   "start": 0,
-                  "end": 20000
+                  "end": 19960
                }
             ],
             "detected_silence": [],
             "detected_sine": [
                {
                   "channel": 1,
-                  "end": 20000,
+                  "end": 19960,
                   "start": 0
                },
                {
                   "channel": 2,
-                  "end": 20000,
+                  "end": 19960,
                   "start": 0
                }
             ],
@@ -263,7 +263,7 @@
             "detected_sine": [
                {
                   "channel": 1,
-                  "end": 20000,
+                  "end": 19960,
                   "start": 0
                }
             ],
@@ -292,14 +292,14 @@
             "detected_dualmono": [
                {
                   "start": 0,
-                  "end": 20000
+                  "end": 19960
                }
             ],
             "detected_silence": [],
             "detected_sine": [
                {
                   "channel": 1,
-                  "end": 20000,
+                  "end": 19960,
                   "start": 0
                }
             ],
@@ -328,14 +328,14 @@
             "detected_dualmono": [
                {
                   "start": 0,
-                  "end": 20000
+                  "end": 19960
                }
             ],
             "detected_silence": [],
             "detected_sine": [
                {
                   "channel": 1,
-                  "end": 20000,
+                  "end": 19960,
                   "start": 0
                }
             ],