Isaac Connor
|
224fcd2cd3
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2021-02-25 14:58:45 -05:00 |
|
Isaac Connor
|
550d302316
|
Fix Crud version back to origin
|
2021-02-25 14:18:51 -05:00 |
|
Isaac Connor
|
8aeb4ab758
|
Switch db_mutex to a std::mutex. Use modern locking with it. Use zmDbDo or dbQueue.push where appropriate. code cleanup.
|
2021-02-25 12:26:26 -05:00 |
|
Isaac Connor
|
fdf515ca10
|
rough in a db queue thread. Use it in zm_logger so that we don't have to aquire the db lock
|
2021-02-24 19:59:55 -05:00 |
|
Isaac Connor
|
d106c2fcc3
|
Add 4MP and 6MP resoolutions
|
2021-02-24 15:03:11 -05:00 |
|
Isaac Connor
|
6f89eba154
|
add missing ()
|
2021-02-24 13:48:59 -05:00 |
|
Isaac Connor
|
778a4f1d84
|
We cannot wait for the db lock. Do not wait.
|
2021-02-24 13:48:36 -05:00 |
|
Isaac Connor
|
0d2febc958
|
Make monitor column open the event instead of monitor edit
|
2021-02-24 12:38:12 -05:00 |
|
Isaac Connor
|
9959464ef7
|
Fix ]\n being included in the db Logs entry. Also removes a strlen so performance should improve
|
2021-02-24 12:37:09 -05:00 |
|
Isaac Connor
|
58e3d96f8c
|
Instead of using basename and doing a strdup etc, just use strrchr because the filepath is going to one of the sources files in zm.
|
2021-02-24 12:23:02 -05:00 |
|
Isaac Connor
|
099ca9251c
|
Only init camera if capturing
|
2021-02-24 10:33:29 -05:00 |
|
Isaac Connor
|
381b7e1b25
|
Don't disconnect/reconnect while PrimeCapture is failing. Don't sleep if there is failure in capturing and zm_terminate is set.
|
2021-02-24 10:29:26 -05:00 |
|
Isaac Connor
|
c8abeddc9c
|
swscale is a problem. When to use alignment/padding? Defaulting to alignment=1 makes libvnc work, but is less performant. Some scale operations require padding.
|
2021-02-24 10:10:37 -05:00 |
|
Isaac Connor
|
3ce0564e9c
|
Code style spacing and cleanups.
|
2021-02-24 10:10:37 -05:00 |
|
Isaac Isaac
|
3eb67fa2fc
|
We have to Prime every monitor not just the first one.
|
2021-02-23 13:12:40 -05:00 |
|
Isaac Isaac
|
f2143fd092
|
Improve debug logs
|
2021-02-23 13:12:09 -05:00 |
|
Isaac Isaac
|
3225851224
|
Move call to Initialise into Constructor making sure that it only gets called once. Move channel switching out of PostCapture into just after capturing image in order to free up more time for image to stabilise while we do other things like timestamping etc which happen in Capture.
|
2021-02-23 13:11:34 -05:00 |
|
Isaac Connor
|
0ac3e6fd5b
|
remove unneeded strlen
|
2021-02-22 20:40:30 -05:00 |
|
Isaac Connor
|
64c601fc7b
|
Must fix_deprecations on both values
|
2021-02-22 20:40:30 -05:00 |
|
Isaac Connor
|
62da77db50
|
Don't set a default crf. Many codecs don't support it. Failure to open encoder should only be a warning if we have specified it
|
2021-02-22 20:40:30 -05:00 |
Andrew Bauer
|
c8be0d58d5
|
eslint - fix whitespace
|
2021-02-22 19:02:24 -06:00 |
|
Isaac Connor
|
730cd815d3
|
Add frame format to debug logging. Use fix_deprecated_fmt to fix when ctx->fmt is yuvj420p instead of yuv420p
|
2021-02-22 15:48:16 -05:00 |
Isaac Connor
|
8a417bb8d2
|
Add override to processCommand declarations. Remove unused fd var
|
2021-02-22 08:15:48 -05:00 |
|
Isaac Connor
|
5f207664d5
|
Add override to processCommand declarations.
|
2021-02-22 08:15:36 -05:00 |
|
Isaac Connor
|
6c013f0e65
|
Put back includes needed on FreeBSD. Fixes #3165
|
2021-02-22 08:03:10 -05:00 |
|
Isaac Connor
|
82c4a1a417
|
put third refresh button back for now
|
2021-02-22 11:57:27 -05:00 |
|
Isaac Connor
|
3a8e2ff869
|
Hide duplicated refresh button
|
2021-02-22 11:25:00 -05:00 |
|
Isaac Connor
|
9aad09a735
|
Refresh bootstrap table if the ajax fails.
|
2021-02-22 11:24:30 -05:00 |
|
Isaac Connor
|
88f3d732b4
|
Always use AV_TIME_BASE_Q in video encoding mode as we use packet->timestamp instead of pts. Fixes duration problems with encoded video. Fixes #3160
|
2021-02-22 11:17:17 -05:00 |
|
Isaac Connor
|
7a17a6f9e8
|
Fix always returning YUV420P despite being valid format.
|
2021-02-22 11:14:00 -05:00 |
|
Isaac Connor
|
9fec32fdc5
|
We now support audio when doing video encoding
|
2021-02-22 09:55:40 -05:00 |
|
Isaac Connor
|
7c042c7837
|
If doing encoding, we don't care about keyframe
|
2021-02-21 20:24:36 -05:00 |
|
Isaac Connor
|
5d826fd558
|
Don't try to addup/update DIskSpace used by incomplete events.
|
2021-02-20 17:11:20 -05:00 |
|
Isaac Connor
|
4d739f35ef
|
Fix parseTree when using iS or ISNOT. Add strtoupper comparisons for NULL values.
|
2021-02-20 17:07:07 -05:00 |
|
Isaac Connor
|
0fc4b00ac1
|
Allow null as well as NULL infilter values
|
2021-02-20 12:32:38 -05:00 |
|
Isaac Connor
|
e562888ed0
|
Fix crash when decoder returns 0 and when are using hwaccel
|
2021-02-19 21:03:10 -05:00 |
|
Isaac Connor
|
bf0ae8b270
|
use fix_deprecated_pix_fmt function. Fix logic on out_buffer_size.
|
2021-02-19 20:43:24 -05:00 |
|
Isaac Connor
|
86d424baf0
|
Move closeEvent to Close(). If we are closing the camera, we have to close the event as well.
|
2021-02-19 20:42:36 -05:00 |
|
Isaac Connor
|
f440ecb235
|
Add dlcose, and a resize() function to allocate the framebuffer our own way
|
2021-02-19 20:42:07 -05:00 |
|
Isaac Connor
|
a5ad7462e0
|
add dlclose
|
2021-02-19 20:41:41 -05:00 |
|
Isaac Connor
|
16773573ad
|
Since audio encoding uses it's own pts counting, we don't need to copy the ipkt.
|
2021-02-19 16:36:06 -05:00 |
|
Isaac Connor
|
2f917b4fac
|
Must copy input packet before modifying pts/dts.
|
2021-02-19 15:58:49 -05:00 |
|
Isaac Connor
|
507cbf7f0f
|
Remove some debugging
|
2021-02-19 15:56:42 -05:00 |
|
Isaac Connor
|
b9669ad69f
|
Log new signal on signal change
|
2021-02-19 15:56:30 -05:00 |
|
Isaac Connor
|
d8e37945a3
|
TRY OUT SWS_POINT|SWS_BITEXACT scaling
|
2021-02-19 13:44:37 -05:00 |
|
Isaac Connor
|
415dd83d06
|
spacing
|
2021-02-19 12:44:24 -05:00 |
|
Isaac Connor
|
551e35b4bf
|
dump incoming video packet for debug
|
2021-02-19 12:44:24 -05:00 |
|
Isaac Connor
|
d85e4121ef
|
set pts of dest_frame to make debug less confusing
|
2021-02-19 12:44:24 -05:00 |
|
Isaac Connor
|
ed6fc9fca6
|
use av_frame_copy_props to copy frame members instead of doing it manually
|
2021-02-19 12:44:24 -05:00 |
|
Isaac Connor
|
2c0261bef4
|
Include time_base in DUMP_PACKET
|
2021-02-19 12:44:24 -05:00 |