2d71743372
FFmpeg: Remove code paths required only by 2.8 and older
...
With Xenial support dropped we require FFmpeg 3.2 and newer.
2021-06-05 20:40:12 +02:00
2cf6ad8089
Switch ZMPacket * to a shared_ptr<ZMPacket>. This is so that in LockedPacket we can unlock and then notify and be confident that packet_ won't have been deleted. Change ZMPacket->timestamp to be a timeval instead of timeval *. This might not have been necessary but I like it. No longer cuse the ZMPacket object to wrap the shared image buffers and timestamps. Use a vector for image_buffers.
2021-05-08 21:14:20 -04:00
f077ec6145
Take first PTS into account when calculating last pts for figuring out which input to use.
2021-04-11 16:35:16 -04:00
eaaf04420a
Keep track of stream last_pts. So we can at least try to sync streams
2021-03-03 12:45:05 -05:00
b87d859f72
Set the packet's stream_index to the packetqueue stream. Rename get_ functions to get
2021-03-03 12:06:34 -05:00
86541779d9
Add SecondFormatContext
2021-03-03 09:55:57 -05:00
c5ee837b9b
Add getFrequency and getChannels
2021-03-01 16:49:27 -05:00
35514649c9
Monitor: Make audio and video streams directly accessible
...
Also remove Camera::getId() which returend the monitor ID. Since a camera is owned by an monitor, there is no need for this. Also it causes a circular include.
2021-02-11 19:22:22 +01:00
f43507dce0
Use the power of smart pointers to manage Monitor instances
2021-02-07 21:20:45 +01:00
0dbc39ee25
Cleanup and reorganize includes
...
With this commit a unified structure for includes is introduced.
The general rules:
* Only include what you need
* Include wherever possible in the cpp and forward-declare in the header
The includes are sorted in a local to global fashion. This means for the include order:
0. If cpp file: The corresponding h file and an empty line
1. Includes from the project sorted alphabetically
2. System/library includes sorted alphabetically
3. Conditional includes
2021-02-04 18:02:01 +01:00
5a21ebe3ef
allow audio streams
2021-01-28 10:49:46 -05:00
28d27cc30a
use camel case on video_stream and audio_stream
2021-01-28 10:45:19 -05:00
4c933f82b8
All cameras will have an mFormatConext, CodecContext etc. Consolidate code in zm_camera. Fix remote rtsp decoding
2021-01-27 16:12:32 -05:00
66c78e5a9b
Merge branch 'zma_to_thread' into rtsp_server
2021-01-19 13:43:25 -05:00
f842e9e2ed
NULL=>nullptr
2021-01-11 13:46:50 -05:00
e30f0245ef
NULL=>nullptr
2021-01-07 09:36:33 -05:00
869860bb26
Merge branch 'master' into zma_to_thread
2020-07-21 17:49:39 -04:00
7575afc8d5
Merge branch 'master' into zma_to_thread
2020-07-21 17:38:32 -04:00
e675c8373e
Merge branch 'release-1.34'
2020-07-07 16:15:56 -04:00
864cd4c178
introduce a linesize variable which represents the # of bytes to hold a line of the image in the buffer. May be > width * colours
2020-07-05 17:51:57 -04:00
1d3ad05bb5
Start implementing VNC
2020-03-25 23:21:34 -07:00
396be10d6f
Merge branch 'master' into zma_to_thread
2019-08-22 12:57:00 -04:00
c1984ad7cb
Fix problem calculating mem_size using an int from ImageSize. With camera resolutions going up, width*height*colour could exceed 32bits. So use a guarnteed 53bit type, which fixes the memsize calculations. Fixes #2682
2019-08-11 20:21:37 -04:00
36f7e9abb1
Merge h265 and begin work on swsresample
2018-11-21 09:46:14 -05:00
89cd7ceaf8
Whitespace, extra parentheses, google code style
2018-09-23 16:47:06 -04:00
a258ca6f9a
Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread
2018-08-31 19:13:50 -04:00
fd550c13ab
fix merge
2018-08-31 19:12:05 -04:00
672b4affe1
Merge branch 'storageareas' into zma_to_thread
2018-08-31 19:05:22 -04:00
42c6d90339
Merge branch 'storageareas' into zma_to_thread
2018-08-25 09:58:51 -04:00
979b31ffc3
Merge branch 'storageareas' into zma_to_thread
2018-08-11 10:08:30 -04:00
f2525253bb
spacing, remove excess parenthesis etc
2018-08-10 11:15:51 -04:00
593209edd2
turn off passthrough for remote rtsp as it doesn't work at this time.
2018-06-14 13:28:05 -04:00
f6139d33ed
Merge branch 'storageareas' into zma_to_thread
2018-05-05 12:25:11 -04:00
20f6985dff
implement capturing bandwidth
2018-04-24 14:11:27 -04:00
34111251d9
Introduce Close() to camera and monitor api. Use it to close a camera when there is an error with capturing. Remove the sleep10 on error.
2018-04-17 07:02:52 -07:00
cd3046abb3
Merge branch 'storageareas' into zma_to_thread
2018-04-14 11:03:08 -04:00
3129afa5d6
fixup decoding when recording from a non-ffmpeg suorce
2017-11-14 13:16:07 -08:00
043e44d273
fix, must clear the frame
2017-11-13 14:24:28 -08:00
bb116cebd7
wip
2017-11-09 13:37:02 -08:00
d15d36f389
rework, compiles, won't open h264
2017-11-09 11:50:20 -08:00
b58c9d87c3
wip
2017-10-23 09:51:41 -04:00
bdb6dd63a3
change type of width and height to unsigned int and recording from bool to timeval
2017-04-12 13:32:22 -04:00
5ae34a7561
Merge branch 'master' into storageareas
2017-01-02 09:39:10 -05:00
254fcbcef7
update gpl 2 mailing address in source files
2016-12-26 09:23:16 -06:00
3a06ba7a65
Turn off instantiating a default zone before even loading the zones. Implement the use of Camera->setMonitor so that the camera object doesn't have to load it later.
2016-09-09 09:15:04 -04:00
62a2ce56fb
Merge Rotation/Orientation work, rename id to monitor_id in cameras and also make it an unsigned int since logically that is what it is. Also some fixups for bad rtsp h264 streams.
2016-08-10 12:19:53 -04:00
e29a0ebe71
Merge branch 'feature-h264-videostorage' into storageareas
2016-06-21 13:48:32 -04:00
71e9553648
add rotation to video
2016-05-13 14:51:26 -04:00
da157f5a1a
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-04-30 22:27:10 +10:00
9a795432cf
merge all the commits from the messed up iconnor_video branch
2016-04-05 17:14:46 -04:00
Peter Keresztes Schmidt
Isaac Connor
Isaac Connor
hax0kartik
Isaac Connor
APHW2 MFGENG
Andy Bauer
Isaac Connor
Steve Gilvarry