Another try

rust-av · Nov 28, 2019 · a0e3e46 · a0e3e46
1 parent 4327252
commit a0e3e46
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 47 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/av_metrics/src/video/mod.rs b/av_metrics/src/video/mod.rs
@@ -200,13 +200,20 @@ pub enum ParallelMethod {
 
 macro_rules! process_video {
     ($self:ident, $decoder1:ident, $decoder2:ident, $frame_limit:ident, $type:ident, $ret:ident) => {
-        $ret = iter::from_fn(|| $decoder1.read_video_frame::<$type>().ok())
-            .zip(iter::from_fn(|| $decoder2.read_video_frame::<$type>().ok()))
-            .take($frame_limit.unwrap_or(std::usize::MAX))
+        $ret = (0..$frame_limit.unwrap_or(std::usize::MAX))
+            .map(|_| {
+                (
+                    $decoder1.read_video_frame::<$type>().ok(),
+                    $decoder2.read_video_frame::<$type>().ok(),
+                )
+            })
+            .take_while(|(frame1, frame2)| frame1.is_some() && frame2.is_some())
             .par_bridge()
             .try_fold(
                 || vec![],
-                |mut acc, (frame1, frame2)| {
+                |mut acc, (f1, f2)| {
+                    let frame1 = f1.unwrap();
+                    let frame2 = f2.unwrap();
                     $self
                         .process_frame(&frame1, &frame2)
                         .map(|(metrics, cweight)| {