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
d594fbcd49
Some fixes for unused code (will be used in future)
2021-01-26 18:29:34 -05:00
Isaac Connor
27011ab49b
Fix bulid without liveMedia
2021-01-26 18:29:02 -05:00
Isaac Connor
42abe5c917
include hwcontext in zm_ffmpeg.h so that it gets included where needed
2021-01-26 18:28:11 -05:00
Isaac Connor
bacf4a1aca
Add 640x360 resolution
2021-01-26 17:54:22 -05:00
Isaac Connor
410b9840d1
fix eslint
2021-01-26 17:44:23 -05:00
Isaac Connor
70bef9f22a
put back c++11 as the c std
2021-01-26 15:43:29 -05:00
Isaac Connor
491cc1dfe3
ImageBufferCount can now be as low as 2
2021-01-26 15:37:32 -05:00
Isaac Connor
69626651ff
ImageBufferCount can now be as low as 2
2021-01-26 15:33:38 -05:00
Isaac Connor
4dcce4ac95
Merge branch 'rtsp_server'
2021-01-26 14:22:10 -05:00
Isaac Connor
e4465a14ee
Remove stray |
2021-01-26 14:20:14 -05:00
Isaac Connor
84d9d363c9
add_stylesheet is deprecated. Use add_css_file instead
2021-01-26 14:20:14 -05:00
Isaac Connor
bfaed28cff
use config.min_rtsp_port to determine if we start up the rtsp server. Move the sleep on failure to capture down below shutting everything down.
2021-01-26 14:20:03 -05:00
Isaac Connor
33f934b9ab
Use config.min_rtsp_port instead of hard coded base port
2021-01-26 14:14:29 -05:00
Isaac Connor
4159baac06
Use 10 seconds of queue instead of a fixed packet count. Audio generates more frames than video so they get way out of sync.
2021-01-26 14:14:05 -05:00
Isaac Connor
671d58f0d0
bump version and put back ZM_MIN_RTSP_PORT setting
2021-01-26 12:35:17 -05:00
Isaac Connor
7e11d28031
Remove duplicated debug
2021-01-26 12:25:11 -05:00
Isaac Connor
a209d493ef
Handle null video_in_ctx. Better debug. Always flush codecs
2021-01-26 12:24:43 -05:00
Isaac Connor
e73e6aaabc
check for terminating before locking packetqueue. Handle when pre_event_count==0
2021-01-26 12:23:44 -05:00
Isaac Connor
e4831909d6
get_packet can return null if we are terminating
2021-01-26 12:22:26 -05:00
Isaac Connor
7cc21b0d0b
Always load AvFrame to RGBA
2021-01-26 12:22:07 -05:00
Isaac Connor
e226618300
better debug of video/audio frames
2021-01-26 12:21:51 -05:00
Isaac Connor
cd9b3fb1f6
add static Mode_Strings
2021-01-26 12:21:21 -05:00
Isaac Connor
0ecbe29ac0
Handle no frame/duration information more gracefully
2021-01-26 12:20:55 -05:00
Isaac Connor
e10d15fa91
Only write db entries for video frames but do write them even if no decoded image
2021-01-26 12:20:32 -05:00
Isaac Connor
f731a5dc8f
Add StreamMode_Strings for printing out mode
2021-01-26 09:50:41 -05:00
Isaac Connor
835cc8076e
Cleanup constructor, using initializers. Pass in CodecContexts as well. We need them for timebases. Fixes passthrough timestamps.
2021-01-25 18:50:35 -05:00
Isaac Connor
dc9c7a7e15
handle event not existing a little better.
2021-01-25 18:49:03 -05:00
Isaac Connor
4b5052c351
use my bindButton function on the othe rbuttons
2021-01-25 18:48:47 -05:00
Isaac Connor
1b9f448aca
handle event not existing a little better. Show back button for example.
2021-01-25 18:48:20 -05:00
Isaac Connor
973533c809
Use method to handle case where Event wasn't found
2021-01-25 18:39:57 -05:00
Isaac Connor
d6fef71302
Merge branch 'master' into rtsp_server
2021-01-25 15:10:53 -05:00
Isaac Connor
8838ad8e45
Remove stray |
2021-01-25 13:24:28 -05:00
Isaac Connor
effeea2b59
add_stylesheet is deprecated. Use add_css_file instead
2021-01-25 13:24:20 -05:00