GRIN/nokhwa
1
0
Fork 0
mirror of https://github.com/l1npengtul/nokhwa.git synced 2026-07-19 15:58:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

intermidiate commit because this thing won't stop indexing

Browse Source
This commit is contained in:
l1npengtul
2022-07-23 19:47:09 +09:00
parent 2923fde18e
commit fc990dd4df
5 changed files with 23 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.toml
+2 -2
View File
@@ -11,8 +11,8 @@ repository = "https://github.com/l1npengtul/nokhwa"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[workspace]
members = ["nokhwa-bindings-macos", "nokhwa-bindings-windows"]
exclude = ["examples/threaded-capture", "examples/capture"]
members = ["nokhwa-bindings-macos", "nokhwa-bindings-windows", "examples/*"]
exclude = ["examples/jscam"]
[lib]
crate-type = ["cdylib", "rlib"]
src/backends/capture/v4l2_backend.rs
+1 -1
View File
@@ -31,7 +31,7 @@ use std::{
};
use v4l::{
buffer::Type,
control::{Control, Description, Flags, Value},
control::{Control, Flags, Value},
frameinterval::FrameIntervalEnum,
framesize::FrameSizeEnum,
io::traits::CaptureStream,
src/js_camera.rs
+2 -1
View File
@@ -21,6 +21,7 @@
//! This assumes that you are running a modern browser on the desktop.
use crate::{CameraIndex, CameraInfo, NokhwaError, Resolution};
use gstreamer::Array;
use image::{buffer::ConvertBuffer, ImageBuffer, Rgb, RgbImage, Rgba};
#[cfg(feature = "output-wasm")]
use js_sys::{Array, JsString, Map, Object, Promise};
@@ -1678,7 +1679,7 @@ impl Deref for JSCameraConstraints {
/// # JS-WASM
/// This is exported as `NokhwaCamera`.
#[cfg(feature = "output-wasm")]
#[cfg_attr(feature = "output-wasm", wasm_bindgen(js_name = NokhwaCamera))#[cfg(feature = "output-wasm")]]
#[cfg_attr(feature = "output-wasm", wasm_bindgen(js_name = NokhwaCamera))]
#[cfg_attr(feature = "docs-features", doc(cfg(feature = "input-jscam")))]
pub struct JSCamera {
media_stream: MediaStream,
src/query.rs
-12
View File
@@ -52,10 +52,6 @@ pub fn query_devices(api: CaptureAPIBackend) -> Result<Vec<CameraInfo>, NokhwaEr
"linux" => {
if cfg!(feature = "input-v4l") && cfg!(target_os = "linux") {
query_devices(CaptureAPIBackend::Video4Linux)
} else if cfg!(feature = "input-uvc") {
query_devices(CaptureAPIBackend::UniversalVideoClass)
} else if cfg!(feature = "input-gstreamer") {
query_devices(CaptureAPIBackend::GStreamer)
} else if cfg!(feature = "input-opencv") {
query_devices(CaptureAPIBackend::OpenCv)
} else {
@@ -67,10 +63,6 @@ pub fn query_devices(api: CaptureAPIBackend) -> Result<Vec<CameraInfo>, NokhwaEr
"windows" => {
if cfg!(feature = "input-msmf") && cfg!(target_os = "windows") {
query_devices(CaptureAPIBackend::MediaFoundation)
} else if cfg!(feature = "input-uvc") {
query_devices(CaptureAPIBackend::UniversalVideoClass)
} else if cfg!(feature = "input-gstreamer") {
query_devices(CaptureAPIBackend::GStreamer)
} else if cfg!(feature = "input-opencv") {
query_devices(CaptureAPIBackend::OpenCv)
} else {
@@ -82,10 +74,6 @@ pub fn query_devices(api: CaptureAPIBackend) -> Result<Vec<CameraInfo>, NokhwaEr
"macos" => {
if cfg!(feature = "input-avfoundation") {
query_devices(CaptureAPIBackend::AVFoundation)
} else if cfg!(feature = "input-uvc") {
query_devices(CaptureAPIBackend::UniversalVideoClass)
} else if cfg!(feature = "input-gstreamer") {
query_devices(CaptureAPIBackend::GStreamer)
} else if cfg!(feature = "input-opencv") {
query_devices(CaptureAPIBackend::OpenCv)
} else {
src/utils.rs
+18 -21
View File
@@ -37,7 +37,7 @@ use nokhwa_bindings_windows::{
MFCameraFormat, MFControl, MFFrameFormat, MFResolution, MediaFoundationControls,
MediaFoundationDeviceDescriptor,
};
#[cfg(feature = serde)]
#[cfg(feature = "serde")]
use serde::{Deserialize, Serialize};
use std::{
borrow::Borrow,
@@ -502,16 +502,11 @@ impl CameraInfo {
// OK, i just checkeed back on this code. WTF was I on when I wrote `&(impl AsRef<str> + ?Sized)` ????
// I need to get on the same shit that my previous self was on, because holy shit that stuff is strong as FUCK!
// Finally fixed this insanity. Hopefully I didnt torment anyone by actually putting this in a stable release.
pub fn new(
human_name: impl AsRef<str>,
description: impl AsRef<str>,
misc: impl AsRef<str>,
index: u32,
) -> Self {
pub fn new(human_name: &str, description: &str, misc: &str, index: u32) -> Self {
CameraInfo {
human_name: human_name.as_ref().to_string(),
description: description.as_ref().to_string(),
misc: misc.as_ref().to_string(),
human_name: human_name.to_string(),
description: description.to_string(),
misc: misc.to_string(),
index,
}
}
@@ -524,8 +519,10 @@ impl CameraInfo {
feature = "output-wasm",
wasm_bindgen(getter = HumanReadableName)
)]
pub fn human_name(&self) -> &'_ str {
self.human_name.borrow()
// yes, i know, unnecessary alloc this, unnecessary alloc that
// but wasm bindgen
pub fn human_name(&self) -> String {
self.human_name.clone()
}
/// Set the device info's human name.
@@ -535,8 +532,8 @@ impl CameraInfo {
feature = "output-wasm",
wasm_bindgen(setter = HumanReadableName)
)]
pub fn set_human_name<S: AsRef<str>>(&mut self, human_name: S) {
self.human_name = human_name.as_ref().to_string();
pub fn set_human_name(&mut self, human_name: &str) {
self.human_name = human_name.to_string();
}
/// Get a reference to the device info's description.
@@ -544,7 +541,7 @@ impl CameraInfo {
/// This is exported as a `get_Description`.
#[must_use]
#[cfg_attr(feature = "output-wasm", wasm_bindgen(getter = Description))]
pub fn description(&self) -> &'_ str {
pub fn description(&self) -> &str {
self.description.borrow()
}
@@ -552,8 +549,8 @@ impl CameraInfo {
/// # JS-WASM
/// This is exported as a `set_Description`.
#[cfg_attr(feature = "output-wasm", wasm_bindgen(setter = Description))]
pub fn set_description<S: AsRef<str>>(&mut self, description: S) {
self.description = description.as_ref().to_string();
pub fn set_description(&mut self, description: &str) {
self.description = description.to_string();
}
/// Get a reference to the device info's misc.
@@ -561,16 +558,16 @@ impl CameraInfo {
/// This is exported as a `get_MiscString`.
#[must_use]
#[cfg_attr(feature = "output-wasm", wasm_bindgen(getter = MiscString))]
pub fn misc(&self) -> &'_ str {
self.misc.borrow()
pub fn misc(&self) -> String {
self.misc.clone()
}
/// Set the device info's misc.
/// # JS-WASM
/// This is exported as a `set_MiscString`.
#[cfg_attr(feature = "output-wasm", wasm_bindgen(setter = MiscString))]
pub fn set_misc<S: AsRef<str>>(&mut self, misc: S) {
self.misc = misc.as_ref().to_string();
pub fn set_misc(&mut self, misc: &str) {
self.misc = misc.to_string();
}
/// Get a reference to the device info's index.