Commit Graph

7548 Commits

Author SHA1 Message Date
Isaac Connor 994f1d566e fix [ 2016-09-28 09:09:01 -04:00
Isaac Connor 9bf48d27b1 implement caching the authhash in the session 2016-09-28 09:08:49 -04:00
Isaac Connor 1ae23b49bf generateAuthHash early when session is active, it will get cached in session 2016-09-28 09:08:36 -04:00
Isaac Connor 48d9f31fa9 add more debug 2016-09-28 09:08:00 -04:00
Isaac Connor 00ef0f4d78 alter code to use libv4l2 2016-09-28 08:43:41 -04:00
Isaac Connor b074a3257d add StartTime to log line about deleting an event. 2016-09-28 08:35:19 -04:00
Isaac Connor 02a196d98b add missing ] 2016-09-28 08:30:22 -04:00
Isaac Connor 187e952ffc append PATH_WEB for relative dir_events when instsantiating default Storage Object 2016-09-28 07:10:20 -04:00
Isaac Connor 24e33fec7f allow libvlccore8 2016-09-27 15:08:00 -04:00
Isaac Connor 89d4b9fec5 ifdef the libswresample lib stuff 2016-09-27 13:34:10 -04:00
Isaac Connor a77de33997 add a test for lib existence 2016-09-27 12:51:04 -04:00
Isaac Connor e217ca17cd Merge branch 'fix_auth_timeout' into storageareas 2016-09-27 11:57:53 -04:00
Isaac Connor 303a2c6c5f re-open session if neccessary to save AuthHashGeneratedAt 2016-09-27 11:56:31 -04:00
Isaac Connor 6840031ee3 fix auth timeout and user session[username] when checking auth hash for speedup 2016-09-27 11:51:55 -04:00
Isaac Connor e04266600e Merge branch 'fix_auth_timeout' into storageareas 2016-09-27 11:04:12 -04:00
Isaac Connor 4ce531099c add an auth field to request=stream results to give the client a new auth hash to use 2016-09-27 11:03:12 -04:00
Isaac Connor 167214cb01 Merge branch 'cookie_scale' into storageareas 2016-09-27 10:05:16 -04:00
Isaac Connor 13e8979a98 refactor some redundant code 2016-09-27 09:47:19 -04:00
Isaac Connor 6c3a3d3d50 store the scale value for watch and event views in a cookie, differentiated by monitorId. 2016-09-27 09:46:04 -04:00
Isaac Connor f00b5d26b1 only start videostore on keyframe so as not to record non-keyframes 2016-09-26 20:43:08 -04:00
Isaac Connor 0580ef0c88 whitespace changes 2016-09-26 20:09:09 -04:00
Isaac Connor 079aa827c5 whitespace 2016-09-26 20:08:45 -04:00
Isaac Connor 30acfcc2fd do the videostore test in the constructor 2016-09-26 20:08:20 -04:00
Isaac Connor 85dd5ea00c do the videostore test in the constructor 2016-09-26 20:08:09 -04:00
Isaac Connor 1bd652ce4b just more messing around trying to get audio transcoding to work 2016-09-26 17:04:04 -04:00
Isaac Connor 06da04c5d7 Merge ../ZoneMinder.master into storageareas 2016-09-26 11:01:52 -04:00
Isaac Connor bd22d72e18 cleanups, code style, free resample_context 2016-09-26 11:01:47 -04:00
Isaac Connor e4f0c83139 Merge pull request #1637 from SteveGilvarry/storageareas
[Storageareas] Swap dirs around to be correct absolute path
2016-09-26 10:57:49 -04:00
Steve Gilvarry c81f48716a Was audio stream calls in middle of video packet write correct, was seg faulting 2016-09-27 00:42:40 +10:00
Steve Gilvarry ab5dff1650 Match spacing, nope cannot be perfect 2016-09-26 21:43:08 +10:00
Steve Gilvarry 664bfded6f Match spacing 2016-09-26 21:38:39 +10:00
Steve Gilvarry 2eba0b4c45 Swap event and web path around the right way 2016-09-26 21:22:58 +10:00
Isaac Connor 8f6007bb49 fixes 2016-09-25 11:26:48 -04:00
Isaac Connor aaab089b72 make storagea->Path absolute by appending PATH_WEB 2016-09-25 09:31:20 -04:00
Isaac Connor 8e6136c821 reset start pts and dts when values are out of sync 2016-09-23 18:06:40 -04:00
Isaac Connor 0d418882e7 sorta works 2016-09-23 15:39:52 -04:00
Isaac Connor b8c7b6ae77 Merge branch 'storageareas' into record_audio 2016-09-23 11:34:15 -04:00
Isaac Connor 782f9395ae turn down the debugging 2016-09-23 09:51:03 -04:00
Isaac Connor a5b7b6e74f move the input packet into a member of the camera. Fix packet copying in packetqueue. Implement separate start pts and dts for audio and video 2016-09-22 10:43:20 -04:00
Isaac Connor 3dcc1c3697 fix php outputting extra newlines after content 2016-09-22 10:37:32 -04:00
Isaac Connor 95bbaf42b6 change the version test to include ffmpeg 56.60.100 for av_packet_unref 2016-09-21 16:03:24 -04:00
Isaac Connor 984394f920 packet needs to be both unref'd and freed when we use av_malloc to allocate a packet 2016-09-21 16:02:51 -04:00
Isaac Connor 32d145cf2e free writejpg_ccinfo structs as well 2016-09-21 16:02:14 -04:00
Isaac Connor d96febd967 when ZM_DIR_EVENTS is relative, append ZM_PATH_WEB 2016-09-21 16:00:23 -04:00
Isaac Connor 4b5af390fd merge 2016-09-21 12:44:27 -04:00
Isaac Connor 249d3cadc5 fix for video on stream 1 2016-09-21 12:17:09 -04:00
Isaac Connor 1310aee1cc handle video stream at index 1 without audio 2016-09-21 12:12:40 -04:00
Isaac Connor 6292ce3748 undo stupid thing 2016-09-21 12:07:58 -04:00
Isaac Connor 2f248cd4b1 log time bases on videostore instantiation instead of every packet 2016-09-21 11:58:59 -04:00
Isaac Connor f5405a4131 clearer debug output 2016-09-21 11:57:42 -04:00