From 760b09a8b02b626ba858e8f869b32fd3a3737ae1 Mon Sep 17 00:00:00 2001
From: jazzfool <shamoslover69@gmail.com>
Date: Tue, 1 Oct 2024 16:06:32 +1000
Subject: [PATCH] reduce CPU usage

---
 src/video.rs        |  6 ++++--
 src/video_player.rs | 17 ++++++++++-------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/video.rs b/src/video.rs
index b697537..2d92dd7 100644
--- a/src/video.rs
+++ b/src/video.rs
@@ -209,6 +209,7 @@ impl Video {
         let framerate = s
             .get::<gst::Fraction>("framerate")
             .map_err(|_| Error::Caps)?;
+        let framerate = framerate.numer() as f64 / framerate.denom() as f64;
 
         let duration = std::time::Duration::from_nanos(
             pipeline
@@ -231,7 +232,8 @@ impl Video {
         let alive_ref = Arc::clone(&alive);
 
         let worker = std::thread::spawn(move || {
-            while alive_ref.load(Ordering::SeqCst) {
+            while alive_ref.load(Ordering::Acquire) {
+                std::thread::sleep(std::time::Duration::from_secs_f64(1.0 / framerate));
                 if let Err(gst::FlowError::Error) = (|| -> Result<(), gst::FlowError> {
                     let sample = app_sink.pull_sample().map_err(|_| gst::FlowError::Eos)?;
 
@@ -260,7 +262,7 @@ impl Video {
 
             width,
             height,
-            framerate: framerate.numer() as f64 / framerate.denom() as f64,
+            framerate,
             duration,
             speed: 1.0,
 
diff --git a/src/video_player.rs b/src/video_player.rs
index ce13c2c..8de4e79 100644
--- a/src/video_player.rs
+++ b/src/video_player.rs
@@ -233,13 +233,16 @@ where
                     inner.set_paused(true);
                 }
 
-                let redraw_interval = 1.0 / inner.framerate;
-                shell.request_redraw(iced::window::RedrawRequest::At(
-                    now + Duration::from_secs_f64(redraw_interval),
-                ));
-
-                if let Some(on_new_frame) = self.on_new_frame.clone() {
-                    shell.publish(on_new_frame);
+                if inner.upload_frame.load(Ordering::SeqCst) {
+                    shell.request_redraw(iced::window::RedrawRequest::NextFrame);
+                    if let Some(on_new_frame) = self.on_new_frame.clone() {
+                        shell.publish(on_new_frame);
+                    }
+                } else {
+                    let redraw_interval = 1.0 / inner.framerate;
+                    shell.request_redraw(iced::window::RedrawRequest::At(
+                        now + Duration::from_secs_f64(redraw_interval),
+                    ));
                 }
             }
             Status::Captured