Skip to content

Commit

Permalink
new format request type, quartar way wasm cam impl
Browse files Browse the repository at this point in the history
  • Loading branch information
l1npengtul committed Aug 31, 2023
1 parent 074765f commit 67139b8
Show file tree
Hide file tree
Showing 9 changed files with 700 additions and 528 deletions.
12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ input-native = ["input-avfoundation", "input-v4l", "input-msmf"]
# Re-enable it once soundness has been proven + mozjpeg is updated to 0.9.x
# input-uvc = ["uvc", "uvc/vendor", "usb_enumeration", "lazy_static"]
input-opencv = ["opencv", "opencv/rgb", "rgb", "nokhwa-core/opencv-mat"]
input-jscam = ["web-sys", "js-sys", "wasm-bindgen-futures", "wasm-bindgen", "wasm-rs-async-executor", "output-async"]
# FIXME: Change me back to web-sys being optional! People will be mad otherwise peg!
input-jscam = [ "wasm-bindgen-futures", "wasm-rs-async-executor", "output-async"]
output-wgpu = ["wgpu", "nokhwa-core/wgpu-types"]
#output-wasm = ["input-jscam"]
output-threaded = []
Expand Down Expand Up @@ -65,11 +66,11 @@ version = "0.2"
optional = true

[dependencies.wgpu]
version = "0.16"
version = "0.17"
optional = true

[dependencies.opencv]
version = "0.82"
version = "0.84"
default-features = false
features = ["videoio"]
optional = true
Expand Down Expand Up @@ -97,6 +98,7 @@ optional = true
version = "1.7"
optional = true

# TODO: Change me back!
[dependencies.web-sys]
version = "0.3"
features = [
Expand All @@ -116,15 +118,13 @@ features = [
"Plugin", "PluginArray",
"Window"
]
optional = true

# FIXME: Change me back! Pls! REMEMBER PEG!
[dependencies.js-sys]
version = "0.3"
optional = true

[dependencies.wasm-bindgen]
version = "0.2"
optional = true

[dependencies.wasm-bindgen-futures]
version = "0.4"
Expand Down
2 changes: 1 addition & 1 deletion nokhwa-bindings-linux/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#[cfg(target_os = "linux")]
mod internal {
use nokhwa_core::format_filter::FormatFilter;
use nokhwa_core::format_request::FormatFilter;
use nokhwa_core::{
buffer::Buffer,
error::NokhwaError,
Expand Down
230 changes: 0 additions & 230 deletions nokhwa-core/src/format_filter.rs

This file was deleted.

Loading

0 comments on commit 67139b8

Please sign in to comment.