Merge branch 'main' of https://github.com/marc2332/freya into feat/image-viewer-optimizations

Author: marc2332

.github/workflows/publish.yml

@@ -24,6 +24,6 @@ jobs:
         run: sudo apt update && sudo apt install build-essential libssl-dev pkg-config libglib2.0-dev libgtk-3-dev libudev-dev libxdo-dev libwebkit2gtk-4.1-dev
       - name: Install Rust toolchain
         uses: actions-rust-lang/setup-rust-toolchain@46268bd060767258de96ed93c1251119784f2ab6 # v1
-      - run: cargo publish --features skia-engine --workspace --exclude "examples" --exclude "android" --exclude "freya-devtools-app"
+      - run: cargo publish --workspace --exclude "examples" --exclude "android" --exclude "freya-devtools-app"
         env:
           CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}

.github/workflows/rust_sync.yml

@@ -82,7 +82,7 @@ Freya is split in various crates, each with it's own meaning and purpose, here i
 - `ragnarok`: UI events measurer (e.g what event to figure when the user clicks in a coordinate).
 - `pathgraph`: Map to store nested data structures based on the assumption that you always know its location.
 - `freya-components`: Collection of components ready to be used out of the box with in Freya apps (Button, Switch, Slider, Table, ScrollView, etc)
-- `freya-engine`: Simple re-export and mock of all Skia APIs used in freya so Freya docs can be built on docs.rs.
+- `freya-engine`: Simple re-export of all Skia APIs used in freya.
 - `freya-devtools`: Devtools server and plugin for Freya.
 - `freya-devtools-app`: Standalone Freya app to debug or inspect your Freya apps, its powered by `freya-devtools`.
 - `freya-radio`: Global reactive state management based on Topics.
@@ -101,6 +101,7 @@ Freya is split in various crates, each with it's own meaning and purpose, here i
 - `freya-material-design`: Material Design Components for Freya apps.
 - `freya-plotters-backend`: Freya's skia-safe backend for plotters.
 - `freya-code-editor`: Set of APIs to create text Code Editors in Freya.
+- `freya-camera`: Camera capture support for Freya.
 
 ## Examples
 All important examples are located in the  `./examples` folder although you might also find some in the form of docs comments in the code itself.

CONTRIBUTING.md

@@ -44,46 +44,48 @@ members = [
   "./crates/freya-webview",
   "./crates/freya-terminal",
   "./crates/freya-code-editor",
+  "./crates/freya-camera",
   "./crates/freya-android",
   "./examples/ai-chat",
   "./examples/state_query_sqlite",
   "./examples/android",
 ]
 
 [workspace.dependencies]
