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

7623 Commits

Author SHA1 Message Date
Isaac Connor a0eaea00a5 fix relative paths to jquery and bootstrap fixes #1618 2016-09-14 10:06:15 -04:00
Isaac Connor f222048195 Merge pull request #1624 from bhaal2/storageareas 
Storageareas
 2016-09-14 10:02:30 -04:00
bhaal2 cd0e6ba285 StorageId now defaults to 0 and database column now set to NOT NULL. Changed default Id in php to match 2016-09-14 23:56:05 +10:00
bhaal2 33fc47c4b1 StorageId now defaults to 0 (NOT NULL) in the Monitors table, updates to filter.php set the default Id for the default storage area to 0 2016-09-14 23:53:52 +10:00
Isaac Connor 85b2ba73ab change the behaviour of StorageID. Now it will NOT NULL default 0 and a value of 0 means use ZM_EVENTS_PATH 2016-09-14 09:31:57 -04:00
Isaac Connor 07c12d0fae insert NULLs for StorageId when creating event if no Storage Area is defined for the monitor 2016-09-14 09:16:17 -04:00
Isaac Connor ef8d8bd1e5 try inserting NUll for StorageId when creating event 2016-09-14 09:02:32 -04:00
Isaac Connor f82cd461b2 more debug 2016-09-13 12:01:02 -04:00
Isaac Connor 0bc50810de only add the development h3 if it has contents, otherwise it pushes the header size down 2016-09-13 10:25:49 -04:00
Isaac Connor a6b23f50d5 Merge branch 'feature-h264-videostorage' into storageareas 2016-09-13 10:21:14 -04:00
Isaac Connor 2b4bad86cb Merge branch 'master' into storageareas 2016-09-13 10:21:10 -04:00
Isaac Connor 59b28e8346 deprecate the z_frame_rate stuff which is deprecated in ffmpeg 2016-09-13 10:15:47 -04:00
Isaac Connor a80881bb98 Merge branch 'fix_1620' into storageareas 2016-09-13 10:03:02 -04:00
Isaac Connor 88d86afd85 Merge ../ZoneMinder.master into storageareas 2016-09-13 10:02:53 -04:00
Isaac Connor 2bc5742aec Merge branch 'feature-h264-videostorage' into storageareas 2016-09-13 09:53:39 -04:00
Isaac Connor 39e06b929f add braces and only call closeEvent if there is an event 2016-09-13 09:36:45 -04:00
Isaac Connor 44591432dd Merge pull request #1622 from SteveGilvarry/zmu_record 
Fix for ZMU killing recording
 2016-09-13 09:30:38 -04:00
Steve Gilvarry fc060135fe Move our recording flag deeper into closeevent 2016-09-13 22:58:38 +10:00
Isaac Connor d0fb2acfaa rename videowriterprefs to videowriter. Use an enum to for videowriter values to make code easier to read. Add some comments 2016-09-12 21:35:14 -04:00
Isaac Connor 6366d137bc add more debug code 2016-09-12 21:34:18 -04:00
Isaac Connor 4ee1f38dd0 move storing packet to videostore up before decoding. move packet allocation inside the while that it needs to be in. 2016-09-09 14:38:16 -04:00
Isaac Connor 15569d4f33 whitespace, commenting, cleanup some Type castings, init zones[i] to null, because it might not get assigned a Zone object. 2016-09-09 10:07:13 -04:00
Isaac Connor 4cfd5cfbb9 deprecate safepkt, not sure why it was needed 2016-09-09 10:05:54 -04:00
Isaac Connor caaaffbb5d change sematics of pop to return the packet* instead of boolean. Free packets in clearQueue 2016-09-09 10:05:29 -04:00
Isaac Connor c6607ea5fe change sematics of pop to return the packet* instead of boolean. Free packets in clearQueue 2016-09-09 10:05:24 -04:00
Isaac Connor 5e7404d448 define zm_av_unref_packet 2016-09-09 10:04:54 -04:00
Isaac Connor 8148e35ec6 rework to dynamically allocate packet instead of putting it on the stack. Plus packet freeing cleanups 2016-09-09 10:04:42 -04:00
Isaac Connor 3a06ba7a65 Turn off instantiating a default zone before even loading the zones. Implement the use of Camera->setMonitor so that the camera object doesn't have to load it later. 2016-09-09 09:15:04 -04:00
Isaac Connor 5fb1c45c4e Merge ../ZoneMinder.connortechnology into storageareas 2016-09-08 11:34:36 -04:00
Isaac Connor 7b0a14ee72 change doulbe quotes to single quotes. Detect if we can't chdir into the monitor dir. 2016-09-08 11:06:02 -04:00
Isaac Connor 6e9cb06290 Merge branch 'storageareas' into packetqueue 2016-09-08 09:40:52 -04:00
Isaac Connor f67a58723c Merge ../ZoneMinder.Steve into packetqueue 2016-09-08 09:40:05 -04:00
Steve Gilvarry 34a85ba3f1 Moron forgot a file 2016-09-08 23:39:04 +10:00
Isaac Connor 7a62d84bd2 Merge ../ZoneMinder.Steve into packetqueue 2016-09-08 09:23:31 -04:00
Steve Gilvarry 33baa3b302 Free Audio and pickup unconverted video codec context. 2016-09-06 23:25:59 +10:00
Steve Gilvarry e40acc301d Add mAudioCodecContext and mAudioCodec and turn existing into video 
versions. Check if audio stream available and check audio stream codec
same as video is being checked now. Was Seg faulting if no audio stream.
 2016-09-06 01:27:57 +10:00
Isaac Connor 81e9d31a95 Merge ../ZoneMinder.connortechnology into storageareas 2016-09-01 10:53:35 -04:00
Isaac Connor 586eab25e6 Merge branch 'fix_issue_1460' of https://github.com/mattdurant/ZoneMinder into merge_1607 2016-09-01 10:25:00 -04:00
Isaac Connor 10abe98e91 merge from packet queue. add monitorId to livestream div lookup 2016-09-01 10:15:12 -04:00
Isaac Connor 9262487a77 deprecate wasRecording 2016-09-01 10:10:16 -04:00
Isaac Connor f723e29b33 stash refactor in zm_remote_camera_rtsp 2016-09-01 10:10:03 -04:00
Steve Gilvarry 957c8fbdbf Merge pull request #8 from connortechnology/monitor_packetqueue 
Monitor packetqueue
 2016-09-01 08:11:17 +10:00
Isaac Connor 17e7f0ecfb Merge branch 'monitor_packetqueue' into packetqueue 2016-08-31 16:59:43 -04:00
Isaac Connor d5f60ad3f8 merge pertinent restructuring and packet queue worko 2016-08-31 16:58:59 -04:00
Isaac Connor 9d19e2587c fix should only write out the queue if we are starting a new event 2016-08-31 16:58:41 -04:00
Isaac Connor df6844a8d2 change return code for when writing an audio packet when no audio otuput stream. -1 causes bad things to happen 2016-08-31 16:47:51 -04:00
Isaac Connor 8bb956c3b1 re-organize to remove code duplication and make logic clearer 2016-08-31 16:47:15 -04:00
Isaac Connor 9153d2a986 when the audio stream is not aac, don't save it. 2016-08-31 15:59:05 -04:00
Isaac Connor a1941c5a65 variable renaming to be more readable. Don't save anythign except AAC. 2016-08-31 15:46:19 -04:00
Isaac Connor a51944b2c5 cleanup, remove separate audio and video queues 2016-08-31 15:38:44 -04:00