Isaac Connor
|
3b8266a6f0
|
add missing and mix order of Packet initializers
|
2021-01-07 09:41:08 -05:00 |
|
Isaac Connor
|
0d450f4f85
|
add missing and mix order of Packet initializers
|
2021-01-07 09:41:02 -05:00 |
|
Isaac Connor
|
ff3bc981de
|
move code from Load for purpose==ANALYSIS because it will never run. Analysis is a thread now and must assume that PrimeCapture has already succeeded.
|
2021-01-07 09:40:24 -05:00 |
|
Isaac Connor
|
7afaf00202
|
spacing and NULL=>nullptr
|
2021-01-07 09:36:54 -05:00 |
|
Isaac Connor
|
e30f0245ef
|
NULL=>nullptr
|
2021-01-07 09:36:33 -05:00 |
|
Isaac Connor
|
c9641063ca
|
Don't need to get_ref_image anymore. It will block waiting for a capture packet and the ref image will be set by capture thread
|
2021-01-07 09:36:18 -05:00 |
|
Isaac Connor
|
315dccdaec
|
Rename H264PASSTHROUGH to just PASSTHROUGH. Add an analysis_it to the Monitor object as it will no longer exist in the packetqueue
|
2021-01-06 11:32:09 -05:00 |
|
Isaac Connor
|
e93a895f28
|
Rename H264PASSTHROUGH to just PASSTHROUGH. Start with last_signal set to true so that we don't have a signal change event on startup. Use new generic packetqueue functions
|
2021-01-06 11:31:31 -05:00 |
|
Isaac Connor
|
d6c217c1ec
|
Rename H264PASSTHROUGH to just PASSTHROUGH
|
2021-01-06 11:30:42 -05:00 |
|
Isaac Connor
|
08a28e6960
|
Set codec_type in zm_packet
|
2021-01-06 11:30:03 -05:00 |
|
Isaac Connor
|
7c049afc61
|
Add AVPacket parsing queue and other files for rtsp_server
|
2021-01-06 11:26:08 -05:00 |
|
Isaac Connor
|
770cf5703d
|
continue roughing in rtsp server. Fix not adding session to rtspServer.
|
2021-01-06 11:24:52 -05:00 |
|
Isaac Connor
|
d6b59c0abf
|
Add rtsp_server files to CMakeLists.txt
|
2021-01-06 10:48:52 -05:00 |
|
Isaac Connor
|
b6c11538c2
|
cleanup. Add h264_vaapi codec support
|
2020-12-31 09:15:49 -05:00 |
|
Isaac Connor
|
48dcb23af0
|
small cleanup in logging
|
2020-12-31 09:14:03 -05:00 |
|
Isaac Connor
|
6d036629d3
|
clean up cruft. NULL=>nullptr. Fix some codec_context allocation. Try to solve h264_encoder_close crash.
|
2020-12-30 21:25:12 -05:00 |
|
Isaac Connor
|
9d532df9c7
|
need to include zm_video for Encoder Parameter passing
|
2020-12-30 21:24:09 -05:00 |
|
Isaac Connor
|
f61210c91f
|
remove old code using image_buffer in zm_packets
|
2020-12-30 21:23:29 -05:00 |
|
Isaac Connor
|
6c696f4025
|
Return avcodec errors codes instead of 0/1
|
2020-12-30 21:22:55 -05:00 |
|
Isaac Connor
|
64deff7486
|
include std::string don't include zm_video.h. Remove old videoWriter references
|
2020-12-30 21:22:33 -05:00 |
|
Isaac Connor
|
00aae0b68f
|
Use proper c++ initializers
|
2020-12-30 21:21:59 -05:00 |
|
Isaac Connor
|
019f02e9de
|
remove old sigblocking code
|
2020-12-30 21:21:41 -05:00 |
|
Isaac Connor
|
284b9f963f
|
Merge branch 'master' into zma_to_thread
|
2020-12-29 12:18:26 -05:00 |
|
Isaac Connor
|
dc487f35a9
|
set packet codec_type
|
2020-12-27 12:36:33 -05:00 |
|
Isaac Connor
|
9be7547c8b
|
Look at stream index instead of image_index when finding first keyframe in packetqueue
|
2020-12-27 12:32:46 -05:00 |
|
Isaac Connor
|
e58c06e60f
|
Don't need keyframes when saving jpegs.
|
2020-12-27 12:32:06 -05:00 |
|
Isaac Connor
|
af94473eb1
|
remove debug lines about nalType=1
|
2020-12-27 12:25:23 -05:00 |
|
Isaac Connor
|
085d83b250
|
frames are allocated in zm_packet now, so remove them
|
2020-12-27 12:24:34 -05:00 |
|
Isaac Connor
|
c8d2eb9c0f
|
Must stop threads before Closing monitor
|
2020-12-27 12:04:35 -05:00 |
|
Isaac Connor
|
a440ab3ef0
|
need to copy parameters to codecpar
|
2020-12-27 12:04:17 -05:00 |
|
Isaac Connor
|
16662f79ce
|
spacing and code stylez
|
2020-12-27 12:03:44 -05:00 |
|
Isaac Connor
|
57542b01d5
|
Remove all the scaling and conversion stuff. Use packet->decode. Set keyframe flag. return codes of functions are now -1 for failure, 0 for failure but no error and 1 for success.
|
2020-12-27 12:02:02 -05:00 |
|
Isaac Connor
|
7c9db96acc
|
spacing and NULL=>nullptr
|
2020-12-27 12:01:01 -05:00 |
|
Isaac Connor
|
3f2d088f8c
|
Delete image if image_index == -1
|
2020-12-27 12:00:45 -05:00 |
|
Isaac Connor
|
197f9bdd9e
|
indenting fix. Don't update reference image if not doing motion detection. Decouple the image buffer from the packetqueue. So always allocate a new image. Then copy decoded image to image buffer if required.
|
2020-12-27 12:00:18 -05:00 |
|
Isaac Connor
|
63687c8e44
|
code style
|
2020-12-27 11:57:50 -05:00 |
|
Isaac Connor
|
61bffdb249
|
fix compiler warning
|
2020-12-27 11:57:23 -05:00 |
|
Isaac Connor
|
5624a0bef4
|
NULL->nullptr
|
2020-12-27 11:56:59 -05:00 |
|
Isaac Connor
|
d6bbc9bbbb
|
Set codec_type in ffmpeg_camera instead of in monitor
|
2020-12-27 11:56:44 -05:00 |
|
Isaac Connor
|
0521d05295
|
Can only output jpegs if we are doing decoding.
|
2020-12-27 11:55:53 -05:00 |
|
Isaac Connor
|
9b916a15a2
|
Only get ref image if we are doing motion detection.
|
2020-12-27 11:55:14 -05:00 |
Isaac Connor
|
ddf66bc9b5
|
Merge pull request #3100 from vertigeaux/share_frame_scores
save frame scores to SharedData for use with linked monitors
|
2020-12-24 11:08:25 -05:00 |
|
Isaac Connor
|
48d9b4d5a5
|
Remove unused variables
|
2020-12-23 18:50:52 -05:00 |
|
Isaac Connor
|
f934a6bbaf
|
spacing and change last_fps_time and last_analysis_time to doubles
|
2020-12-23 18:50:38 -05:00 |
|
Isaac Connor
|
1ffc233593
|
Move some initialisation into MOnitor() initialisation. Update UpdateAnalysisFPS to use more doubles instead of integers to get better numbers. Move capture FPS updating to UpdateCaptureFPS and use doubles there too. remove some dead code and add some debugging
|
2020-12-23 18:50:07 -05:00 |
|
Isaac Connor
|
3893e97e94
|
Quieten compiler warnings
|
2020-12-23 18:18:30 -05:00 |
|
Isaac Connor
|
ee8f940acf
|
Add some debug
|
2020-12-23 18:18:16 -05:00 |
|
Isaac Connor
|
fb2793d337
|
use nullptr instead of 0 when init'ing event
|
2020-12-23 09:11:33 -05:00 |
|
Isaac Connor
|
a1917d83d0
|
Merge branch 'master' into zma_to_thread
|
2020-12-22 19:52:09 -05:00 |
Vertigeaux
|
1416cbb03c
|
save frame scores to SharedData for use with linked monitors
|
2020-12-22 17:44:53 -06:00 |