ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,160 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

18160 Commits

Author SHA1 Message Date
Isaac Connor 78a3d15457 Fix compile on old avcodec 2021-03-02 16:30:40 -05:00
Isaac Connor 53425257cb Handle old avcodec 2021-03-02 16:20:57 -05:00
Isaac Connor 42914d008a
Merge pull request #3186 from rabsym/make_capturing_analysing_log_lines_follow_same_pattern 
Make capturing/analysing log lines follow same pattern
 2021-03-02 16:13:03 -05:00
Isaac Connor 849d71efff Add filtering to groups 2021-03-02 15:10:15 -05:00
Isaac Connor 7d02c68938 silence warning when cookies not used 2021-03-02 15:10:02 -05:00
Admin 4ff016c991
Make capturing/analysing log lines follow same pattern 2021-03-02 20:51:16 +01:00
Isaac Connor be1b439dcc Add State_Strings and code cleanup. Fix not going into alarm state when already recording. Fixes #3184 2021-03-02 14:42:54 -05:00
Isaac Connor 1c40145e89 not finding space for pts is debug now and show the contents of header 2021-03-02 12:41:26 -05:00
Isaac Connor be99d09772 Accept liblivemedia64 for buster 2021-01-26 22:05:13 -05:00
Isaac Connor f35a1c70c0 fix build with old avcodec for xenial 2021-03-02 12:07:51 -05:00
Isaac Connor c03d9b2987 Set state before we write packets to event so that the event knows that it is alarmed 2021-03-02 11:47:55 -05:00
Isaac Connor f8b7ec8cb9 Save frames when in ALARM state so that pre-event frames get stored 2021-03-02 11:47:38 -05:00
Isaac Connor 71d65685b9 Can't clear image data early. Might be needed for snapshot and pre alarm farmes 2021-03-02 11:12:57 -05:00
Isaac Connor 3dc4bf265e Use braces 2021-03-02 10:15:21 -05:00
Isaac Connor 205ed4c510 EAGAIN happens when no one is listening. Make it a debug 2021-03-02 10:14:25 -05:00
Isaac Connor 46743ebaab Silence compile warning 2021-03-02 10:00:48 -05:00
Isaac Connor 832eabbd79 Don't both updating analysis fps unless we are doing motion detection 2021-03-02 09:59:32 -05:00
Isaac Connor 9beaf613bf Add liblivemedia as a dependency to build rtsp_server 2021-03-02 09:05:58 -05:00
Isaac Connor 243d028118 Add liblivemedia dependencies to build rtsp server 2021-03-02 09:05:58 -05:00
Isaac Connor d92da5f633
Merge pull request #3185 from Carbenium/jwt-cpp 
dep/jwt-cpp: Update to version 0.5
 2021-03-01 18:42:25 -05:00
Peter Keresztes Schmidt 37817f6ba4 dep/jwt-cpp: Update to version 0.5 
Fixes some compile warnings. Unit tests pass with this version as well.
 2021-03-01 23:14:56 +01:00
Isaac Connor 1bc5abb9e9 Only include video packets in analysis_image_count 2021-03-01 17:07:09 -05:00
Isaac Connor 7c71c1c543 fix rebase error 2021-03-01 17:06:53 -05:00
Isaac Connor 51c19912f8 Use analysis_image_count in opening new event log line 2021-03-01 16:56:47 -05:00
Isaac Connor 82dcd87a22 Add generic fifo_audio_source 2021-03-01 16:49:27 -05:00
Isaac Connor 8f001413f2 Handle hevc as the codec name as well as h265 2021-03-01 16:49:27 -05:00
Isaac Connor 53059aebf3 rename numChannels to getChannels and samplingFrequency to getFrequency 2021-03-01 16:49:27 -05:00
Isaac Connor b86e7eefbf fix needed line break before dimensions. Update h265 auxline processing to match h264 2021-03-01 16:49:27 -05:00
Isaac Connor d33540c962 Fix logic on clearing frame queue 2021-03-01 16:49:27 -05:00
Isaac Connor 495e2a4827 Add setting up the config string and population of mAuxLine 2021-03-01 16:49:27 -05:00
Isaac Connor b2ff9af238 Add setting of frequency and channels for audio stream 2021-03-01 16:49:27 -05:00
Isaac Connor b09fe1d17c Create fifo if it doesn't exist already 2021-03-01 16:49:27 -05:00
Isaac Connor 9302c9506e Add audio_frequency and audio_channels to shared mem and set them in PrimeCapture 2021-03-01 16:49:27 -05:00
Isaac Connor a62d446f14 Add audio_frequency and audio_channels to shared mem 2021-03-01 16:49:27 -05:00
Isaac Connor 8500c7ee94 Add audio_frequency and audio_channels to shared mem 2021-03-01 16:49:27 -05:00
Isaac Connor c5ee837b9b Add getFrequency and getChannels 2021-03-01 16:49:27 -05:00
Isaac Connor cc80ae37fb Add a generic fif_audio_source class 2021-03-01 16:49:27 -05:00
Isaac Connor b4fc782778 fifo.h got split into zm_fifo and zm_stream so update the code in zms 2021-03-01 16:49:27 -05:00
Isaac Connor 8c2e6589ac fifo.h got split into zm_fifo and zm_fifo_debug so update the code in zm_zone 2021-03-01 16:49:27 -05:00
Isaac Connor 8af7e40ea1 Use fifo version of code 2021-03-01 16:49:27 -05:00
Isaac Connor bfc12384f6 Increase debug level of auxline reporting 2021-03-01 16:49:27 -05:00
Isaac Connor 6d938817b1 Rework to use a fifo source instead of Device. We no longer pass the monitor in and only open 1 port. Add addFifo function and addSession function 2021-03-01 16:49:27 -05:00
Isaac Connor db13b4c3b6 Document possible parameters, don't add a newline to auxline 2021-03-01 16:49:27 -05:00
Isaac Connor 19d9812a3f Add a debug function to print out the start of the nal 2021-03-01 16:49:27 -05:00
Isaac Connor 53851b67c7 use a Buffer to implement the simple ZM header protocol for passing packet data from ZM to RTSP Server 2021-03-01 16:49:27 -05:00
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