1e38cf8bb7
Fix monitor type labels by adding an Unknown for entry 0. Implement Function_Strings. Fix decoding_enabled not being recalculated correctly because we havn't loaded savejpegs or videowriter yet.
2021-10-25 16:40:21 -04:00
52f0240334
free and re-init opts as needed
2021-10-19 13:05:11 -04:00
6d7f752eb0
Only record when in modect or nodect. Linked monitors would cause a monitor in monitor mode to record
2021-10-19 13:04:49 -04:00
14e6d660e7
Respect the encoder options for the header write.
...
Fixes an issue where the encoder options were ignored in the
passthrough case, because the options were free'ed and not
re-initialized.
2021-10-18 20:15:02 -07:00
9f023f7bdd
Merge pull request #3372 from SudoMike/writable_image_buffer_function
...
Added non-const versions of Image::Buffer
2021-10-17 19:11:39 -04:00
e1d49ea172
fix index -> image_index
2021-10-17 15:13:34 -04:00
3f6d6fe7a0
Improve debug logging of packetqueue cleaning
2021-10-17 15:02:31 -04:00
6c4156a483
Remove sleeping from Analysis thread. It is uneccessary and results in us starting off way behind the capture thread. It also limits us to 30fps.
2021-10-15 09:56:14 -04:00
086bf7a84f
introduce new logic that keeps the initial keyframe and deletes 1 video frame after it to keep the count down. Also any audio frames it encounters.
2021-10-14 12:47:51 -04:00
411d15605a
We can lockup if MaxImageBufferCount is less than keyframe interval. Give up after 10 tries and drop the packet
2021-10-14 10:08:51 -04:00
8a9c283c1c
Fix loading importance. Needs to be -1 not -2. The first value is 1, but we want zero based.
2021-10-13 16:06:22 -04:00
74ac79479f
notifying before waiting serves no purpose because we have the lock
2021-10-13 15:02:07 -04:00
4fee4d01e3
always correct decoding_enable, as zms needs to know it's correct value
2021-10-13 15:01:46 -04:00
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
0bac052a0a
Merge pull request #3370 from SudoMike/add_benchmarks
...
Add a zmbenchmark program
2021-10-12 13:43:00 -04:00
cd45c61555
Use mt19937 as PRNG
...
Reasons: It's faster than rand() and can be made thread-safe
2021-10-12 19:18:21 +02:00
c027b7a38d
Fix some clang-tidy warnings
2021-10-12 19:05:22 +02:00
97b38bd4ab
Align changes with our codestyle
...
See https://google.github.io/styleguide/cppguide.html for reference
2021-10-12 18:53:31 +02:00
c6cac57fb1
remove bogus wanring
2021-10-12 12:45:06 -04:00
0ba3d863a6
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2021-10-12 12:25:01 -04:00
814124251e
Fixed a CodeQL complaint
2021-10-11 23:57:20 +00:00
2cf16eb495
Removed some unused code and added more function comments
2021-10-11 15:58:30 -07:00
146ff1ac7a
Print the benchmark results in a nicer table
2021-10-11 15:53:29 -07:00
e4542de6f2
Fixed random image generation, and now it shows a proper (giant) perf difference between images that take longer for Zone's FILTERED_PIXELS detection to deal with.
2021-10-11 14:21:08 -07:00
9370cfe25c
Added TimeSegmentAdder class and got benchmark output looking ok.
2021-10-11 21:12:46 +00:00
305af08112
Added Monitor scaffolding and a skeleton benchmark for DetectMotion.
2021-10-11 20:22:10 +00:00
3723e136b1
Initial benchmark exe
2021-10-11 19:44:58 +00:00
614750963b
spacing
2021-10-07 12:37:03 -04:00
7079516e09
Fix indexing of camera type enum so that printing out from CameraType_Strings works
2021-10-07 12:36:28 -04:00
2dfbc013cb
Fix curl cameras. PrimeCapture and PreCapture and PostCapture need to return 1. Also need to populate the packet and video stream.
2021-10-07 12:35:56 -04:00
7f09cddcd7
split actionBrightness etc into two different functions for get/set. This allows negative values to be set
2021-10-05 19:49:42 -04:00
52129c94ec
spacing. Use a separate boolean to tell if we have specified a new value for controls. This allows negative settings. Fix zmy outputting brightness when contrast is specified.
2021-10-05 19:49:42 -04:00
ba26235763
further deprecate v4l2 tests and spacing
2021-10-05 19:49:42 -04:00
75a014321e
Spacing, remove tests for v4l2, move control setting/getting code to a single function.
2021-10-05 19:49:42 -04:00
509a5549be
Merge branch 'master' of https://github.com/ZoneMinder/zoneminder
2021-09-28 10:31:04 -04:00
aca477e737
Add warning when MaxImageBufferCount is less than keyframe interval
2021-09-28 10:30:51 -04:00
95a7c6c32f
fix crash on 32bit pi due to use of %ld instead of %PRId64
2021-09-28 10:29:41 -04:00
ac375bc623
fix errant =
2021-09-27 11:03:29 -04:00
202d95fc5a
handle AV_HWDEVICE_TYPE_MMAL not being defined
2021-09-27 10:58:16 -04:00
c78e035057
Fix crash due to int64 cast to a %ld format.
2021-09-23 19:07:07 -04:00
aae967e895
Add mmal device/pix fmt type
2021-09-23 16:39:35 -04:00
30fa641186
initialize video_first_pts and when setting it need to specify microseconds otherwise we get nanoseconds. White space.
2021-09-21 14:29:05 -04:00
fba7dba3d0
Reduce logging level to debug dealing with index == -1, which is used in zmu to mean the last captured image. Fixes #3354
2021-09-16 10:03:30 -04:00
6009bba339
Set mysql character set to utf8 explicitly to support chinese characters (or other special characters).
2021-09-16 14:41:24 +08:00
e6f4cdb584
Remove redundant notify_all, spelling mistake
2021-09-15 13:38:06 -04:00
3f97df72c8
Fixed a bug in Image::Buffer that would return the wrong location in the image if the image had > 1 channels (and if the request were for x > 0).
2021-09-15 10:13:02 -07:00
1ee85caaae
Don't crash when unable to create source. erase will call the desctructor. Fixes #3344
2021-09-15 12:56:39 -04:00
d2cf89565e
wait won't wake up other threads, so notify first. Since we have the lock, this should be ok
2021-09-15 12:53:41 -04:00
bf5c0a8617
More properly fix the threading lock. Instead of waiting on a packet, release it and wait on the packetqueue.
2021-09-14 16:21:32 -04:00
167dece604
Revert "use get_packet_and_increment_it instead of the two step to improve locking"
...
This reverts commit a44bbf8e34
2021-09-14 15:47:35 -04:00
e140620900
notify anyone waiting in packetqueue before waiting on a packet in motion detection. Should fix decode lockup
2021-09-14 13:38:55 -04:00
58f933ba1e
Add missing update_function_pointers so that we use SSE blend functions. Significantly reduces cpu use in motion detection.
2021-09-13 15:03:42 -04:00
5fda85bf2e
Image: Codestyle changes
2021-09-12 11:38:44 +02:00
ecf6cc80aa
Image: Fix Wclobbered warnings
...
From C99 spec:
[...] objects of automatic storage duration that are local to the function containing the invocation of the corresponding setjmp macro that do not have volatile-qualified type and have been changed between the setjmp invocation and longjmp call are indeterminate
Remove the variables in question or pass them as const refs.
2021-09-12 11:36:51 +02:00
a9379e5813
Need to increase frame_count or else frame_count%frame_mod will never == 0
2021-09-10 10:58:06 -04:00
a44bbf8e34
use get_packet_and_increment_it instead of the two step to improve locking
2021-09-08 18:35:01 -04:00
6e96cbe14a
Misc: Merge ZM_HAS_V4L with ZM_HAS_V4L2
2021-09-08 00:19:08 +02:00
0ac060fb78
LocalCamera: Fix Wformat warnings on FreeBSD
2021-09-08 00:19:08 +02:00
443b84270a
LocalCamera: Add a missing include to fix FreeBSD build
...
Fixes #3330
2021-09-08 00:19:08 +02:00
c83882a4c7
Build: Move V4L2 detection into its own module
...
Improves detection across different platforms (esp. FreeBSD) since system paths are automatically taken into account (this is in contrast to check_include_file).
2021-09-08 00:18:24 +02:00
328bd15360
Fix frame_count fps when paused
2021-08-30 18:06:05 -04:00
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
8199554217
Spacing and fix the bogus setting shared_data->valid to false on disconnect. Other processes call disconnect. Only the capturing thread should set it to false.
2021-08-30 13:33:26 -04:00
048b8b13a3
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2021-08-29 09:17:36 -04:00
6de8c71d2a
Set shm->valid to false on disconnect.
2021-08-29 09:17:31 -04:00
4af979c842
spacing
2021-08-29 09:15:40 -04:00
a4c079d1b3
Add code to set colour ranges so that we can safely convert to YUV420p instead of YUVJ420P
2021-08-26 14:15:09 -04:00
7c1c8482c6
Make failure to resolve non fatal
2021-08-24 10:23:24 -04:00
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
a3a592d5e1
Fix errors due to not stopping the dbQueue. Fix crash when querying v4l devices
2021-08-05 14:48:14 -04:00
85d5dd806e
Read 4k at a time instead of 32 bytes. OS will read whatever is available. This basically reduces logging and a little cpu overhead
2021-08-05 13:30:52 -04:00
4392198d14
Fix closing event in MOCORD mode
...
Bug introduced in 707975e567
2021-08-03 09:56:07 +02:00
1766bbdfcd
Handle the case when the monitor doesn't exist more gracefully and not crash. Fixes #3316
2021-07-08 10:07:01 -04:00
b0cf3a4732
Merge pull request #3314 from Carbenium/path-max
...
Fix Wformat for stringtf and convert path buffers depending on PATH_MAX to std::string
2021-07-07 11:34:03 -04:00
eaf2e51b0c
utils: Make sure the compiler can emit format warnings for stringtf
...
Unfortunately the compilers can't emit Wformat warnings for variadic templates
and those can't be annotated with the format attribute.
Use a variadic function which can be annotated and thus warns on format string-args mismatches.
Ref 0796a2262e
2021-07-06 10:33:17 +02:00
80b08a2075
Convert path buffers depending on PATH_MAX to std::string
2021-07-06 10:33:17 +02:00
65656de6ce
db: Adjust the query methods to accept std::strings
2021-07-06 10:20:46 +02:00
c60b577aec
Convert more char array buffers to std::string
...
Remove now unused ZM_SQL_*SIZE defines
2021-07-06 10:20:46 +02:00
fc15afefcf
Event: Remove unused and broken prepared statement code
2021-07-06 10:20:45 +02:00
cf9c47149f
db: Add helper for escaping strings and use it
2021-07-06 10:20:45 +02:00
e6b67dcdc2
We cannot delete from the queue when capturing. Just do the waiting. Reduce severity of logs. Make more use of auto. Realise that no other iterators can be pointing into the queue.
2021-06-15 13:42:55 -04:00
ea10939970
zmu: Fix missing include
2021-06-15 00:16:08 +02:00
531694bf8d
RtspThread: Add missing static_cast when fprinting duration .count()
2021-06-14 20:09:30 +02:00
fa11c20bf8
Merge pull request #3297 from Carbenium/time-misc
...
Convert the rest of the codebase to std::chrono
2021-06-13 17:47:40 -04:00
d69afc9672
misc: Convert time(nullptr) calls to std::chrono
2021-06-13 23:22:51 +02:00
6114d40593
misc: Replace usleep with std::this_thread::sleep_for
2021-06-13 23:22:51 +02:00
f675afc3f2
zmc: Convert internals to std::chrono
2021-06-13 23:22:51 +02:00
3e8b10d813
zm::Select: Convert API to std::chrono
2021-06-13 23:22:51 +02:00
c823b9c00e
Buffer: Convert API to std::chrono
2021-06-13 23:22:51 +02:00
707975e567
Monitor: Convert API to std::chrono
2021-06-13 23:22:49 +02:00
dff5452f11
Event: Convert API to std::chrono
2021-06-13 23:20:24 +02:00
335e950654
Frame: Convert API to std::chrono
2021-06-13 23:20:24 +02:00
7c6a6ac309
VideoStream: Convert internals to std::chrono
2021-06-13 23:20:24 +02:00
ce55ba5fb7
VideoStore: Convert internals to std::chrono
2021-06-13 23:20:22 +02:00
c2f4d65860
Turn down debugging
2021-06-13 14:08:51 -04:00
c56025beab
Use std::unordered_map instead of std::map for performance. Be slightly more efficicent by storing an interator and using it instead of continually indexing into the std::map. Fix crash when a monitor's mmap file size changes
2021-06-13 14:08:51 -04:00
9f8c8a2664
Return early if packetqueue is empty instead of getting the lock. Return early in clear() if we are not initialised
2021-06-13 14:08:51 -04:00
f374b319e0
RtpSource: Convert internals partially to std::chrono
...
This allows us to remove the tvNow() helper method.
2021-06-13 16:35:27 +02:00
ff8c9f67c1
Image: Convert API to std::chrono
...
Utils: Remove TimespecDiff. It is not used anymore
2021-06-13 14:50:16 +02:00
b2ee71c96e
EventStream: Finalize conversion of internals to std::chrono
2021-06-13 11:30:22 +02:00
Isaac Connor
Isaac Connor
Pascal Muetschard
Mike Dussault
Peter Keresztes Schmidt
Isaac Connor
ColorfullyZhang
Isaac Connor