Isaac Connor
17a7d02275
fix reversal of in_frame/out_frame in VideoStore destructor
2019-10-18 10:16:18 -04:00
Isaac Connor
60ec545683
fix compile warning due to snprintf into a too small char array
2019-10-18 09:43:25 -04:00
Isaac Connor
a0f021ee12
Handle the case of flushing resampler by sending NULL
2019-10-17 17:37:36 -04:00
Isaac Connor
f938fd83ac
keep track of video_next_dts. Use it when packet dts is AV_NOPTS_VALUE. Also handle EAGAIN in send_packet_get_frame etc
2019-10-16 09:01:59 -04:00
Isaac Connor
d03de98317
remove carriage returns in ffmpeg log lines
2019-10-16 09:00:39 -04:00
Isaac Connor
90d6e11fb9
If we try to write a packet with dts == AV_NOPTS_VALUE, set it to stream->cur_dts. This might at least give us a playable file.
2019-10-11 14:04:51 -04:00
Isaac Connor
3b586a2abe
include stream index and packet queue size in debug message
2019-10-11 13:53:18 -04:00
Isaac Connor
30b5612691
fix case of sql
2019-09-28 12:57:00 -04:00
Isaac Connor
492be7cc33
make last_zoom last_scale last_x and last_y members of the StreamBase object instead of static vars so that we can access them in monitorStream
2019-09-26 13:51:49 -04:00
Isaac Connor
b787682fa9
Fix play from pause when not buffering. When change of zoom, send two paused images so that response is instant. Fix some misplaced line feeds.
2019-09-26 13:51:13 -04:00
Isaac Connor
1dda79af46
remove debug
2019-09-25 12:00:00 -04:00
Isaac Connor
15a1b19b42
spaces
2019-09-23 10:53:21 -04:00
Isaac Connor
83e477e6be
CaptureAndRecord in remote camera rtsp doesn't work. Remove it.
2019-09-23 10:52:57 -04:00
Isaac Connor
ce37fce99c
spacing
2019-09-20 08:19:57 -04:00
Isaac Connor
09533c19af
Fix %d to %s
2019-09-20 08:19:44 -04:00
Isaac Connor
17e00cec94
Fix setting rtsp_transport when rtsp
2019-09-17 14:58:16 -04:00
Isaac Connor
e8e29d62b2
Use dts instead of pts for first values
2019-09-17 12:53:29 -04:00
Isaac Connor
0d347f0cf5
init log early so that we create zmc_m.log instead of undef.log
2019-09-17 11:37:48 -04:00
Isaac Connor
6041616efc
add string_toupper function
2019-09-17 11:37:20 -04:00
Isaac Connor
33aa6abf59
Only open log file if we are going to write to it.
2019-09-17 11:36:57 -04:00
Isaac Connor
ecde0a7ae0
Add a string_toupper function
2019-09-17 11:11:22 -04:00
Isaac Connor
1a94479751
Cleanup/rework. Handle database connection failure. This can happen if we init logging before config reading. Default terminal log level to warning. Cleanup logInit copying the options in order to populate mLogPath from config. We can handle this in the constructor now.
2019-09-17 11:10:59 -04:00
Isaac Connor
9a3765f6aa
spacing and google code style
2019-09-17 10:31:48 -04:00
Isaac Connor
4509c6a239
Don't set rtsp options unless we are using rtsp. Should prevent everyone from reporting the warning about unsupported options. Note that I removed some extra includs that have no business in zm_ffmpeg_camera.
2019-09-17 10:31:31 -04:00
Isaac Connor
c8934dac7f
Remove useless debug
2019-09-17 10:30:00 -04:00
Isaac Connor
cbf9931371
Don't log about calling dbConnect when already connected. We make this call in zm_logger, it is just going to have to be acceptable to call it multiple times.
2019-09-17 10:29:30 -04:00
Isaac Connor
54c14b17d7
Spacing and google code style
2019-09-17 10:28:42 -04:00
Isaac Connor
6925a75831
codec not ready is not an error. Make it a debug
2019-09-15 18:01:38 -04:00
Isaac Connor
0a31a8dab6
Just use pts instead of tracking both first pts and first dts. Should prevent conflicts
2019-09-15 17:53:25 -04:00
Isaac Connor
675cbe8854
code style, add bytes per second read statistic and a code comment about the sleeping
2019-09-14 10:48:39 -04:00
Isaac Connor
306bda86c2
fix sws_get_delay
2019-09-13 21:28:43 -04:00
Isaac Connor
eafa0da06f
fixes, handle when audio codec isn't open in ffmpeg_camera
2019-09-13 16:06:25 -04:00
Isaac Connor
3a5d1ff3ca
Hack in missing bits for ubuntu trusty/libav/avresample
2019-09-13 15:51:35 -04:00
Isaac Connor
5ddd20ed1a
refactor code. Handle resample buffering during encoding instead of when closing file
2019-09-13 14:34:53 -04:00
Isaac Connor
701aa8d924
add flushing the resample buffer to get the remaining samples encoded
2019-09-13 10:55:30 -04:00
Isaac Connor
788b5b480b
hack to make sync work on resample
2019-09-12 17:59:08 -04:00
Isaac Connor
d9d4c6b4ca
fix build
2019-09-12 17:26:19 -04:00
Isaac Connor
0a8aba2b76
rework how pts/dts is handled. We still use video_first_pts, but if the result is negative, normalize it to 0. Also now use audio_next_pts/dts to calculate pts when resampling and re-encoding. I believe this resolves the issues with wrong duration in the audio stream.
2019-09-12 16:52:59 -04:00
Isaac Connor
8fb55cdbff
Add codec name to zm_dump_codec and zm_dump_codecpar add new functions zm_receive_packet
2019-09-12 16:51:33 -04:00
Isaac Connor
6c6b2d7c6f
Fix build
2019-09-09 17:10:40 -04:00
Isaac Connor
097ce5e778
add const to cast
2019-09-09 17:09:01 -04:00
Isaac Connor
792af28c54
return a value from write_packet
2019-09-09 16:55:22 -04:00
Isaac Connor
d5aa95e45f
cpplint fixes
2019-09-09 16:13:32 -04:00
Isaac Connor
d5d4d9d19b
ret should be a heap var, not a member of the object. Somehow this also seems to fix crashing on debian buster. I assume the compiler is confused
2019-09-08 16:10:57 -04:00
Isaac Connor
8215fe1c0f
Some versions off avcodec libs have pkt_pts and pkt_dts but they have been deprecated and weren't of any use anyways
2019-09-08 16:10:20 -04:00
Isaac Connor
85e0a086b3
fixes #2694
2019-09-03 11:55:37 -04:00
Isaac Connor
c80ef0e0ab
spacing
2019-08-28 12:20:03 -04:00
Isaac Connor
bd3395ac98
introduce VideoStore::write_packet to refactor out duplicated code. Add the ability to receive multiple packets from audio encoder per input packet
2019-08-28 12:19:54 -04:00
Isaac Connor
efb8711c02
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-08-28 11:43:59 -04:00
Isaac Connor
5f0080ef92
Fix crash when using auth_relay=none
2019-08-28 10:34:30 -04:00
Isaac Connor
64d024b0c0
Fix spacing
2019-08-28 10:33:18 -04:00
Isaac Connor
505a041c88
Don't add a final db frame to the event, because there is no jpg for the frame. I don't know why this code was originally added.
2019-08-28 10:17:23 -04:00
Isaac Connor
59940ab675
report pixformat names instead of just #'s on error
2019-08-28 09:19:57 -04:00
Isaac Connor
39620c01ff
Add rescaling of pkt pts/dts from audio_out_ctx to audio_out_stream
2019-08-26 16:37:32 -04:00
Isaac Connor
b26ed9bf62
Yet more debugging. Also, move pts adjustment to before audio encoding
2019-08-26 16:17:45 -04:00
Isaac Connor
2fe9442257
Fix time_base conversion when flushing audio queue. Add more debugging. COrrect pkt_Duration when resampling audio
2019-08-23 18:17:26 -04:00
Isaac Connor
886a203bf1
Support hwaccel for non-passthrough case as well
2019-08-21 10:11:58 -04:00
Isaac Connor
01e988ffba
remove some redundant debugs. Improve some messages
2019-08-20 14:09:47 -04:00
Isaac Connor
4a82ce83a7
quit a bit earlier when stream is broken.
2019-08-20 11:13:38 -04:00
Isaac Connor
ed190340b9
fix typo
2019-08-19 11:12:47 -04:00
Isaac Connor
369dd03909
remove errant i
2019-08-18 21:32:19 -04:00
Isaac Connor
503cf6cd24
More backticking of SQL
2019-08-17 14:37:19 -04:00
Isaac Connor
efa264e0c7
Fix playing in reverse. Fix not sending first frame. Fix sql problem with backticks. Not being able to open a frame image is now non-fatal.
2019-08-16 10:24:51 -04:00
Isaac Connor
c7b6db9be7
Put backticks around all columns and tables in sql to deal with mysql 8
2019-08-14 16:18:21 -04:00
Isaac Connor
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
Isaac Connor
5b62c91cc2
Improve some debugging to try to diagnose recent segfault report
2019-08-10 14:46:05 -04:00
Isaac Connor
0cdb43e165
make dump_video_frame a define instead of a function, fix linesize
2019-08-10 14:45:45 -04:00
Isaac Connor
bb6d2631c9
Fix hwaccel compile on pi
2019-08-08 09:26:40 -04:00
Isaac Connor
6a9464044b
Demote warnings about fixing non-monotonic dts to debug
2019-08-02 08:03:02 -04:00
Isaac Connor
14ed777eeb
fix segfault when debbing is turned on for zma
2019-07-31 17:17:54 -04:00
Isaac Connor
90cb5d018a
Fix 2673 ( #2675 )
...
* Change MaxFPS to DECIMAL(5,3) to handle values like 1/60 = 0.017
* When fps < 1 we may need to wait longer than 10s. Also, we cannot sleep for a long time, because we may need to send a keep alive or check the command queue. So limit the sleep to 1s
* Bump version
* Update MaxFPS to Decimal(5,3)
* Fix missing ;
2019-07-31 11:42:38 -04:00
Isaac Connor
48ad8d47fc
Add capture_max_fps to monitor object instead of just calculating the delay.
2019-07-31 11:23:02 -04:00
Isaac Connor
4b89ced889
Warn about waiting more than .5s instead of .1
2019-07-26 12:24:36 -04:00
Isaac Connor
e5c194e9ee
Fix return 403 status code
2019-07-26 12:22:04 -04:00
Isaac Connor
09934ed7f5
Fix sendTextFrame
2019-07-26 12:21:25 -04:00
Isaac Connor
3da12fd141
Add a bunch of debugging
2019-07-26 12:21:15 -04:00
Isaac Connor
0643108ba4
Use fputs instead of fprintf. Spacing and google code style changes
2019-07-26 10:53:48 -04:00
Isaac Connor
1e0c39c632
mostly spacing cleanups. Don't bother setting pkt_duration on resampled frame
2019-07-19 16:28:18 -04:00
Isaac Connor
9a31f8792c
return proper error codes when failed auth or fail permissions
2019-07-19 13:55:35 -04:00
Isaac Connor
f3166663a5
unref hw_device_ctx on Close. I think this should release all the other hwaccel related stuff
2019-07-19 12:51:31 -04:00
Isaac Connor
fcee031785
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-07-17 21:10:46 -04:00
Isaac Connor
542d88b6a4
fix compile without HWCONTEXT
2019-07-17 21:10:24 -04:00
Pliable Pixels
a9d01ba3d2
Alarm api ( #2665 )
...
* fixed alarm api to use tokens if present
* clearer debug logs for tokens
* space
2019-07-17 20:38:58 -04:00
Pliable Pixels
2b7610a5ac
fixed ffmpeg log association to zm log levels ( #2664 )
2019-07-17 20:37:27 -04:00
Isaac Connor
75af397223
hwFrame isn't defined unless we have HWCONTEXT_H
2019-07-17 20:33:23 -04:00
Isaac Connor
34c141304d
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-07-17 10:07:29 -04:00
Isaac Connor
ef9fe2dbd6
Free up hwFrame, preventing memleak
2019-07-17 10:06:30 -04:00
Pliable Pixels
67168a2387
demote token log ( #2663 )
2019-07-12 14:31:39 -04:00
Isaac Connor
05be9008c7
use FFMPEGInit to initialise ffmpeg instead of doing it ourselves
2019-07-11 17:57:11 -04:00
Isaac Connor
13c91bdf60
Add pts adjustment to the delayed flushed encoder packets
2019-07-11 17:56:53 -04:00
Isaac Connor
288f2f3e8f
Convert zm_dump_frame from a function to a define, this way we get line #'s from where we call zm_dump_frame instead of from the line in zm_ffmpeg where the function was.
2019-07-11 17:56:22 -04:00
Isaac Connor
94cc85aa36
Sorta fix pts on encoded audio packets. Sync is off, but at least it is close
2019-07-07 08:57:22 -04:00
Isaac Connor
0f35d86efb
implement zm_send_frame which sends a frame and receives a packet
2019-07-07 08:56:39 -04:00
Isaac Connor
726e5c6dd5
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-07-03 09:50:49 -04:00
Isaac Connor
a9579484b8
gracefully handle failure to config hw pix fmt and debug a bit more
2019-07-03 09:49:53 -04:00
Isaac Connor
5ea5bd9bde
Only do audio_first_pts if we have audio_in_stream
2019-07-02 12:26:33 -04:00
Isaac Connor
4e8ac47060
Use the video_first_pts to set the audio_first_pts
2019-07-02 11:58:22 -04:00
Isaac Connor
2dc60196c5
Code cleanup and cpplint
2019-07-02 11:14:24 -04:00
Isaac Connor
268bc2264b
Merge branch 'storageareas'
2019-07-02 10:19:03 -04:00
Isaac Connor
d972ab6006
add min_section_length test to alarmed events that go unalarmed
2019-06-27 21:50:12 -04:00
Isaac Connor
0ab4f9fce0
More debugging in packetqueue.
2019-06-27 21:49:43 -04:00
Isaac Connor
3bd4486b65
Start event when alarm frames >= alarm_frame_count-1 because it is 1based. Add some debug.
2019-06-27 15:48:10 -04:00
Isaac Connor
ac7d4869de
We need to seek back pre_event_count video frames, not any frames
2019-06-27 15:36:13 -04:00
Daniel Schaefer
158b9438d7
Explicitly link with libdl ( #2649 )
...
Otherwise on some systems linking would fail with
undefined reference to symbol 'dlclose@@GLIBC_2.2.5'
2019-06-27 15:08:29 -04:00
Isaac Connor
dd57fd95ce
Clean up cruft from videostore api. Fix packetqueue clear_unwanted_packets to take a pre_event_count and take it into consideration when finding the right spot in the queue to start recording.
2019-06-27 11:11:14 -04:00
Isaac Connor
6ed29a3d56
Google code style, ifdef out all the extra includs that shouldn't be in the .h
2019-06-27 10:29:47 -04:00
Isaac Connor
6a87ae0fa7
fix compile warning by copying two bytes, which will grab the \0 after the \n
2019-06-27 10:24:51 -04:00
Isaac Connor
763fe16a04
Google code style, merge some fprintf's
2019-06-27 10:20:23 -04:00
Isaac Connor
0686f487ac
%s => %d for error count
2019-06-27 04:18:25 -04:00
Isaac Connor
d26286a170
fix test for hwtransfer needed
2019-06-27 03:40:18 -04:00
Isaac Connor
2a65b339c1
init hw_pix_fmt in constructor
2019-06-25 22:19:09 -04:00
Isaac Connor
86e8b58561
move hw_device_ctx under ifdef for HWCONTEXT_H
2019-06-25 22:06:00 -04:00
Isaac Connor
7389bbcb25
better debug in selecting hw_format, add CUDA, add setting device for hwaccel
2019-06-25 21:47:19 -04:00
Isaac Connor
a44631a59d
rough in support for ffmpeg 3.4
2019-06-25 16:35:07 -04:00
Isaac Connor
5ab4414b11
Only include hwaccel support if LIBAVUTIL_HWCONTEXT_H is deifned
2019-06-25 15:58:55 -04:00
Isaac Connor
679b6b1b2d
remove old qsv code
2019-06-25 15:47:23 -04:00
Isaac Connor
46f3aabc25
Merge branch 'hwdecode' into storageareas
2019-06-25 15:35:56 -04:00
Isaac Connor
86c4051c44
handle zm_receive_frame returning AVERROR instead of boolean
2019-06-25 15:34:36 -04:00
Isaac Connor
434bbce954
Add loading decoder_hwaccel in Monitor
2019-06-25 15:34:17 -04:00
Isaac Connor
d0abd16494
add passing hwaccel name and device. use av_make_error_string(ret).c_str() to reduce code and increase consistency
2019-06-25 15:34:01 -04:00
Isaac Connor
cf7f3e8a88
add passing hwaccel name and device. use av_make_error_string(ret).c_str() to reduce code and increase consistency
2019-06-25 15:33:54 -04:00
Isaac Connor
6a87d9a875
change zm_receive_frame to return AVERROR instead of boolean
2019-06-25 15:32:47 -04:00
Isaac Connor
2cbcaeebbc
clean out old hwdecode stuff. refactor common code out
2019-06-25 14:11:59 -04:00
Isaac Connor
bfb7238edb
Merge branch 'master' into hwdecode
2019-06-25 09:09:57 -04:00
Isaac Connor
c3135accbb
Make events close on a section length time boundary only if event_close_mode == CLOSE_TIME. When an alarm happens in event_close_mode==ALARM, close the continuous event regardless of the # of pre-event frames in the event. Add some debugging
2019-06-24 21:11:52 -04:00
Isaac Connor
246b4cb9d1
working hwdecode
2019-06-24 17:22:59 -04:00
Isaac Connor
2d80283844
simplify some logic in Analyze and prevent segfault when we close continuous event to start alarm event
2019-06-24 13:13:46 -04:00
Isaac Connor
9a353d0b6d
don't set frame size
2019-06-24 11:44:21 -04:00
Isaac Connor
44e4d93445
Merge branch 'master' into storageareas
2019-06-24 11:35:36 -04:00
Isaac Connor
6ed0074077
End continuous events on alarm ( #2644 )
...
* Reference /run/zm instead of /var/run/zm because systemd-tmpfiles complains about it
* Spacing, google code style and tabs to spaces
* add update script to add MinSectionLength
* Add min_section_length to enforce a minimum event length when closing continuous events on alarm
2019-06-24 11:29:00 -04:00
Pliable Pixels
299f994506
Fix zmcrypt message ( #2645 )
...
* added more clarity on zm_crypt authentication errors
* fixed variable name
2019-06-24 11:28:32 -04:00
Isaac Connor
dab9544845
Revert audio sync fixes ( #2646 )
...
* Reference /run/zm instead of /var/run/zm because systemd-tmpfiles complains about it
* Spacing, google code style and tabs to spaces
* Revert the work I did to srt packets by dts after changing their time_base. It doesn't work. Instead since dts doesn't actually matter to playback, only ffmpeg storing, munge it to whatever is neccessary to make ffmpeg happy.
2019-06-24 11:27:47 -04:00
Isaac Connor
9713d908fb
Spacing, google code style and tabs to spaces
2019-06-24 10:28:11 -04:00
Andrew Bauer
00183b535a
rename bcrypt to libbcrypt to reflect name of the project
2019-06-23 12:56:04 -05:00
Andrew Bauer
8b37c0e9b0
remove bcrypt & jwt-cpp as submodules, bring in statically under src
2019-06-23 12:12:12 -05:00
Isaac Connor
55d98e4a9f
fix crash
2019-06-20 15:56:25 -04:00
Isaac Connor
470da03322
Merge sync fixes from storageareas
2019-06-20 15:14:20 -04:00
Isaac Connor
f6960726b8
Don't check cause.length because we know it hasn't been used yet. check event_close_mode before closing the continuous unalarmed event
2019-06-20 15:12:32 -04:00
Isaac Connor
4c8b8d0c16
Only check pts vs dts if pts isn't AV_NOPTS_VALUE. Also set frame_size in output codec when doing passthrough
2019-06-20 15:09:30 -04:00
Isaac Connor
8b95ba8b3c
it is ok for pts to be AV_NOPT_VALUE. It is not yet deprecated and doesn't mess anything up.
2019-06-20 15:08:38 -04:00
Isaac Connor
540a114c4b
spacing google code style
2019-06-19 10:31:53 -04:00
Isaac Connor
cc35e3f187
add dumpQueue to packetqueue to print out the contents
2019-06-19 09:51:06 -04:00
Isaac Connor
16b035f76c
Use common first_dts/pts instead of separate video and audio first pts/dts
2019-06-19 09:22:21 -04:00
Isaac Connor
9727d0ed9f
spaces
2019-06-19 09:22:21 -04:00
Isaac Connor
847cd9f347
Print out an error when a monitor is in MONITOR mode because we can't handle alarms. Allow signals to terminate zmu by checking zm_terminate.
2019-06-19 09:22:21 -04:00
Isaac Connor
33951ae584
Print out an error when a monitor is in MONITOR mode because we can't handle alarms. Allow signals to terminate zmu by checking zm_terminate.
2019-06-19 08:36:37 -04:00
Isaac Connor
695bdfc1c6
big ::Analyze logic cleanup. Also implement close continuous event before starting motion event in MOCORD
2019-06-13 15:48:41 -04:00
Isaac Connor
b073505146
If either pts or dts is AV_NOPTS_VALUE then set equal to the other
2019-06-13 15:47:58 -04:00
Isaac Connor
30a210f68f
also need to adjust dts of last packet when switching events
2019-06-12 10:05:08 -04:00
Isaac Connor
222f145230
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-06-11 13:56:13 -04:00
Isaac Connor
0a9ae1d4f9
Include pixdesc.h to get av_get_pix_fmt_name(AVPixelFormat)
2019-06-11 13:55:57 -04:00
Isaac Connor
acb95709e6
Fix issues with too much audio in events by storing packets in the queue with their timestamps converted to AV_TIME_BASE_Q, so that we can sort video and audio packets together.
2019-06-11 10:19:42 -04:00
Isaac Connor
ee80b086af
log the # of db entries being written before doing the writing so that we know the # being written
2019-06-10 14:13:21 -04:00
Isaac Connor
50436c5ea1
Correct debug line listing how many frames are being written to db
2019-06-10 13:59:01 -04:00
Isaac Connor
ebc9a77c9d
When saving jpegs, do a db write on the first frame. Fix test for writing frame info to db. Because we increment frames, it is essentially 1-based. So the test needs to be ==1 instead of !
2019-06-10 12:57:57 -04:00
Isaac Connor
a16d29740c
Fix final frame of event having same id as the second last
2019-06-06 13:49:01 -04:00
Isaac Connor
4b8a2a94e3
reduce frame send time too slow to a warning instead of error
2019-06-05 10:12:56 -04:00
Gleb Popov
1d132b5923
When writing MP4 sample, save buffer.size() into a temporary variable before calling buffer.extract(). ( #2628 )
2019-06-01 16:43:29 -04:00
Isaac Connor
7b06f58559
Limit Connection error logs to every 10 minutes instead of every 10 seconds. Connection attempts still happen at 10 second intervals
2019-05-27 17:16:23 -04:00
Isaac Connor
049b70a624
junk bad code in zm_eventstream that tried to figure out how long to sleep by considering the wall clock time since play start. No good as soon as we seek.
2019-05-27 17:15:46 -04:00
Isaac Connor
c44967f770
fix push to push_front
2019-05-27 12:47:38 -04:00
Isaac Connor
663f941963
If we can't find a packet before ours in the queue, then stick it at the front of the queue, not the end.
2019-05-27 12:31:18 -04:00
Isaac Connor
8b4fddadfb
out_frame->pts is calculated in resample_audio
2019-05-27 12:29:29 -04:00
Isaac Connor
67b8ca8bfb
Fix superfast playback after replay
2019-05-24 13:45:48 -04:00
Isaac Connor
0a8b7c24db
don't check for alarmed zones to record stats for unless we are alarmed
2019-05-24 10:52:31 -04:00
Isaac Connor
93aeceecfc
Merge branch 'crypt-replacement' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-crypt-replacement
2019-05-17 10:18:15 -04:00
Isaac Connor
3888d140a8
Merge branch 'master' into storageareas
2019-05-17 10:16:29 -04:00
Pliable Pixels
06eb9a3bb2
merge typo
2019-05-16 16:15:16 -04:00
Pliable Pixels
915e9f05a9
merged fifo changes
2019-05-16 16:14:06 -04:00
Mitch Capper
eb005e8b9c
FIFO support for zoneminder zone debugging ( #2594 )
...
Adds fifo options for diagnostic images for much lower impact diagnostics mode. Diagnostic images are only written when there is a client listening for them (otherwise they are skipped). Also added a json stream for the detection data so you can see in real time the pixels or blobs detected for the motion. This allows for easy real time stream of both delta and reference images (as video streams) along with the detection numbers.
2019-05-16 15:37:03 -04:00
Isaac Connor
4f44db8cbf
ifdef HAVE_ZLIB_H around code that uses Image->Zip ( #2597 )
2019-05-16 15:35:19 -04:00
Isaac Connor
c257fb46f6
Merge branch 'storageareas' of github.com:connortechnology/zoneminder into storageareas
2019-05-13 10:34:45 -04:00
Isaac Connor
74095963cc
Merge branch 'master' into storageareas
2019-05-12 19:39:09 -04:00
Pliable Pixels
21710b6e49
demote logs
2019-05-12 15:45:39 -04:00
Pliable Pixels
cc0d23ce4e
move token index after adding password
2019-05-12 15:01:49 -04:00
Pliable Pixels
9a8aa5453b
add Password back so User object indexes don't change
2019-05-12 14:48:23 -04:00
Isaac Connor
22c5d46c65
rescale audio packet duration and pts before feeding to codec after resample
2019-05-12 12:14:03 -04:00
Isaac Connor
d7daf8550f
Merge branch 'master' into storageareas
2019-05-12 09:37:41 -04:00
Isaac Connor
453bc2afd8
more frame dumping in resample
2019-05-12 09:36:26 -04:00
Isaac Connor
aada171440
clean up some logic in Analyse
2019-05-12 09:35:48 -04:00
Pliable Pixels
8499958767
typo
2019-05-12 05:57:17 -04:00
Pliable Pixels
225893fcd6
add mintokenexpiry to DB seek
2019-05-12 05:50:19 -04:00
Pliable Pixels
1f22c38453
more fixes
2019-05-12 05:10:20 -04:00
Pliable Pixels
6ab31dfe4b
more fixes
2019-05-12 05:03:16 -04:00
Pliable Pixels
3e66be27a8
use strtoul for conversion
2019-05-11 16:09:42 -04:00
Pliable Pixels
053e57af62
use strtoul for conversion
2019-05-11 16:01:05 -04:00
Pliable Pixels
96fa6149a8
use strtoul for conversion
2019-05-11 15:58:07 -04:00
Pliable Pixels
ae14be916c
initial plumbing to introduce token expiry and API bans per user
2019-05-11 13:39:40 -04:00
Isaac Connor
67c20aa976
fix frame->duration to frame->pkt_duration
2019-05-10 12:58:54 -04:00
Isaac Connor
d3a680aaa3
Set out_frame duration when resampling. Better error message if failed to write to fifo
2019-05-10 12:31:10 -04:00
Pliable Pixels
8461852e27
move out sha header
2019-05-08 19:32:58 -04:00
Pliable Pixels
0bb5ff934e
move sha headers out
2019-05-08 19:17:31 -04:00
Pliable Pixels
4ab0c35962
move JWT/Bcrypt inside zm_crypt
2019-05-08 16:45:28 -04:00
Pliable Pixels
2212244882
fix absolute path
2019-05-08 15:47:38 -04:00
Pliable Pixels
c41a2d067c
fixed type conversion
2019-05-08 14:29:44 -04:00
Pliable Pixels
bc050fe330
support refresh tokens as well for increased security
2019-05-08 13:38:42 -04:00
Pliable Pixels
27e6e46f84
remove allowing auth_hash_ip for token
2019-05-08 12:11:32 -04:00
Pliable Pixels
3c6d0131ff
fix db read, forgot to exec query
2019-05-08 12:06:37 -04:00
Pliable Pixels
04c3bebef9
exception handling for try/catch
2019-05-08 11:44:15 -04:00
Pliable Pixels
3a67217972
move decode inside try/catch
2019-05-08 11:29:34 -04:00
Pliable Pixels
bb18c305ab
add token to command line for zmu
2019-05-08 11:08:27 -04:00
Pliable Pixels
b293592e4c
added token validation to zms/zmu/zmuser
2019-05-08 10:55:32 -04:00
Isaac Connor
4c8a29e8d3
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2019-05-08 06:06:28 -04:00
Isaac Connor
3a7b49560a
spacing
2019-05-06 12:16:06 -04:00
Isaac Connor
9469ce8c71
Merge branch 'section_length_when_modect' into storageareas
2019-05-06 10:50:41 -04:00
Isaac Connor
9ef912f2ba
add missing new event status info
2019-05-06 10:50:12 -04:00
Pliable Pixels
4c8d20db64
typo
2019-05-04 15:27:00 -04:00
Pliable Pixels
983e050fd7
fixed SHA1 algo
2019-05-04 15:20:31 -04:00
Pliable Pixels
d952fe7117
Moved to openSSL SHA1, initial JWT plugin
2019-05-04 11:52:53 -04:00
Isaac Connor
50070a9a7c
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2019-05-03 14:59:14 -04:00
Isaac Connor
1e08b333b4
choose cur_dts instead of 0 for dts
2019-05-03 14:59:09 -04:00
Isaac Connor
4ecf41f2b4
Merge branch 'sort_packets' into storageareas
2019-05-03 14:58:34 -04:00
Isaac Connor
c91da4a7f5
if no packet found, still append to end
2019-05-03 14:58:29 -04:00
Isaac Connor
21999cf943
Merge branch 'sort_packets' into storageareas
2019-05-03 13:48:23 -04:00
Isaac Connor
aec8311deb
implement sorting incoming packets in the packetqueue
2019-05-03 13:48:05 -04:00
Pliable Pixels
ca2e7ea97c
logs tweak
2019-05-03 12:01:13 -04:00
Pliable Pixels
72325d12b7
move to wrapper
2019-05-03 11:40:35 -04:00
Isaac Connor
63a970d49f
Merge branch 'fix_no_zlib' into storageareas
2019-05-03 09:42:06 -04:00
Isaac Connor
aaf4665909
Merge branch 'section_length_when_modect' into storageareas
2019-05-03 09:41:41 -04:00
Isaac Connor
f6b6daafab
close and reopen event when we hit section_length
2019-05-03 09:41:29 -04:00
Isaac Connor
fee95c2316
ifdef HAVE_ZLIB_H around code that uses Image->Zip
2019-05-03 09:04:31 -04:00
Pliable Pixels
45b7814124
absolute path
2019-05-01 14:33:36 -04:00
Pliable Pixels
65a57feedb
absolute path
2019-05-01 14:30:00 -04:00
Pliable Pixels
c663246f0a
try add_library instead
2019-05-01 14:22:10 -04:00
Pliable Pixels
ca24b504d4
fixed typo
2019-05-01 13:46:54 -04:00
Pliable Pixels
8bbddadc12
put link_dir ahead of add_executable
2019-05-01 13:43:41 -04:00
Pliable Pixels
07be830f94
added bcrypt to others
2019-05-01 13:35:18 -04:00
Pliable Pixels
dd63fe86ce
add sha source
2019-05-01 13:28:39 -04:00
Pliable Pixels
ddb7752226
added include path
2019-05-01 13:24:50 -04:00
Pliable Pixels
1ba1bf0c45
added test sha1 and bcrypt code to validate working
2019-05-01 13:18:51 -04:00
Pliable Pixels
c4b1bc19e0
added bcrypt and sha to src build process
2019-05-01 13:15:07 -04:00
Isaac Connor
25614bb75e
Merge branch 'master' into storageareas
2019-05-01 08:57:20 -04:00
Isaac Connor
847d4c5e80
Merge branch 'master' of github.com:/ZoneMinder/ZoneMinder
2019-04-29 12:50:31 -04:00
Isaac Connor
28269eccc3
Fix Remote RTSP Method on newer ffmpeg
2019-04-28 12:05:32 -04:00
Isaac Connor
626342f00e
Merge branch 'master' into storageareas
2019-04-26 10:44:00 -04:00
Isaac Connor
c4fb2cc407
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-04-25 18:45:54 -04:00
Isaac Connor
18285e1b94
fix using in_frame->nb_samples instead of out_frame->nb_samples in resample fifo.
2019-04-25 18:45:43 -04:00
Pliable Pixels
ea7c38ceff
Alarm cause fix ( #2582 )
...
* move alarm cause code to when the alarm flag is set
* formatting
* added temp info log
* char* not string in log
* merged alarm clause into info message about alarm
* add a comma only if there are more active zones
* JB tweak to slightly optimize leading comma processing
2019-04-24 13:55:57 -04:00
Isaac Connor
eb76cd87bb
Revert "Alarm cause fix ( #2580 )" ( #2581 )
...
This reverts commit 6923382485
.
2019-04-17 13:53:11 -04:00
Pliable Pixels
6923382485
Alarm cause fix ( #2580 )
...
* move alarm cause code to when the alarm flag is set
* formatting
* added temp info log
* char* not string in log
2019-04-17 13:33:38 -04:00
Isaac Connor
70ed4a4646
Must unlock mutex before destructor as we do some logging in the mutex destructor when we destroy it while locked.
2019-04-16 11:51:10 -04:00
Isaac Connor
22adb243ec
Fix crash when reporting an event longer than section length when event was just closed so event is null.
2019-04-16 11:50:41 -04:00
Isaac Connor
2ff1e7ed6d
Fix crash when reporting an event longer than section length when event was just closed so event is null.
2019-04-16 11:30:18 -04:00
Isaac Connor
98a9c68b8b
spacing and code documentation
2019-04-15 17:54:30 -04:00
Isaac Connor
293ec20824
Must unlock mutex before destructor as we do some logging in the mutex destructor when we destroy it while locked.
2019-04-15 17:54:17 -04:00
Isaac Connor
3664084862
Handle out of order dts in writeAudioFrame
2019-04-15 13:27:13 -04:00
Isaac Connor
f28af7b729
store diag_path in the object and initialize them in constructor instead of constantly checking to see if they have been initialized in DetectMotion. Also use a string instead of a static char[MAX_PATH]. Also split it into diag_path_r and diag_path_d to fix the bug that only diag_path_r would ever get created and would be overwritten by the delta image.
2019-04-15 13:26:55 -04:00
Isaac Connor
93f0a03d8b
spacing and code comments
2019-04-15 12:55:28 -04:00
Isaac Connor
7c8b37e08c
fix mutex hang on Fatal
2019-04-15 11:21:23 -04:00
Isaac Connor
439a7b3ab3
Don't set bitrate, etc when h264. Causing crashes in ffmpeg 4.11.
2019-04-14 13:50:10 -04:00
Isaac Connor
69f812f5cc
force section end when seconds % section_length == 0 which is the old behaviour.
2019-04-09 19:42:24 -04:00
Isaac Connor
7671f59d2f
Add error counting on decoding
2019-04-09 12:27:40 -04:00
Isaac Connor
fab548b119
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-04-08 16:46:28 -04:00
Isaac Connor
1b98f3529f
allow non-increasing dts in muxer
2019-04-08 14:18:59 -04:00
Isaac Connor
7f2440177b
remove duplicate dump_codec
2019-04-08 13:51:55 -04:00
Isaac Connor
accaeadb18
code cleanup. dump_codecs
2019-04-08 13:51:41 -04:00
Isaac Connor
e81c216b4a
add more fields in dump_codec.
2019-04-08 13:51:13 -04:00
Isaac Connor
3c57d79669
Go back to using video_first_dts
2019-04-08 10:04:26 -04:00
Isaac Connor
f719dd9acc
always commit buffered db_frames when we have a new max score image or alarm cause image
2019-04-07 10:29:02 -04:00
Isaac Connor
9faaba9300
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-04-05 15:18:39 -04:00
Isaac Connor
9ae6acf532
Fix for opening audio_in_codec
2019-04-04 17:20:21 -04:00
Isaac Connor
d97dd6cdd9
Should close videostore before closing input codecs/streams.
2019-04-04 14:11:56 -04:00
Isaac Connor
7955a1c9b2
fix version check to get rid of deprecated av_register_all
2019-04-04 12:56:00 -04:00
Isaac Connor
bc62493096
Increase sql buffer space because we are using path strings that are PATH_MAX size.
2019-04-04 12:55:35 -04:00
Isaac Connor
f6d5038586
we only use event_file if we are writing out a jpg, so only generate the event_file string if we are writing out jpgs
2019-04-04 12:37:25 -04:00
Isaac Connor
271937f005
store the snapshot_file and alarm_file strings in the boject during construction so that we don't have to do it everytime we write out an image
2019-04-04 12:28:08 -04:00
Isaac Connor
f3d0c4e643
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2019-04-04 09:37:13 -04:00
Isaac Connor
8de7d576a5
spacing and use Error instead of fprintf(stderr) so that things get logged.
2019-04-04 09:35:37 -04:00
Isaac Connor
8d3fa807e2
compilation fixes for old ffmpeg
2019-04-03 16:51:41 -04:00
Isaac Connor
12631abd46
when copying a packet (for old ffmpeg) copy pts, dts and duration too
2019-04-03 16:51:27 -04:00
Isaac Connor
94479fc850
copy pkt flags as well. When pts is NOPTS_VALUE set it to zero
2019-04-03 16:03:21 -04:00
Isaac Connor
055efdc950
Merge branch 'master' of github.com:ConnorTechnology/ZoneMinder
2019-04-03 14:56:18 -04:00
Isaac Connor
bd9b5afe46
old ffmpeg doesn't have av_frame_unref and it doesn't seem to be needed
2019-04-03 14:56:14 -04:00
Isaac Connor
2e7fd7c9a2
handle really old ffmpeg not having pkt_duration
2019-04-03 14:55:29 -04:00
Isaac Connor
b53e4aa803
fix segfault
2019-04-03 14:51:10 -04:00
Isaac Connor
b6f35db4de
put back codec closing in destructure, testing with bionic
2019-04-03 14:25:18 -04:00
Isaac Connor
aece64049f
We cannot avcodec_open2 a context that has been duped. This code currently works without crashes and leaks on ffmpeg 2.8
2019-04-03 13:23:00 -04:00
Isaac Connor
f78e95f5d4
add is_video_context and is_audio_context and use them in zm_revceive_frame to add audio decoding support
2019-04-03 13:21:52 -04:00
Isaac Connor
bd412fa9ca
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-04-02 14:25:50 -04:00
Isaac Connor
036560e3e9
Allow packets with pts=AV_NOPTS_VALUE
2019-04-02 14:23:49 -04:00
Isaac Connor
cd28559c03
when encoding audio, pts and dts have to come from the encoder.
2019-04-02 14:08:46 -04:00
Isaac Connor
87cb716500
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-04-01 14:02:46 -04:00
Isaac Connor
cb33318c4a
fix invalid memory access due to incorrect opening/closing/copying of contexts
2019-04-01 14:02:39 -04:00
Isaac Connor
a6998cbc9e
Use FFMPEGDeInit instead of avformat_network_deinit
2019-04-01 13:39:11 -04:00
Isaac Connor
c9985107ee
Add a deinit function to handle avformat_network_deinit
2019-04-01 13:38:13 -04:00
Isaac Connor
ed5a448a1d
Correct pts on audio frame before sending it to the encoder so that when we flush the encoder the resulting packets have the right pts.
2019-04-01 11:13:14 -04:00
Isaac Connor
90e97ff135
Merge branch 'master' into storageareas
2019-03-28 11:20:29 -04:00
Isaac Connor
e6547953b0
fix segfault using old ffmpeg
2019-03-28 09:24:32 -04:00
Isaac Connor
acb9070b04
Add a warning when an event exceeds section length
2019-03-25 12:33:30 -04:00
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