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 |
|
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 |