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 |
|
Isaac Connor
|
124d9bf798
|
Fix logging when holding db lock
|
2021-02-19 12:09:02 -05:00 |
|
Isaac Connor
|
3dab7d3ecc
|
Don't need to Disconnect when Capture will return -1, as we will call Close() which calls Disconnect()
|
2021-02-19 12:08:48 -05:00 |
|
Isaac Connor
|
4ba290a9ca
|
Use zmDbDo where appropriate and fix some logging while holding the lock
|
2021-02-19 12:08:19 -05:00 |
|
Isaac Connor
|
d8afd58072
|
Remove 1 seconds sleeps from db timeout loops. 1 second is a long time. Remove UpdateFramesDelta code which is no longer needed
|
2021-02-19 12:07:59 -05:00 |
|
Isaac Connor
|
a8e63e4f20
|
watch for zm_terminate in db while loops
|
2021-02-19 12:07:12 -05:00 |
|
Isaac Connor
|
964b3dd05a
|
Merge branch 'master' of github.com:zoneminder/ZoneMinder
|
2021-02-19 09:03:31 -05:00 |
Andrew Bauer
|
3fb1054093
|
bstable export requires tableExport plugin
|
2021-02-18 20:22:19 -06:00 |
|
Isaac Connor
|
045cd219f8
|
Move clear packetqueue logic to it's own function and call it from the analysis thread.
|
2021-02-18 19:25:40 -05:00 |
|
Isaac Connor
|
78a5e78e4c
|
Add locking to get_event_start_it. Packets could get deleted while we are figuring this out.
|
2021-02-18 16:59:17 -05:00 |
|
Isaac Connor
|
5ad9244a73
|
Use new db utility functions to simplify event creation code
|
2021-02-18 16:01:45 -05:00 |
|
Isaac Connor
|
63a45888a0
|
Introduce utility functions zmDbDo and zmDbDoInsert.
|
2021-02-18 16:01:30 -05:00 |
|
Isaac Connor
|
bc41cd944e
|
Add missing db_lock.unlock()
|
2021-02-18 15:00:30 -05:00 |
|
Isaac Connor
|
9502762ce8
|
WIP cleanup. Don't need to malloc ram as rfbInit will do it. We may need to allocated a larger buffer though, so may need to give vncserver a different malloc function
|
2021-02-18 13:47:27 -05:00 |
|
Isaac Connor
|
c99f43205d
|
add parenthesis for safety
|
2021-02-18 13:47:27 -05:00 |
|
Isaac Connor
|
a4d8ef5d8f
|
Use new version of fix_deprecated_pix_fmt
|
2021-02-18 13:47:27 -05:00 |
|
Isaac Connor
|
6d8a7a7a4c
|
add SWSCale::GetBufferSize to reduce duplicated lines of code. Makes input buffer size not have to match the aligned size. Reading from doesn't generally cause a crash.
|
2021-02-18 13:47:27 -05:00 |
|
Isaac Connor
|
127e15ba3a
|
Don't crash if we ask for packet count of an invalid stream
|
2021-02-18 13:47:27 -05:00 |
|
Isaac Connor
|
c7dede0083
|
Cleanups in connect/disconnect
|
2021-02-18 13:47:27 -05:00 |
|
Isaac Connor
|
8a329df5ec
|
change how fix_deprecated_pix_fmt works to return a value so we can use it elsewhere
|
2021-02-18 13:47:27 -05:00 |
|
Isaac Connor
|
04c13c6ff3
|
Handle value of auto for encoder
|
2021-02-18 13:30:38 -05:00 |
|
Isaac Connor
|
0d59584250
|
Only set DefaultVideo if we are successful at opening videoStore. Set save_jpegs flag in db record if we turn it on after failing videoStore.
|
2021-02-18 13:30:05 -05:00 |
|
Isaac Connor
|
f05488ee49
|
better error message when can't set crf
|
2021-02-18 11:55:09 -05:00 |
|
Isaac Connor
|
b40a31d76f
|
Move content of setMaxVideoPcakets into .cpp
|
2021-02-18 11:54:50 -05:00 |
|
Isaac Connor
|
b1f337b6e7
|
Move setMaxVideoPackets down to where pre_event_count has a value
|
2021-02-18 11:54:32 -05:00 |