faddace69d
Update version
2021-03-10 15:59:38 -05:00
bdd808926d
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2021-03-10 14:02:09 -05:00
08110fe9b1
try again at adding RtspServer submodule
2021-03-10 14:02:03 -05:00
15bd3276d2
fix define
2021-03-10 13:50:42 -05:00
42972f9ab7
Add our fork of RtspServer as a module
2021-03-10 13:38:46 -05:00
aadee4ea65
add a Query String parse in zm_utils
...
add an authenticator to use with RtspServer
2021-03-10 13:20:14 -05:00
562e7c7e80
Add authentication
2021-03-10 13:19:41 -05:00
a0957fbd10
remove debug
2021-03-10 13:19:30 -05:00
24fb020686
Add PHZ76 in deps. Must be added as a submodule
2021-03-10 11:01:52 -05:00
b1f6eb127b
Switch from live555 to PHZ76/RtspServer
2021-03-10 11:01:04 -05:00
f4cb4ec5b3
Remove mp4v2-dev dependency
2021-03-09 09:10:56 -05:00
831cf8af56
remove zm_video.h which is no longer relevant
2021-03-08 22:14:47 -05:00
41085c9e5c
Remove final bits of zm_video writer.
2021-03-08 22:14:13 -05:00
46bf765f80
Set heartbeat on startup. Fix logic in ShmValid
2021-03-08 18:31:01 -05:00
e38e8a2775
Actually use zmc_heartbeat_time. Set it on every capture and use it in ShmValid to determine if zmc has gone away.
2021-03-08 09:30:53 -05:00
920556e002
Merge pull request #3191 from DanielSchetritt/patch-1
...
Fix rendering of RST codeblock in documentation
2021-03-07 17:50:27 -05:00
9660448e5a
Fix rendering of RST codeblock in documentation
...
This fixes the rendering of a codeblock in reStructuredText. I think the parser couldn't render a codeblock containing a URL using the shorthand `::` so an explicit `.. codeblock::` directive is used instead.
2021-03-07 10:37:21 -08:00
8ebaee998a
CI/Cirrus: Show Catch2 output on test failure
2021-03-07 17:43:48 +01:00
c0990a7982
Merge pull request #3190 from Carbenium/db-locking
...
Fix SQL queries with missing lock
2021-03-06 18:51:02 -05:00
32f8bc8e31
Fifo: Fix a crash on shutdown
...
outfile can be undefined if the fifo couldn't be opened correctly.
Only try to close outfile on shutdown when it is valid.
2021-03-06 23:39:59 +01:00
0796a2262e
Utils: Replace stringtf with a type-safe version that can't overflow
2021-03-06 00:12:18 +01:00
9e77324de4
Replace raw mysql_query calls with the zmDb* functions
...
With this we can make sure we have proper locking of our DB connection at all times.
2021-03-06 00:12:18 +01:00
c96cb1dd8d
Put back terminate_
2021-03-05 14:21:18 -05:00
cfb8e062c1
Add deleting sources to RTSPServerThread::Stop(). Delete redundant terminate
2021-03-05 14:18:51 -05:00
ebd29a3cb9
use the timeout version of read_into so that we don't stay blocked while we have been told to exit. If getNextFrame returns -1 sleep for a second.
2021-03-05 14:18:12 -05:00
07339e443b
Add RTSP Server shutdown code
2021-03-05 14:13:24 -05:00
f99b8896ec
Don't unlock the mutex around openFile. It is a recursive mutex so we should be able to stay locked
2021-03-05 14:13:10 -05:00
0af68a0914
Implement read_into with a timeout
2021-03-05 14:12:44 -05:00
1ff4e5bc8d
Fix not keeping enough video packets in packetqueue to satisfy pre_event_count
2021-03-05 10:02:21 -05:00
65858eb104
Merge pull request #3189 from rabsym/Make_last_alarm_count_last_alarmed_frame_while_in_ALARM_state_only
...
Make last_alarm_count last alarmed frame while only in ALARM state to…
2021-03-04 15:48:50 -05:00
fa22129966
Make last_alarm_count last alarmed frame while only in ALARM state to make post_event_count counts since here not alone alarmed frames that don't shot alarms.
2021-03-04 20:20:02 +01:00
5f476df194
Fix invalid read when no mAudioStream
2021-03-04 13:35:39 -05:00
d20521569d
Only add width and height if they have a value
2021-03-04 13:26:10 -05:00
7da1e48456
Fix delete=>delete[] on header. If we read_into the buffer more all our pointers can be invalidated. So use offsets instead
2021-03-04 13:26:10 -05:00
eb36c9e919
add getFrequencyIndex and use it to correctly set the frequency index
2021-03-04 13:26:10 -05:00
1adeda6241
Add debugging of sql
2021-03-04 13:26:10 -05:00
5ffaebf70d
RtpCtrlThread: Add a missing include
2021-03-04 19:21:09 +01:00
0a8b34843c
Merge pull request #3188 from Carbenium/drop-zm-thread
...
Drop our custom threading code
2021-03-04 13:02:51 -05:00
5259b78065
Fix event notes not getting populated.
2021-03-04 11:12:27 -05:00
f986b6a5e2
Clear packet counts on clear so that camera restarts don't incremenet the stream_id's and cause memory consumption
2021-03-04 07:46:39 -05:00
d9568a98c0
Drop zm_thread which has been replaced by STL implementations
2021-03-04 10:55:46 +01:00
8f4c3aff88
Merge pull request #3187 from Carbenium/fix-bsd
...
Fix build on FreeBSD
2021-03-03 18:36:24 -05:00
15bb9969da
Timer: Unused, let's remove it
...
Currently there is no need for this functionality.
Since it depends on Thread and ThreadData (which will be removed) let's drop this as well.
If need would arise for such functionality a new implementation with a modern API should be written.
2021-03-03 23:38:15 +01:00
a78236d05c
Fifo: Fix some missing c_str()s for formatting logs
2021-03-03 23:31:53 +01:00
69185e2204
RtpSource: Convert ThreadData with std::condition_variable
2021-03-03 23:31:53 +01:00
1dfa41923b
Fifo: F_{G,S}ETPIPE_SZ is Linux specific
2021-03-03 23:31:53 +01:00
c7f9cc3368
LibvlcCamera: Convert ThreadData with std::condition_variable
2021-03-03 23:31:53 +01:00
c78e174e78
RTSPServerThread: Convert to std::thread
2021-03-03 23:31:53 +01:00
8f0431d85b
RtpDataThread: Convert to std::thread
2021-03-03 23:31:53 +01:00
71edb9d830
RtpCtrlThread: Convert to std::thread
2021-03-03 23:31:53 +01:00
Isaac Connor
Isaac Connor
Daniel Schetritt
Peter Keresztes Schmidt
Peter Keresztes Schmidt
Admin