Commit Graph

5125 Commits

Author SHA1 Message Date
Isaac Connor
8788627d20 Fix endlessly auto-resuming 2022-05-30 15:44:48 -04:00
Isaac Connor
4e80114468 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-05-30 13:42:23 -04:00
Isaac Connor
84993c6c02 Comment out debugging. This is fast path stuff and this code seems to work. 2022-05-30 10:22:53 -04:00
Isaac Connor
55f50d93a8 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-05-30 09:58:18 -04:00
Isaac Connor
95fe6e1e00 Don't coipy opkt.dts to pts as it will be done in write_packet 2022-05-30 09:53:32 -04:00
Isaac Connor
71a1e81dd7 Change has_warned to warned_count, so that we can stop excess locked packet warnings too 2022-05-25 09:50:52 -04:00
Isaac Connor
f8767f7dfd Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-05-20 14:14:24 -04:00
Isaac Connor
15fda49b64 Put back assigning pts to dts if ipkt->pts == AV_NOPTS_VALUE 2022-05-20 14:14:19 -04:00
Isaac Connor
3f2de7a45b Fix inverted logic breaking audio 2022-05-20 13:56:32 -04:00
Isaac Connor
998f98fe85 cpplint changes 2022-05-19 16:08:17 -04:00
Isaac Connor
e9e9bf525c Log keyframe interval seen when clearing queue. 2022-05-19 15:53:57 -04:00
Andrew Bauer
f0bd2cec40 Merge pull request #3487 from jp-bennett/master
Attempt 3 at offline gsoap builds
2022-05-18 21:23:14 -05:00
Isaac Connor
27bc8d9764 Stop the dbQueue before closing logs. Since dbQueue.stop() join's the dbQueue thread, it should not log after we return. 2022-05-18 19:00:40 -04:00
Isaac Connor
d673266235 Stop the dbQueue before closing logs. Since dbQueue.stop() join's the dbQueue thread, it should not log after we return. 2022-05-18 19:00:30 -04:00
Isaac Connor
dc30629247 Stop the dbQueue before closing logs. Since dbQueue.stop() join's the dbQueue thread, it should not log after we return. 2022-05-18 19:00:21 -04:00
Jonathan Bennett
94cf974469 Adds bindings.h to avoid downloading files 2022-05-18 17:55:10 -05:00
Jonathan Bennett
c90aef7507 Revert "Adds event.wsdl to prevent the compile-time download"
This reverts commit e1293260c6.
2022-05-18 17:36:17 -05:00
Jonathan Bennett
e0be79e24b Revert "Reverts adding event.wsdl, adds soapcpp2 outputs"
This reverts commit efb0aaf122.
2022-05-18 17:35:24 -05:00
Isaac Connor
cf4710d28d Merge pull request #3486 from jp-bennett/master
Reverts adding event.wsdl, adds soapcpp2 outputs
2022-05-18 17:19:51 -04:00
Isaac Connor
984c08049b fix compile on < ffmpeg5 2022-05-18 17:12:06 -04:00
Isaac Connor
e51d3a206f Use auto to get the right type for n_coords 2022-05-18 17:07:06 -04:00
Jonathan Bennett
efb0aaf122 Reverts adding event.wsdl, adds soapcpp2 outputs 2022-05-18 15:54:08 -05:00
Isaac Connor
61c5f9aad3 ffmpeg5 fix by adding const 2022-05-18 16:29:49 -04:00
Jonathan Bennett
e1293260c6 Adds event.wsdl to prevent the compile-time download 2022-05-18 14:29:49 -05:00
Isaac Connor
2410843851 Use now() instead of packet timestamp for last_write_time. This prevents zmwatch from restarting the monitor just because it is falling behind. Add a warning about decoding falling behind 2022-05-18 12:00:56 -04:00
Isaac Connor
b254f990d0 Warn when the number of vertices changes due to clipping 2022-05-17 15:05:25 -04:00
Isaac Connor
02cca8e57b Handle no vertices in Fill. Prevents crash when a zone is entirely outside the image 2022-05-17 15:05:08 -04:00
Isaac Connor
039c318a19 Fix warning about missing initializers 2022-05-13 16:40:56 -04:00
Isaac Connor
7aaa32d424 Use AV_NOPTS_VALUE instead of 0 in first_dts/first_pts variables. Don't adjust dts when it's AV_NOPTS_VALUE in writeVideoPacket. Handle it better in writePacket. 2022-05-12 11:05:38 -04:00
Isaac Connor
ef05e8d5c2 Wake up everyone waiting in packetqueue before joining the event thread so that we don't lock 2022-05-12 11:02:36 -04:00
Isaac Connor
7ec97403d2 Introduce packetqueue::stop which just sets the deleting flag and sends out a notify. The idea is to call it before clear(). 2022-05-12 11:02:19 -04:00
Isaac Connor
8dd1435684 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-05-11 10:05:53 -04:00
Isaac Connor
2cb85492e9 Clean out cruft from prepareImage. Fixes not sending scaled image. 2022-05-11 10:05:48 -04:00
Isaac Connor
08cae161f6 Add debugging to help figure out misordered of packets on event creation 2022-05-10 20:22:57 -04:00
Isaac Connor
997c1197cf Implement decoding=Keyframes + OnDemand 2022-05-10 14:25:34 -04:00
Isaac Connor
0cdb926e9e Remove unused variable 2022-05-10 09:30:13 -04:00
Isaac Connor
05155cff73 Zoom by 10% instead of 25% 2022-05-07 11:38:10 -04:00
Isaac Connor
3804f6c66c Finally fix centering of zoomed image 2022-05-07 11:37:58 -04:00
Isaac Connor
8d38d1c36e Implement 25% zoom incrementts with no max 2022-05-06 12:11:47 -04:00
Isaac Connor
f7025bcf97 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-05-06 11:45:22 -04:00
Isaac Connor
a8583086ce Rework zooming. We now crop first, then scale to retain image fidelity as much as possible. More work to be done but is working better than the old code and I think is more readable. This also makes Box a class member instead of a static 2022-05-06 11:45:12 -04:00
Isaac Connor
fc4381b180 Add Width() and Height() to Box. 2022-05-06 11:43:49 -04:00
Isaac Connor
442dff3f8a Implement a Scale(new_width, new_height) using sw_scale. 2022-05-06 11:43:35 -04:00
Isaac Connor
27ba6a8159 Shorten the time we hold the event lock when closing the event 2022-05-05 09:06:44 -04:00
Isaac Connor
db2854a7ac Improve error message when sws_scale fails 2022-05-04 10:00:40 -04:00
Isaac Connor
9779ab1830 Fix lockup on logrot by not releasing the event lock 2022-05-02 09:55:51 -04:00
Isaac Connor
210a9d035b Fix a case where packets could be left in queue on delete 2022-04-30 14:04:09 -04:00
Isaac Connor
06dec70e57 Fix lockup due to not checking for terminate_ before grabbing the lock again 2022-04-30 14:04:09 -04:00
Isaac Connor
cffb57799a const_cast away the constness of oformat so that we can set AV_TS_NOTSTRICT 2022-04-30 09:30:04 -04:00
Isaac Connor
0bbc6321d5 ifdef out the packet re-ordering code. It may be bogus. 2022-04-29 18:38:23 -04:00