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

Fix autoLamp and FPS settings #239

Merged
merged 4 commits into from
May 9, 2022

Conversation

daschr
Copy link

@daschr daschr commented Mar 27, 2022

Hi,

I've fixed the points in #237 (comment)

I've needed to rename the cam_streamer.c to cam_streamer.cpp to link against the CPP functions setLamp for the autolamp support.

One minor problem is the definition of MIN_FRAME_TIME and CAM_STREAMER_MAX_CLIENTS in the "myconfig.h", since one cannot simply include it in app_httpd.cpp and cam_streamer.cpp (redefinition of stationList). Maybe you've got some idea how we can solve this.

Cheers,

David

@easytarget
Copy link
Owner

Cool. I'm on the road today, will look once home.

I deal with the settings in myconfig .h, it's crude, just processing them in a huge set of #if defined ... blocks and then setting an exported global to be included wherever needed. When back at my desktop I can have a look and make a more concrete suggestion.

@daschr
Copy link
Author

daschr commented Apr 12, 2022

Hi,

one can now set the minimum frame delay (MIN_FRAME_TIME) and maximum number of concurrent streaming clients (CAM_STREAMER_MAX_CLIENTS). There is a minor change in the myconfig.sample.h; the stationList must be const (preventing redeclaration of stationList).

Cheers,

David

@daschr
Copy link
Author

daschr commented May 8, 2022

Hi @easytarget ,

are there some issues which need to be solved until the multiclient streaming feature gets merged into the main branch?
I'm willed to provide you with more patches for getting it into main.

Cheers,

David

@easytarget
Copy link
Owner

Hi David,
No, I've just had to focus on some personal and job issues recently and not had any time or mental space for this. I was also vaguely waiting for Expressif to drop the 2.0.3 core release before I did anything further.

I have, in the menatime been running your code on a test camera very successfully.

My plan is to deal with your branch next. I want to do a 4.1 release with this asap.

@daschr
Copy link
Author

daschr commented May 8, 2022

Hi,

no problem! Take your time.

Cheers,

David

@easytarget easytarget merged commit 095e221 into easytarget:multi-stream May 9, 2022
@easytarget
Copy link
Owner

Ok, I just merged this, I'll test locally and see what shakes out.

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.

2 participants