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 |