Isaac Connor
c716e8c149
Add logging of audio auxLine. Default to 8000Hz
2021-03-01 16:49:27 -05:00
Isaac Connor
7ba6e45505
Rough in rtsp_server concept. Wait for fifo's to exist before connecting. Check for monitor disconnection. WIP
2021-03-01 16:49:27 -05:00
Isaac Connor
449b547f2b
Use buffer.head() instead of casting
2021-03-01 16:49:27 -05:00
Isaac Connor
05e7d76ccd
Add pts which will be scaled to AV_TIME_BASE_Q
2021-03-01 16:49:27 -05:00
Isaac Connor
6e73c08a21
add fifo's for video and audio. Write the packet data to them. Update FifoStream->Fifo
2021-03-01 16:49:26 -05:00
Isaac Connor
a81e3d6e19
Set zm_packet.pts scaled to AV_TIME_BASE_Q.
2021-03-01 16:47:18 -05:00
Isaac Connor
c554a22374
use .head() instead of casting the buffer
2021-03-01 16:47:18 -05:00
Isaac Connor
1d73087e5b
Split zm_fifo up into zm_fifo, zm_fifo_debug and zm_fifo_stream. Implement a Fifo class to keep the filehandle open.
2021-03-01 16:47:18 -05:00
Isaac Connor
3ad76f18ec
code style updates
2021-03-01 16:47:18 -05:00
Isaac Connor
2a4723090b
Start zm_rtsp_server if ZM_MIN_RTSP_PORT is set
2021-03-01 16:47:18 -05:00
Isaac Connor
b70cd0bc76
Add zm_rtsp_server to list of daemons we can start
2021-03-01 16:47:18 -05:00
Isaac Connor
836ef731c1
Don't use libjquery-js
2021-03-01 16:47:18 -05:00
Isaac Connor
2d0a8549af
Fix cmake to only build zm_rtsp_server if it is turned on
2021-03-01 16:47:17 -05:00
Isaac Connor
bb747bfc6d
Add RTSPStreamName fields
2021-03-01 16:46:48 -05:00
Isaac Connor
cafdd02307
Remote rtsp server code. It got moved to zm_rtsp_server.cpp
2021-03-01 16:46:48 -05:00
Isaac Connor
6c6d6c51b0
Add RTSPSTreamName loading and write packet data to the video and audio fifos
2021-03-01 16:46:48 -05:00
Isaac Connor
3e9a2f2651
It is actually importatnt that smInstance get cleared. The subsequent new Logger will check for it.
2021-03-01 16:46:48 -05:00
Isaac Connor
57585e4986
Not sure why raw_fd should be static...
2021-03-01 16:46:48 -05:00
Isaac Connor
78062a03ef
Add writePacket and write static function to write h264 packet stream and audio stream to a fifo for the zm_rtsp_server to read from
2021-03-01 16:46:48 -05:00
Isaac Connor
d2e1c23140
Add zm_rtsp_server build target and source files
2021-03-01 16:46:48 -05:00
Isaac Connor
fdf1fbd497
Add a fifo version of the rtsp server
2021-03-01 16:46:48 -05:00
Isaac Connor
430f839954
add video_fifo filename strings to shmem.
2021-03-01 16:46:48 -05:00
Isaac Connor
01c74fdac3
Add RTSPStreamName to Monitors table. Bump version to 1.35.19
2021-03-01 16:46:48 -05:00
Isaac Connor
33dbcc449a
Merge pull request #3181 from Carbenium/rgb-const
...
rgb: Convert some constant defines to constexpr
2021-03-01 09:40:39 -05:00
Isaac Connor
71d864d77b
Merge pull request #3182 from Carbenium/monitor-includes
...
monitor: Move system includes back to their original location
2021-03-01 09:40:08 -05:00
Isaac Connor
b4c11b2fff
Merge pull request #3180 from rabsym/rabsym_alert_to_alarm_frames
...
ALERT also mean warming up with alarm_frame_count value before return…
2021-03-01 09:34:42 -05:00
Isaac Connor
db3de725da
Merge pull request #3179 from Carbenium/codeql-dep
...
CodeQL: Exclude dep/ from analysis
2021-03-01 09:33:40 -05:00
Peter Keresztes Schmidt
3b3ecb89b2
monitor: Move system includes back to their original location
...
41dc0212e0
moved the system includes to work around some compilation problems.
The underlying cause has been fixed in cf9406a1e8
.
Thus we can move the includes back so the follow the project-wide order.
2021-03-01 00:45:57 +01:00
Peter Keresztes Schmidt
76e6c468e8
rgb: Convert some constant defines to constexpr
...
Using defines interferes with fmt.
Also rename them according to the Google styleguide.
2021-03-01 00:38:21 +01:00
Admin
741e67e8cd
ALERT also mean warming up with alarm_frame_count value before returning to ALARM....
2021-02-28 22:42:29 +01:00
Peter Keresztes Schmidt
d68eeabb54
CodeQL: Exclude dep/ from analysis
2021-02-28 22:25:21 +01:00
Isaac Connor
a73d82aa66
Merge pull request #3178 from Carbenium/cirrus-ci
...
CI: Use Cirrus CI for FreeBSD builds
2021-02-28 15:07:33 -05:00
Peter Keresztes Schmidt
2cbcebb7be
CI: Use Cirrus CI for FreeBSD builds
2021-02-28 11:59:18 +01:00
Isaac Connor
ae3d1eca54
Merge pull request #3177 from Carbenium/build-deps
...
Cleanup build system of external dependecies
2021-02-27 23:07:59 -05:00
Peter Keresztes Schmidt
c33b5a4393
Move in-tree dependencies to their own folder
...
src/ should only contain our code. Move the in-tree dependencies to dep/
This allows us (if necessary) to e.g. exclude that part of the tree from being analyzed by
various tools or mark it as external code in IDEs.
2021-02-28 02:12:07 +01:00
Peter Keresztes Schmidt
866bcc9518
build: Cleanup CMakeLists.txt of libbcrypt
...
Remove unnecessary cruft and make sure it uses our compile options as dictated by zm-dependency-interface.
An additional step towards a warning-free compile.
Define __SKIP_GNU on BSD since they have their own bcrypt implementation.
2021-02-28 02:12:07 +01:00
Andrew Bauer
ff680b510f
Update README.md
2021-02-27 17:59:50 -06:00
Andrew Bauer
95356ee103
Update README.md
2021-02-27 17:59:15 -06:00
Peter Keresztes Schmidt
6b7b23970b
build: Add a CMakeLists.txt for jwt-cpp
...
This allows us to use a cmake link target to import the library.
2021-02-27 18:18:35 +01:00
Peter Keresztes Schmidt
b0f0731b47
build: Add base target for dependencies
...
The zm-dependency-interface target sets compiler flags in a way suitable for external dependencies.
This means mainly to disable compile warnings since they concern upstream and not us.
2021-02-27 15:40:38 +01:00
Isaac Connor
9f16c5073f
Merge pull request #3176 from Carbenium/wextra
...
build: Enable -Wextra with some exceptions and fix related warnings
2021-02-26 22:06:53 -05:00
Peter Keresztes Schmidt
6e2f8bfedb
build: Enable Wextra with some exceptions
...
-Wno-cast-function-type:
Signal handler code relies on this.
-Wno-type-limits:
Some of the color space conversion code in zm_image throws this warning. To not break anything let's ignore this warning for the time being.
Note that clang enables -Woverloaded-virtual with -Wextra. To not flood the GCC build log with warnings let's not enable this at the moment.
This will be done in a second step, when the currently throwing code will be cleaned up.
2021-02-27 02:08:14 +01:00
Peter Keresztes Schmidt
6a47780f60
Fix a warning reported by -Wextra
...
/home/peterke/DEV/zoneminder/src/zm_monitor.h: In member function ‘Monitor::TriggerState Monitor::GetTriggerState() const’:
/home/peterke/DEV/zoneminder/src/zm_monitor.h:499:76: warning: enumerated and non-enumerated type in conditional expression [-Wextra]
499 | TriggerState GetTriggerState() const { return (TriggerState)(trigger_data?trigger_data->trigger_state:TRIGGER_CANCEL); }
| ~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2021-02-27 01:27:58 +01:00
Peter Keresztes Schmidt
814953b331
Fix warnings reported by -Wimplicit-fallthrough
...
Note: Once C++17 is supported switch to the standard conform [[fallthrough]] attribute.
For the time being [[gnu::fallthrough]] can be used since it is supported by GCC and Clang [1].
[1] https://clang.llvm.org/docs/AttributeReference.html#fallthrough
2021-02-27 00:29:35 +01:00
Peter Keresztes Schmidt
403061a39c
Fix warnings reported by -Wmissing-field-initializers
2021-02-26 22:46:09 +01:00
Peter Keresztes Schmidt
dffb2d2c87
Fix warnings reported by -Wignored-qualifiers
2021-02-26 19:31:32 +01:00
Isaac Connor
445d815071
fix eslint
2021-02-25 20:35:45 -05:00
Isaac Connor
b8fcd7c85f
Merge pull request #3172 from Carbenium/db-queue-move
...
db: Make sure to bind only rvalues when pushing to zmDbQueue
2021-02-25 17:19:11 -05:00
Peter Keresztes Schmidt
3dd52a92eb
db: Make sure to bind only rvalues when pushing to zmDbQueue
...
With this we can ensure that no copy-construction of the SQL string takes place.
Regarding calling semantics: The pushed SQL string will be moved and cannot be reused.
2021-02-25 23:08:43 +01:00
Isaac Connor
3ce4b3e657
Keep capture_delay in useconds instead of msecs. Fix fps by adding back in the previous sleep_time. Fix crash due to capture_image not being asigned for local cameras
2021-02-25 16:58:54 -05:00