Isaac Connor
|
c61d5ce341
|
Implement ZOOMSTOP for live monitor view
|
2023-04-13 12:25:08 -04:00 |
|
Isaac Connor
|
87f4f9afbd
|
Add scale to status for monitorStream
|
2023-04-06 19:02:50 -04:00 |
|
Isaac Connor
|
a7b1379502
|
Add AVPixelFormat to shm for each image, disable analysis image viewing. The cp to shm is too expensive. Need something better.
|
2023-02-22 05:59:16 -05:00 |
|
Isaac Connor
|
5fdf66b51c
|
Instead of return, set zm_terminate and continue so that we join the command processor thread and don't crash
|
2022-11-16 10:33:10 -05:00 |
|
Isaac Connor
|
de012de198
|
Add a debug to tell if we got back from joining command_processor
|
2022-10-25 09:22:17 -04:00 |
|
Isaac Connor
|
c2680f7f77
|
Turn failure to send into a debug. When running under fpm etc we may not get SIGPIPE.
|
2022-10-17 17:22:23 -04:00 |
|
Isaac Connor
|
8558ade8f1
|
Merge branch 'master' into misc_fixes
|
2022-08-25 18:33:06 -04:00 |
|
Isaac Connor
|
e655cc345f
|
Fix crash due to deplicated join.
|
2022-08-16 15:16:37 -04:00 |
|
Isaac Connor
|
aa030afcb6
|
Make checkCommandQueue it's own thread, meaning we use blocking I/O and will still respond when it takes forever to send a jpeg. Make warning about broken stream into a Debug. The signal doesn't set zm_terminate fast enough.
|
2022-08-15 17:58:56 -04:00 |
|
Doug Nazar
|
9385127b50
|
Consolidate temp_img_buffer resizing and use correct delete[] operator
|
2022-07-30 22:27:41 -04:00 |
|
Isaac Connor
|
05155cff73
|
Zoom by 10% instead of 25%
|
2022-05-07 11:38:10 -04:00 |
|
Isaac Connor
|
8d38d1c36e
|
Implement 25% zoom incrementts with no max
|
2022-05-06 12:11:47 -04:00 |
|
Isaac Connor
|
c42a5759a4
|
Remove unneeded setLastViewed
|
2022-04-28 19:17:21 -04:00 |
|
Isaac Connor
|
a247645046
|
Use std::this_thread::sleep_for(MAX_SLEEP); instead
|
2022-04-28 17:13:47 -04:00 |
|
Isaac Connor
|
aab717bc91
|
Add early test for zm_terminate after processing comms
|
2022-04-28 16:45:54 -04:00 |
|
Isaac Connor
|
554217931c
|
Remove debugging
|
2022-04-28 16:43:13 -04:00 |
|
Isaac Connor
|
eeb69cbb54
|
Move the tests for monitor connectedness down into the main while loop so that we also check for feof etc. The gist is to stay running even if monitor is not running. We will wait for it to come back
|
2022-04-28 16:41:11 -04:00 |
|
Isaac Connor
|
e7dcfa6166
|
Put back code that calculates how long it takes to send a frame, but make it just a debug instead of a warning when we are too slow
|
2022-04-20 09:58:37 -04:00 |
|
Isaac Connor
|
88665a68f5
|
Don't warn about not being able to keep up to maxfps
|
2022-04-10 13:09:55 -04:00 |
|
Isaac Connor
|
ed41e63980
|
Can't treat anlysing as a boolean because ANALYSING_NONE==1. Should fix zm oing motion detection when set to NONE
|
2022-03-20 19:13:46 -04:00 |
|
Isaac Connor
|
9b9746113e
|
If we asked for stream, keep streaming even not decoding or other problem. We will wait for the situation to change
|
2022-03-04 12:06:24 -05:00 |
|
Isaac Connor
|
cd2c977ed8
|
Merge branch 'master' into replace_function_concept
|
2022-02-16 14:25:38 -05:00 |
|
Isaac Connor
|
c9de883a7c
|
Rework to remove static temp_img_buffer. Is now a class member. Must be allocated as needed.
|
2022-02-16 14:18:37 -05:00 |
|
Isaac Connor
|
23bfbcd6ce
|
Merge branch 'master' into multistream
|
2022-01-26 10:13:20 -05:00 |
|
Isaac Connor
|
05043a37b1
|
include image index in debug
|
2022-01-19 12:27:16 -05:00 |
|
Isaac Connor
|
fd3a70172d
|
Merge branch 'master' into multistream
|
2022-01-10 17:51:50 -05:00 |
|
Isaac Connor
|
76fe20c69f
|
Only send analysis_frame if doing motion detection. Add debuging. Remove other debugging
|
2022-01-07 15:57:28 -05:00 |
|
Isaac Connor
|
df0a0c7853
|
Add CMD_ANALYZE_ON and OFF
|
2022-01-07 13:50:40 -05:00 |
|
Isaac Connor
|
58858d2d25
|
Include alarm_image in shared_mem
|
2022-01-07 13:12:44 -05:00 |
|
Isaac Connor
|
6d3c6330df
|
Fix freebsd build by fixing incorrect use of SystemTimePoint when we want TimePoint
|
2022-01-07 10:34:44 -05:00 |
|
Isaac Connor
|
aefed4e174
|
Merge branch 'master' into multistream
|
2022-01-05 18:03:44 -05:00 |
|
Isaac Connor
|
8c8a9ca32a
|
Rework the logic around waiting for capture to be in both single jpeg mode and streaming.
|
2022-01-01 17:54:20 -05:00 |
|
Isaac Connor
|
a66adb6dcd
|
fix SteadyClock vs Systemclock issues
|
2021-12-31 18:36:23 -05:00 |
|
Isaac Connor
|
6bd04de5f6
|
Merge branch 'master' into multistream
|
2021-12-31 17:53:36 -05:00 |
|
Isaac Connor
|
5933aa8a6f
|
Use > 0.0 instead of boolean when testing maxfps
|
2021-12-28 15:34:31 -05:00 |
|
Isaac Connor
|
81048b6191
|
Reduce code
|
2021-12-17 13:29:30 -05:00 |
|
Isaac Connor
|
77793da70e
|
If no max_fps set we don't care how long it takes to send frame
|
2021-12-17 13:29:30 -05:00 |
|
Isaac Connor
|
60d2186ff4
|
Move from SystemTimePoint to SteadyTimePoint where possible. Implement MAXFPS command. Change the logic of calculating sleep time to make more sense. Get rid of frame_mod use in favour of calculating when then next frame should get sent and just waiting till then.
|
2021-12-16 16:35:20 -05:00 |
|
Isaac Connor
|
4edd5c1bf5
|
Don't alter maxfps. Just report that we are too slow. Don't use ZM_RATE_BASE in sleep time calculations it amplifies the sleep seconds by 100 times. Removing allows us to view a full framerate.
|
2021-12-15 16:57:17 -05:00 |
|
Isaac Connor
|
2529765df3
|
timestamp image before scaling. Fixes lack of scaling when TIMESTAMP_ON_CAPTURE
is off
|
2021-11-19 11:59:19 -05:00 |
|
Isaac Connor
|
c76e688f05
|
Don't exit(0) on QUIT. Instead set zm_terminate=true so that all the cleanup routines run.
|
2021-11-12 15:11:48 -05:00 |
|
Isaac Connor
|
824322dff6
|
spacing and setLastViewed in monitor when streaming
|
2021-10-24 17:43:02 -04:00 |
|
Mike Dussault
|
d38a6adec4
|
No behavior change. Added non-const versions of Image::Buffer and fixed a few places that were casting away the constness.
|
2021-10-12 21:54:49 +00:00 |
|
Isaac Connor
|
a9379e5813
|
Need to increase frame_count or else frame_count%frame_mod will never == 0
|
2021-09-10 10:58:06 -04:00 |
|
Isaac Connor
|
328bd15360
|
Fix frame_count fps when paused
|
2021-08-30 18:06:05 -04:00 |
|
Isaac Connor
|
381fa0d08d
|
Fix viewing fps display by keeping track of last update time, last frame count and actually calculate it based on frames sent over a period of time.
|
2021-08-30 17:55:32 -04:00 |
|
Isaac Connor
|
848a537a0f
|
Fix zms giving 500 code instead of displaying error image due to not having sent the headers yet.
|
2021-08-23 18:10:31 -04:00 |
|
Peter Keresztes Schmidt
|
80b08a2075
|
Convert path buffers depending on PATH_MAX to std::string
|
2021-07-06 10:33:17 +02:00 |
|
Peter Keresztes Schmidt
|
6114d40593
|
misc: Replace usleep with std::this_thread::sleep_for
|
2021-06-13 23:22:51 +02:00 |
|
Peter Keresztes Schmidt
|
707975e567
|
Monitor: Convert API to std::chrono
|
2021-06-13 23:22:49 +02:00 |
|