-freya = { path = "./crates/freya", version = "0.4.0-rc.19" }
-freya-core = { path = "./crates/freya-core", version = "0.4.0-rc.19" }
-torin = { path = "./crates/torin", version = "0.4.0-rc.19" }
-ragnarok = { path = "./crates/ragnarok", version = "0.4.0-rc.19" }
-freya-clipboard = { path = "./crates/freya-clipboard", version = "0.4.0-rc.19" }
-freya-edit = { path = "./crates/freya-edit", version = "0.4.0-rc.19" }
-freya-winit = { path = "./crates/freya-winit", version = "0.4.0-rc.19" }
-freya-components = { path = "./crates/freya-components", version = "0.4.0-rc.19" }
-pathgraph = { path = "./crates/pathgraph/", version = "0.4.0-rc.19" }
-freya-animation = { path = "./crates/freya-animation", version = "0.4.0-rc.19" }
-freya-router = { path = "./crates/freya-router", version = "0.4.0-rc.19" }
-freya-router-macro = { path = "./crates/freya-router-macro", version = "0.4.0-rc.19" }
-freya-testing = { path = "./crates/freya-testing", version = "0.4.0-rc.19" }
-freya-i18n = { path = "./crates/freya-i18n", version = "0.4.0-rc.19" }
-freya-performance-plugin = { path = "./crates/freya-performance-plugin", version = "0.4.0-rc.19" }
-freya-radio = { path = "./crates/freya-radio", version = "0.4.0-rc.19" }
-freya-engine = { path = "./crates/freya-engine", version = "0.4.0-rc.19" }
-freya-devtools = { path = "./crates/freya-devtools", version = "0.4.0-rc.19" }
+freya = { path = "./crates/freya", version = "0.4.0-rc.21" }
+freya-core = { path = "./crates/freya-core", version = "0.4.0-rc.21" }
+torin = { path = "./crates/torin", version = "0.4.0-rc.21" }
+ragnarok = { path = "./crates/ragnarok", version = "0.4.0-rc.21" }
+freya-clipboard = { path = "./crates/freya-clipboard", version = "0.4.0-rc.21" }
+freya-edit = { path = "./crates/freya-edit", version = "0.4.0-rc.21" }
+freya-winit = { path = "./crates/freya-winit", version = "0.4.0-rc.21" }
+freya-components = { path = "./crates/freya-components", version = "0.4.0-rc.21" }
+pathgraph = { path = "./crates/pathgraph/", version = "0.4.0-rc.21" }
+freya-animation = { path = "./crates/freya-animation", version = "0.4.0-rc.21" }
+freya-router = { path = "./crates/freya-router", version = "0.4.0-rc.21" }
+freya-router-macro = { path = "./crates/freya-router-macro", version = "0.4.0-rc.21" }
+freya-testing = { path = "./crates/freya-testing", version = "0.4.0-rc.21" }
+freya-i18n = { path = "./crates/freya-i18n", version = "0.4.0-rc.21" }
+freya-performance-plugin = { path = "./crates/freya-performance-plugin", version = "0.4.0-rc.21" }
+freya-radio = { path = "./crates/freya-radio", version = "0.4.0-rc.21" }
+freya-engine = { path = "./crates/freya-engine", version = "0.4.0-rc.21" }
+freya-devtools = { path = "./crates/freya-devtools", version = "0.4.0-rc.21" }
 freya-icons = { path = "./crates/freya-icons", features = [
   "all",
-], version = "0.4.0-rc.19" }
+], version = "0.4.0-rc.21" }
 freya-sdk = { path = "./crates/freya-sdk", features = [
   "all",
-], version = "0.4.0-rc.19" }
-freya-material-design = { path = "./crates/freya-material-design", version = "0.4.0-rc.19" }
-freya-plotters-backend = { path = "./crates/freya-plotters-backend", version = "0.4.0-rc.19" }
-freya-query = { path = "./crates/freya-query", version = "0.4.0-rc.19" }
-freya-webview = { path = "./crates/freya-webview", version = "0.4.0-rc.19" }
-freya-terminal = { path = "./crates/freya-terminal", version = "0.4.0-rc.19" }
-freya-code-editor = { path = "./crates/freya-code-editor", version = "0.4.0-rc.19", features = [
+], version = "0.4.0-rc.21" }
+freya-material-design = { path = "./crates/freya-material-design", version = "0.4.0-rc.21" }
+freya-plotters-backend = { path = "./crates/freya-plotters-backend", version = "0.4.0-rc.21" }
+freya-query = { path = "./crates/freya-query", version = "0.4.0-rc.21" }
+freya-webview = { path = "./crates/freya-webview", version = "0.4.0-rc.21" }
+freya-terminal = { path = "./crates/freya-terminal", version = "0.4.0-rc.21" }
+freya-code-editor = { path = "./crates/freya-code-editor", version = "0.4.0-rc.21", features = [
   "rust",
 ] }
