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

Merge pull request #70 from Roughack/senpai

Browse Source 
Correctly convert from intervals to framerate
This commit is contained in:
l1npengtul (Lua)
2022-11-11 19:22:52 -08:00
committed by GitHub
parent a6909afa82 d0ffe4f8c6
commit 4c5bc35bfc
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/backends/capture/v4l2_backend.rs
+9 -9
View File
@@ -167,11 +167,11 @@ impl<'a> V4LCaptureDevice<'a> {
.into_iter()
.flat_map(|x| match x.interval {
FrameIntervalEnum::Discrete(dis) => {
if dis.denominator == 1 {
if dis.numerator == 1 {
vec![CameraFormat::new(
Resolution::new(x.width, x.height),
framefmt,
dis.numerator,
dis.denominator,
)]
} else {
vec![]
@@ -244,7 +244,7 @@ impl<'a> V4LCaptureDevice<'a> {
};
v4l2.force_refresh_camera_format()?;
if v4l2.camera_format() == format {
if v4l2.camera_format() != format {
return Err(NokhwaError::SetPropertyError {
property: "CameraFormat".to_string(),
value: String::new(),
@@ -331,22 +331,22 @@ impl<'a> V4LCaptureDevice<'a> {
let fps = match self.device.params() {
Ok(params) => {
if params.interval.denominator != 1
|| params.interval.numerator % params.interval.denominator != 0
if params.interval.numerator != 1
|| params.interval.denominator % params.interval.numerator != 0
{
return Err(NokhwaError::GetPropertyError {
property: "V4L2 FrameRate".to_string(),
error: format!(
"Framerate not whole number: {} / {}",
params.interval.numerator, params.interval.denominator
params.interval.denominator, params.interval.numerator
),
});
}
if params.interval.denominator == 1 {
params.interval.numerator
if params.interval.numerator == 1 {
params.interval.denominator
} else {
params.interval.numerator / params.interval.denominator
params.interval.denominator / params.interval.numerator
}
}
Err(why) => {