Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Camera disconnected + stream normalization improvements #1701

Open
wants to merge 8 commits into
base: main
Choose a base branch
from

Conversation

DevonRD
Copy link
Contributor

@DevonRD DevonRD commented Jan 11, 2025

Images are before and after comparison.
Does the following:

  • Fixes logic for disconnected cameras in camera matching view to properly indicate the actual status of the camera. Previously disconnected cameras were falsely flagged as mismatches.
    image
    image

  • Sorts camera modules by (active, connected) / mismatch -> (active, disconnected) -> deactivated -> unassigned

  • Massively (as far as I can tell) improves camera stream height normalization logic in camera matching view, and guts all the unnecessary logic previously used to accomplish this
    image
    (verification that it works, for me at least)

Disclaimer: if anyone was super attached to the yellow loading spinner, it had to go to make this cleaner stream normalization work out. It's one of these guys now, which I happen to think is cleaner looking anyway:
image
P.S. camera lost image, don't think I didn't see you...

@DevonRD DevonRD requested a review from a team as a code owner January 11, 2025 07:21
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the source and license for this image?

Copy link
Contributor Author

@DevonRD DevonRD Jan 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't think of that when I found it, but after looking back it seems it was made by someone on a GitHub PR in 2020:
FAForever/downlords-faf-client#1665

Unsure if this is an issue. Opinions on this? There weren't many other good ones I could find that looked clean in this.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The repo is MIT licensed. But does that cover non-merged content? I’m not sure.

@mcm001
Copy link
Contributor

mcm001 commented Jan 12, 2025

If I try to "start calibration", I don't see the processed stream (it almost seems to freeze). But if I manually navigate to http://10.17.36.12:1181/stream.mjpg and http://10.17.36.12:1182/stream.mjpg , I do. And if I reload the webpage, I see it too.

@DevonRD
Copy link
Contributor Author

DevonRD commented Jan 13, 2025

If I try to "start calibration", I don't see the processed stream (it almost seems to freeze). But if I manually navigate to http://10.17.36.12:1181/stream.mjpg and http://10.17.36.12:1182/stream.mjpg , I do. And if I reload the webpage, I see it too.

Odd, I can't seem to reproduce this, is it device/camera specific? Quickly tested on vite dev run with arducam 9281

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants