Isaac Connor
5615cafc19
fix compile on old ffmpeg
2019-03-21 17:50:17 -04:00
Isaac Connor
c159dd8d10
cleanup and fix code that assumed H264
2019-03-21 14:13:56 -04:00
Isaac Connor
c791f136da
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2019-03-21 10:43:54 -04:00
Isaac Connor
a30c4d9551
rework ffmpeg_input to not use pkt_duration which doesn't exist in avconv
2019-03-21 10:41:59 -04:00
Isaac Connor
fcb9f76561
Fix out_frame->pts being nothing because we freed in_frame
2019-03-20 16:06:55 -04:00
Isaac Connor
05976b3227
Add pts to zm_dump_frame
2019-03-20 16:06:31 -04:00
Isaac Connor
3931baa2b6
fix build on old ffmpeg
2019-03-20 10:21:43 -04:00
Isaac Connor
a437c407a7
fix video_out_ctx init so that ffmpeg doesn't complain
2019-03-19 13:17:26 -04:00
Isaac Connor
f89654f442
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2019-03-19 10:50:05 -04:00
Isaac Connor
520c41da23
Merge ../ZoneMinder.connortechnology.bad into storageareas
2019-03-18 14:40:03 -04:00
Isaac Connor
b794c2ca20
fix crash by checking username without checking if it is NULL
2019-03-18 12:01:51 -04:00
Isaac Connor
dde911d16a
add more debug about command queue
2019-03-18 10:55:21 -04:00
Isaac Connor
8417230690
debug where the comms sock is
2019-03-18 10:55:08 -04:00
Isaac Connor
9b713a489d
fix sleep time by using a comparison between the frame display time and the distance between now and when we started playing.
...
handle infinite fps
2019-03-06 14:50:36 -05:00
Isaac Connor
6c8eac1ac8
Merge branch 'storageareas' into h265
2019-03-06 11:10:01 -05:00
Isaac Connor
abfb5642c8
cleanup and document updateFrameRate
2019-03-06 09:46:28 -05:00
Isaac Connor
24665264a2
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2019-03-05 20:16:05 -05:00
Isaac Connor
73ae3f49ed
Merge branch 'master' into storageareas
2019-03-05 11:35:55 -05:00
Isaac Connor
b1838de701
test turning off frag_custom
2019-03-05 11:35:16 -05:00
rpdrewes
0bf001be3c
Fix for file and curl camera sources ( #2545 )
2019-03-05 09:59:36 -05:00
Isaac Connor
778707c8df
Merge branch 'master' into storageareas
2019-03-04 14:33:28 -05:00
Isaac Connor
903f5af1ef
invalid parameters should be a debug not a warning
2019-03-04 13:35:36 -05:00
Isaac Connor
95567e07a4
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2019-02-26 11:43:07 -05:00
Isaac Connor
a38fcf5297
Add debug and use alternate way of figuring out how long to sleep to maintain fps
2019-02-26 11:41:02 -05:00
Isaac Connor
f7dd1b049d
Merge branch 'master' into storageareas
2019-02-26 10:16:11 -05:00
Isaac Connor
705468dfc4
if we don't have a connkey, comms will not be open so don't touch the sock file or call checkCommandQueue
2019-02-26 10:08:07 -05:00
Isaac Connor
fd310c0f0a
Merge branch 'master' into storageareas
2019-02-22 11:33:47 -05:00
Isaac Connor
443fd35d99
Fix imagesize requirements ( #2404 )
...
* introduce non-loop-unrolled version of function and use them when the image size is not a multiple of 12 or 16
* Remove tests for imagesize being a multiple of 16 or 12 to handle functions with unrolled loops
* Use non-unrolled functions when image size is not a multiple of 12 or 16
* use std_blend when image is odd size
2019-02-22 09:44:57 -05:00
Isaac Connor
c626b0fb8e
if adding a closing frame, queue it with the rest of the frames so they get written all at once. Queue 20 frames instead of 10
2019-02-19 12:00:17 -05:00
Isaac Connor
5029d7214a
Merge branch 'master' into storageareas
2019-02-18 17:00:45 -05:00
Isaac Connor
9996b3e718
Merge branch 'master' into break_videostorage
2019-02-17 12:10:32 -05:00
Isaac Connor
baba438ce1
use image_count when reporting earlier than fps_report_interval
2019-02-16 11:49:28 -05:00
Isaac Connor
9656032906
spacing
2019-02-15 17:52:51 -05:00
Isaac Connor
96906734b8
add an audio_fifo to handle input audio < 1024 samples per frame
2019-02-15 17:26:30 -05:00
Isaac Connor
6156aa2af9
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2019-02-15 10:49:06 -05:00
Isaac Connor
4e463c9354
use swr_convert_frame instead of swr_convert
2019-02-14 17:48:58 -05:00
Isaac Connor
281775cc80
try setting out_frame pts from in_frame
2019-02-14 15:54:47 -05:00
Isaac Connor
9e07d5cd17
try setting out_frame pts from in_frame
2019-02-14 15:54:00 -05:00
Isaac Connor
a11349bffe
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2019-02-13 11:38:44 -05:00
Isaac Connor
a41e8a8834
Merge branch 'master' into storageareas
2019-02-13 11:38:38 -05:00
Isaac Connor
31a11a6992
init log earlier in zms
2019-02-13 11:34:47 -05:00
Isaac Connor
78b97303a3
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2019-02-13 11:32:40 -05:00
Isaac Connor
2563951c1f
comment out the signal blocking. I still can't figure out why we would want it
2019-02-13 11:32:34 -05:00
Isaac Connor
42011e96e6
Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas
2019-02-13 11:29:12 -05:00
Isaac Connor
1aad1f765d
slep for 1 second if there is an error in capturing
2019-02-13 11:28:18 -05:00
Steve Gilvarry
924d5235d0
Validate zmu Username and Password lengths ( #2484 )
...
* Validate zmu Username and Password lengths
Ensure user provided values are not larger than allowed and error if
they are, therefore further preventing overflow.
* Check username and password functions for zmu and zms
* Check username and password functions for zmu and zms
2019-02-13 10:40:43 -05:00
Isaac Connor
060751602b
fix missing ;
2019-02-13 10:34:09 -05:00
Isaac Connor
d1b3b23c09
Merge branch 'master' into storageareas
2019-02-13 09:42:03 -05:00
Isaac Connor
0bfaf87d27
Mostly code style and whitespacing. However, I do setup more values in the output frame when doing audio resampling
2019-02-12 16:40:27 -05:00
Isaac Connor
3177764db4
spacing
2019-02-12 14:20:33 -05:00
