ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,569 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

17569 Commits

Author SHA1 Message Date
Isaac Connor afd57ec307 Add a base extractFrame that just treats the entire buffer as a frame 2021-01-22 19:25:38 -05:00
Isaac Connor c94e2c0f13 cleanup 2021-01-22 19:24:27 -05:00
Isaac Connor 08165c06df Add audio details to zm_dump_codecpar 2021-01-22 19:24:15 -05:00
Isaac Connor 1a400be11c add zm_rtsp_server_adts_source.cpp to build 2021-01-22 19:23:36 -05:00
Isaac Connor a30a473981 fix passing in audiostream 2021-01-21 10:27:15 -05:00
Isaac Connor b8eac366b7 pts is an int 2021-01-21 10:27:02 -05:00
Isaac Connor d0380fb89b cleanup, start roughing in audio stream support 2021-01-21 10:26:46 -05:00
Isaac Connor 44245a9a4f spacing typos 2021-01-21 10:25:26 -05:00
Isaac Connor 8a9111d0b3 spacing 2021-01-21 10:25:09 -05:00
Isaac Connor 35c72b32dd Cleanup. Remove stats stuff. Code now works so remove other options. Re-implement extractFrame as it was broken. It would skip shortmarkers. 2021-01-21 10:23:30 -05:00
Isaac Connor 66c78e5a9b Merge branch 'zma_to_thread' into rtsp_server 2021-01-19 13:43:25 -05:00
Isaac Connor b1b72ec85b Improve debugging. Add parenthesis to fix test for end. I think the * dereference is not being applied at the right time. 2021-01-19 09:46:08 -05:00
Isaac Connor 256080abb1 Fix crash of Reload() due to Load() clearing shared_data and mem_ptr. Load() shouldn't do these kinds of initialisations. 2021-01-19 09:44:53 -05:00
Isaac Connor cb90c06cde Merge branch 'master' into zma_to_thread 2021-01-17 17:38:34 -05:00
Isaac Connor 5186ae2433 use bindButton 2021-01-16 13:17:46 -05:00
Isaac Connor 50af7f25b8 Use less memory in event querying. More work to do here 2021-01-16 13:17:46 -05:00
Isaac Connor 3dc35c49a2 quotes 2021-01-16 13:17:46 -05:00
Isaac Connor d98dde4aee Use auth hash in event loading. Use monitorURL in ajax calls that need to talk to zms. Use bindButton to handle the non-existence of settings button. 2021-01-16 13:17:46 -05:00
Isaac Connor 6586aa6338 Introduce a helper function bindButton to do the button event binding with nice error logging. 2021-01-16 13:17:46 -05:00
Isaac Connor 1e59c5bbde Merge branch 'release-1.34' 2021-01-15 18:46:07 -05:00
Isaac Connor 7183a47a3a split Netcat security header into multiple lines for legibility 2021-01-15 18:45:13 -05:00
Isaac Connor b019a759a3 ffmpeg options doesn't support loglevel setting. SO remove it from help. Fixes #3109 2021-01-15 18:43:49 -05:00
Isaac Connor fec3dc763f Cleanups. Apply crf to encoding to fix encoding video 2021-01-15 17:02:26 -05:00
Isaac Connor 430d64ba67 create fix_deprecated_pix_fmt function to adjust deprecated pixfmts 2021-01-15 17:01:59 -05:00
Isaac Connor 0f7c46e2cc Merge branch 'master' into zma_to_thread 2021-01-15 14:56:00 -05:00
Isaac Connor 0f276887ad When can't connect to monitor send an image saying so 2021-01-15 14:43:44 -05:00
Isaac Connor 0a0c99ce7a fix double free of mysql result 2021-01-15 14:43:31 -05:00
Isaac Connor 23305be8bf break lone lines. Move sendTextFrame to public so that we can use it to send error message in image form. 2021-01-15 14:43:07 -05:00
Isaac Connor 3d234427e0 initialize packetqueue, analysis_it, storage and videostore in Monitor constructor initializer. Only delete packetqeuue if it has been created. 2021-01-15 14:42:30 -05:00
Isaac Connor 68b0f7e1b5 initialize packetqueue, analysis_it, storage and videostore in Monitor constructor initializer. Only delete packetqeuue if it has been created. 2021-01-15 14:42:26 -05:00
Isaac Connor 27e10c2ed9 cleanup encoding code. Update logging 2021-01-15 11:55:46 -05:00
Isaac Connor 10e56df53c analysis_limit > cpature fps: only log a warning if we have actually been capturing for a while. If doing passthrough, need to start continuous event from last keyframe 2021-01-15 11:54:36 -05:00
Isaac Connor 83c60b7317 Make the error message clearer by actually printing the time. 2021-01-15 11:53:25 -05:00
Isaac Connor 254077b79d
Merge pull request #3108 from hax0kartik/Add-padding 
Fix padding issue in timestamp code
 2021-01-15 11:52:40 -05:00
hax0kartik 6845c2cab4 Fix padding issue in timestamp code 2021-01-15 11:46:30 +05:30
Isaac Connor f2fea95f4b Merge branch 'master' into zma_to_thread 2021-01-14 13:02:52 -05:00
Isaac Connor 02386f0c64 SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED for zmfilter. 2021-01-14 12:56:54 -05:00
Isaac Connor ad330cb949 Make images in modals max-width: 100% so they fit within the modal. 2021-01-14 12:56:54 -05:00
Isaac Connor 7d08f24895 use pageX and pageY instead of page.x and page.y 2021-01-14 12:56:54 -05:00
Isaac Connor 16db59ecb1 use pageX and pageY instead of page.x and page.y 2021-01-14 10:33:03 -05:00
Isaac Connor e530a51af7 WHen ret=0 is not failure, not success. Don't log error. Return the return code instead of -1 2021-01-14 10:31:55 -05:00
Isaac Connor f44f920bf2 spacing 2021-01-14 10:31:29 -05:00
Isaac Connor 9a824716b5 Fix clicking on pills committing the form. Remove hidden inputs and use pills to toggle visibility of divs instead. rename newControl to Control. Use button as the action input 2021-01-12 18:41:24 -05:00
Isaac Connor ef2f126eaa Merge branch 'master' into zma_to_thread 2021-01-12 14:37:25 -05:00
Isaac Connor 81acf4bf69 Fix ul nesting. Add navbar-nav to collapsed nav elements to fix spacing. 2021-01-12 14:29:53 -05:00
Isaac Connor 0a9681636f rename getAcct to getAccount 2021-01-12 14:20:05 -05:00
Isaac Connor e496679efd Set transaction isolation level to READ COMMITTED so that concurrent event inserts don't deadlock 2021-01-12 14:19:04 -05:00
Isaac Connor 8de122ef26 remove await that we can't use 2021-01-12 14:13:42 -05:00
Isaac Connor 3423d8ed05 Only delete packets up to the next video keyframe. Don't be too aggressive 2021-01-12 14:13:12 -05:00
Isaac Connor 5b7fc210fe Only use direct to rgb0 when image colours are 4 2021-01-12 14:12:09 -05:00