-freya-android = { path = "./crates/freya-android", version = "0.4.0-rc.19" }
+freya-camera = { path = "./crates/freya-camera", version = "0.4.0-rc.21" }
+freya-android = { path = "./crates/freya-android", version = "0.4.0-rc.21" }
 mundy = { version = "0.2.3", default-features = false, features = [
   "async-io",
   "callback",
@@ -100,6 +102,7 @@ futures-util = "0.3.31"
 futures-channel = "0.3.31"
 futures-lite = "2.6.1"
 async-io = "2.5.0"
+async-channel = "2.5.0"
 blocking = "1.6.2"
 ureq = "3.1.4"
 serde = { version = "1", features = ["derive"] }
@@ -124,7 +127,7 @@ euclid = "0.22.9"
 itertools = "0.14.0"
 
 # Rendering
-freya-skia-safe = { version = "0.96.1", features = [
+freya-skia-safe = { version = "0.97.5", features = [
   "textlayout",
   "svg",
   "webp",

Cargo.toml

@@ -749,7 +749,7 @@ freya = { git = "https://github.com/marc2332/freya", branch = "main" }
 Release candidates:
 
 ```toml
-freya = "0.4.0-rc.19"
+freya = "0.4.0-rc.21"
 ```
 
 ### Contributing 🧙‍♂️
@@ -764,7 +764,7 @@ If you are interested in supporting the development of this project feel free to
 
 Thanks to my sponsors for supporting this project! 😄 
 
-<!-- sponsors --><a href="https://github.com/piny4man"><img src="https:&#x2F;&#x2F;github.com&#x2F;piny4man.png" width="60px" alt="User avatar: " /></a><a href="https://github.com/gqf2008"><img src="https:&#x2F;&#x2F;github.com&#x2F;gqf2008.png" width="60px" alt="User avatar: 高庆丰" /></a><a href="https://github.com/lino-levan"><img src="https:&#x2F;&#x2F;github.com&#x2F;lino-levan.png" width="60px" alt="User avatar: Lino Le Van" /></a><a href="https://github.com/d3rpp"><img src="https:&#x2F;&#x2F;github.com&#x2F;d3rpp.png" width="60px" alt="User avatar: Huddy Buddy" /></a><a href="https://github.com/DrigsterI"><img src="https:&#x2F;&#x2F;github.com&#x2F;DrigsterI.png" width="60px" alt="User avatar: Gabriel Jõe" /></a><a href="https://github.com/markalexander"><img src="https:&#x2F;&#x2F;github.com&#x2F;markalexander.png" width="60px" alt="User avatar: Mark" /></a><a href="https://github.com/Natane0808"><img src="https:&#x2F;&#x2F;github.com&#x2F;Natane0808.png" width="60px" alt="User avatar: Natane" /></a><!-- sponsors -->
+<!-- sponsors --><a href="https://github.com/piny4man"><img src="https:&#x2F;&#x2F;github.com&#x2F;piny4man.png" width="60px" alt="User avatar: " /></a><a href="https://github.com/gqf2008"><img src="https:&#x2F;&#x2F;github.com&#x2F;gqf2008.png" width="60px" alt="User avatar: 高庆丰" /></a><a href="https://github.com/lino-levan"><img src="https:&#x2F;&#x2F;github.com&#x2F;lino-levan.png" width="60px" alt="User avatar: Lino Le Van" /></a><a href="https://github.com/d3rpp"><img src="https:&#x2F;&#x2F;github.com&#x2F;d3rpp.png" width="60px" alt="User avatar: Huddy Buddy" /></a><a href="https://github.com/DrigsterI"><img src="https:&#x2F;&#x2F;github.com&#x2F;DrigsterI.png" width="60px" alt="User avatar: Gabriel Jõe" /></a><a href="https://github.com/markalexander"><img src="https:&#x2F;&#x2F;github.com&#x2F;markalexander.png" width="60px" alt="User avatar: Mark" /></a><!-- sponsors -->
 
 ### Special thanks 💪
 

README.md

@@ -1,6 +1,6 @@
 [package]
 name = "freya-android"
-version = "0.4.0-rc.19"
+version = "0.4.0-rc.21"
 description = "Android integration for Freya"
 edition = "2024"
 license = "MIT"
@@ -13,12 +13,6 @@ categories = ["gui"]
 [lints]
 workspace = true
 
-[package.metadata.docs.rs]
-features = ["freya-core/mocked-engine"]
-
-[features]
-skia-engine = ["freya-core/skia-engine"]
-
 [dependencies]
 freya-core = { workspace = true }
 freya-components = { workspace = true }

crates/freya-android/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "freya-animation"
-version = "0.4.0-rc.19"
+version = "0.4.0-rc.21"
 description = "Animation APIs for Freya"
 edition = "2024"
 readme = "../../README.md"
@@ -14,12 +14,6 @@ categories = ["gui"]
 [lints]
 workspace = true
 
-[package.metadata.docs.rs]
-features = ["freya-core/mocked-engine"]
-
-[features]
-skia-engine = ["freya-core/skia-engine"]
-
 [dependencies]
 freya-core = { workspace = true }
 easer = { workspace = true }

crates/freya-animation/Cargo.toml

@@ -0,0 +1,26 @@
+[package]
+name = "freya-camera"
+version = "0.4.0-rc.21"
+description = "Camera capture support for Freya."
+edition = "2024"
+license = "MIT"
+authors = ["Marc Espín <mespinsanz@gmail.com>"]
+readme = "../../README.md"
+homepage = "https://freyaui.dev/"
+repository = "https://github.com/marc2332/freya"
+keywords = ["freya", "camera", "webcam", "video"]
+categories = ["gui", "multimedia::video"]
+
+[lints]
+workspace = true
+
+[dependencies]
+freya-core = { workspace = true }
+freya-engine = { workspace = true }
+nokhwa = { version = "0.10", features = ["input-native"] }
+blocking = { workspace = true }
+bytes = { workspace = true }
+tracing = { workspace = true }
+
+[dev-dependencies]
+freya = { path = "../freya" }

crates/freya-camera/Cargo.toml

@@ -0,0 +1,86 @@
+//! Camera configuration types.
+
+pub use nokhwa::{
+    NokhwaError as CameraError,
+    utils::{
+        CameraIndex,
+        CameraInfo,
+    },
+};
+use nokhwa::{
+    query as nokhwa_query,
+    utils::ApiBackend,
+};
+
+/// Requested capture format. The negotiated values are reported via [`StreamInfo`].
+#[derive(Clone, Debug, PartialEq, Eq, Hash, Default)]
+pub enum CameraFormat {
+    /// Highest framerate available, any resolution.
+    #[default]
+    HighestFrameRate,
+    /// Highest resolution available, any framerate.
+    HighestResolution,
+    /// Highest framerate at the given resolution.
+    Resolution { width: u32, height: u32 },
+    /// Closest match to the given resolution and framerate.
+    Exact {
+        width: u32,
+        height: u32,
+        frame_rate: u32,
+    },
+}
+
+/// Configuration used to open a camera.
+#[derive(Clone, Debug, PartialEq, Eq, Hash)]
+pub struct CameraConfig {
+    pub device: CameraIndex,
+    pub format: CameraFormat,
+}
+
+impl Default for CameraConfig {
+    fn default() -> Self {
+        Self {
+            device: CameraIndex::Index(0),
+            format: CameraFormat::default(),
+        }
+    }
+}
+
+impl CameraConfig {
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    pub fn device(mut self, device: CameraIndex) -> Self {
+        self.device = device;
+        self
+    }
+
+    pub fn format(mut self, format: CameraFormat) -> Self {
+        self.format = format;
+        self
+    }
+}
+
+/// Negotiated information about a running camera.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct StreamInfo {
+    pub width: u32,
+    pub height: u32,
+    pub frame_rate: u32,
+}
+
+/// Enumerate the cameras available on the system.
+///
+/// # Example
+///
+/// ```rust, no_run
+/// use freya::camera::*;
+///
+/// for device in query().unwrap_or_default() {
+///     println!("{}: {}", device.human_name(), device.description());
+/// }
+/// ```
+pub fn query() -> Result<Vec<CameraInfo>, CameraError> {
+    nokhwa_query(ApiBackend::Auto)
+}