Commit Graph

280 Commits

Author SHA1 Message Date
Isaac Connor
12b47cbfe4 Merge pull request #51 from digital-gnome/storageareasFixes
Minor UI fixes
2017-11-20 20:15:32 -05:00
digital-gnome
b655689f47 Fix cache_bust
Cache busting was preventing changing css due to leaving symlinks behind.  Adding the css name to each symlink prevents the need for a forced refresh since mtime is the same on unchanged files but filename does not change between css sets.
2017-11-20 12:27:20 -05:00
digital-gnome
d8af654338 Fix dvrControls on watch view 2017-11-18 14:05:11 -05:00
Isaac Connor
821717b06e turn off debug 2017-11-08 11:26:13 -05:00
Isaac Connor
625170bffc fix getVideoStream to getVideoStreamHTML. Change how scaling works 2017-11-08 11:17:30 -05:00
Isaac Connor
f39353a4a3 add missing breaks 2017-11-03 15:44:53 -04:00
Isaac Connor
0ef5c16bcc when doing parseSort, reset the sortfield to StartTime instead of DateTime 2017-11-03 15:07:04 -04:00
Isaac Connor
67bb8c302f add missing / 2017-11-03 10:00:29 -04:00
Isaac Connor
4ef28bb30d don't put the leading / in the cache link 2017-11-03 09:22:43 -04:00
Isaac Connor
a9d4dfac45 fix the file extension so that mime type works better 2017-11-01 11:52:32 -04:00
Isaac Connor
e6918cd1bd implement crude cache busting code for .js and .css files 2017-11-01 09:41:19 -04:00
Isaac Connor
82fbec697f add IS and IS NOT as filter operators so that we can do IS NULL and IS NOT NULL because = NULL and !=NULL are not valid 2017-10-27 08:37:53 -07:00
Isaac Connor
653d213d62 Add EndTime and DiskSpace to Filters 2017-10-25 11:11:19 -07:00
Isaac Connor
ced5015a83 move zmcControl and zmaControl to the Monitor Object 2017-10-23 17:00:59 -07:00
Isaac Connor
cf2eace2c7 improve htmlSelect and add Storage and Server filters to console 2017-10-19 09:50:07 -04:00
Isaac Connor
6bf9e28a1e fix use of api when auth not in use and actually specify which monitor to restart 2017-10-16 10:00:41 -07:00
Isaac Connor
67cb3a7d3c better human_filesize function 2017-10-10 12:39:36 -07:00
Isaac Connor
a9d3be549f try caching storage 2017-10-10 10:39:17 -07:00
Isaac Connor
7f73f0bf8c do a backtrace when we ca;; generateAuthHash without open session 2017-10-10 11:51:35 -04:00
digital-gnome
e23b4a0d5d Fix event path 2017-10-07 12:42:16 -04:00
Isaac Connor
b56a976d7a fixes to montage review and cleanup in group filtering/editing 2017-10-05 10:46:04 -04:00
Isaac Connor
87a49ad009 work on infinite depths of groups 2017-10-04 16:40:09 -04:00
Isaac Connor
4be133ed09 remove btn styles from buttons. make groups, cycle, montage, montage review non-popups. Add datetime filters to montagereview. Fix dark skin 2017-09-30 14:19:32 -04:00
Isaac Connor
63e974192c handle case when no filter is specified 2017-07-13 14:57:27 -04:00
Isaac Connor
fed4dae7e5 fix width and height in options 2017-07-11 19:13:29 -04:00
Isaac Connor
9b4fb05d5b Fix parseFilter because terms is now under Query 2017-07-06 10:47:47 -04:00
Isaac Connor
621d2e0e41 remove debug code 2017-06-28 15:18:12 -04:00
Isaac Connor
8b1459a510 fixes for cambozola on ie, and fixes to setting fixed widths 2017-06-28 15:17:55 -04:00
Isaac Connor
90696331a9 Merge branch 'master' into storageareas 2017-06-26 21:58:11 -04:00
Isaac Connor
965b306ebc continue redoing filters 2017-06-19 13:24:02 -04:00
Isaac Connor
528582fec6 fix tabs 2017-06-09 10:36:38 -04:00
Isaac Connor
1788aabb6c Merge branch 'storageareas' into move_dirs 2017-06-09 10:35:58 -04:00
Isaac Connor
01717a5c14 Merge branch 'master' into filter_by_runstate 2017-06-06 20:34:47 -04:00
Isaac Connor
451714a403 Merge branch 'master' into storageareas 2017-06-04 21:42:56 -04:00
Isaac Connor
a1af422d29 the [filter][terms] etc part needs to be urlencoded as well. Becase [] are not valid in urls. 2017-06-01 09:35:38 -04:00
Isaac Connor
b6ed806d6c braces and comments 2017-05-30 13:51:00 -04:00
Isaac Connor
1a43334113 Use NULLs instead of '' when saving things 2017-05-30 13:38:57 -04:00
Isaac Connor
e9a0474cf7 add back required lines with a comment 2017-05-30 12:04:12 -04:00
Isaac Connor
8a732dff8a add back required lines with a comment 2017-05-30 12:03:31 -04:00
Isaac Connor
0e643f0f93 Merge branch 'master' into storageareas 2017-05-30 11:58:38 -04:00
Isaac Connor
c5288a172d fix merge problem 2017-05-30 11:57:20 -04:00
Isaac Connor
00479876f2 fix braces 2017-05-30 11:53:21 -04:00
Isaac Connor
fe2155dd1a merges from SA 2017-05-30 11:15:00 -04:00
Isaac Connor
e855ad685f small cleanups 2017-05-30 11:14:22 -04:00
Isaac Connor
32daa4faed Merge branch 'master' into storageareas 2017-05-30 10:21:01 -04:00
Isaac Connor
c616a3b3b7 fix some bad to '' changes 2017-05-30 09:39:01 -04:00
Isaac Connor
ff08843d68 replace with '' 2017-05-30 09:10:41 -04:00
Isaac Connor
f4008e2c6a Merge branch 'master' into storageareas 2017-05-19 11:20:33 -04:00
Isaac Connor
c125d22d4d Fix Debug to Logger::Debug 2017-05-18 12:49:59 -04:00
Isaac Connor
c859f7291c Feature h264 videostorage (#1882)
* Moved writing of configure options from Controller to Model.  Fixes #191.

* Initial commit for saving events as videos :)

* Add zm_video.cpp to autotools

* Add zm_video.h to autotools

* Search for MP4V2 header file 3 times: mp4v2/mp4v2.h, mp4v2.h, mp4.h

* Fix serve memory leak

* Few minor code improvements

* Added the ability to override preset, tune, profile and few other improvements

* Correctly write SPS & PPS from x264 encoder headers

* Remove unnessecary SPS & PPS writing code

* Imported missing files from master to feature-h264-videostorage

* Audio support including fixes for dts/pts, split on keyframe and update to mkv extension to prevent ffmpeg problems writing rtsp audio to mp4 containter (header problem)

* Updates to make gcc happy

* Add html5 video control to timeline and event to support mkv playback

* Add zm_videostore.cpp to CMakeLists.txt

* Remove Modern Branch for now

* Fix minor bug

* Option handled added in master, removing duplicate declaration

* Add CaptureandRecord from zm_camera.h

* Putting placeholder in for CaptureAndRecord function

* Removed duplicate code and brackets

* add digest auth file for cmake

Conflicts:
	src/CMakeLists.txt

* Add web dir back into Makefile.am
Revert "Removed web from SUBDIRS in Makefile.am"

This reverts commit d9bbcdf3a9.

* Add CaptureAndRecord to vlc, still need to make it record

* Resolve SegFault on videostore

* Swap to mp4 container

* mp4 changes

* spaces to tabs, hide video stuff if video writer is turned off

* Make timeline open event.mp4 instead of mkv

* Missed mkv in timeline.js

* Fix some issues from the merge conflict

* Resolve post merge build issues with braces

* Fix whitespace

* Update Jpeg and Video options for passthrough options

* Whitespace fix zm_camera.h

* Fix array mkssing comma

* Add support for Jpeg save options for h264 branch snapshot. Might remove altogether if snapshots not needed

* Update VideoStoreData memory size comment

* Change from config.use_mkv_storage to per monitor option VideoWriter from video branch

* Fix bracket issues post merge

* Clean up comments and add av_free_packet

* Convert from event_directory to event file as per Video branch

* Testing videojs for video playback

* Fixed a missing bracket post merge and also SQL_values now used for EventID and Monitors

* bring recent improvements in ffmpeg capture function into captureandrecord

* Remove pict from writeAudioFramePacket as not used

* Add translate options for h264 Storage options in Monitor and update en_gb file

* Cherry-Pick from iconnor - make it compile on ubuntu 15.04.  Which is libav 56.1.0

Conflicts:
	src/zm_ffmpeg.cpp
	src/zm_remote_camera_rtsp.cpp

Conflicts:
	distros/ubuntu1204/changelog

* Clean up videostore code and remove lots of unused code

* proof of concept for dynamic/automatic video rotation using video-js plugin zoomrotate

Conflicts:
	web/skins/classic/views/event.php

* removed redundant field in sql query

Conflicts:
	web/skins/classic/views/event.php

* local storage of video js plugin

* Beautify!

Make the code somewhat readable.

* added missing videojs.zoomrotate.js file

added missing videojs.zoomrotate.js file

* Typo

added missing "

* Added missing brackets

* fix to display thumbnails when only storing snapshot.jpg

* added control for video playback rate

Conflicts:
	web/skins/classic/views/event.php

* dynamically create jpegs from video file for viewing in browser

* fix timeline view for SaveJPEGs monitors (without enabled VideoWriter)

* only expose monitor info which are being used in client

* fix segmentation fault in zma with ubuntu 14.04 and ffmpeg 2.5.8 (gcc 4.8)

when libx264 is not installed

* better way of detecting showing image or video in timeline and event view

instead of Monitor.VideoWriter, Event.DefaultVideo is used, so even if
VideoWriter/SaveJPEG option is changed, a valid image or video will always be
displayed for historical events in both timeline and event view

this also fixes loading videos in timeline view

* Fixes problem of crashing zmc when bad packet arrives causing av_interleaved_write_frame() to return non-zero (-22).  Prefilters common packet issues. Add metadata title to generated video file

* Remove syslog.h

* fixed SaveJPEGs are not working

which is caused in errors introduced when merging with master

* Update README.md

* Fix build warnings specific to h264 branch, unused FrameImg, unused ret and int64_t snprintf issues

* Fix PRId64 issue in travis, builds locally fine, but I can see a gcc version issue here

* Fix PRId64 issue in travis, another try

* Try "STDC_FORMAT_MACROS" to see if that helps Travis on gcc 4.6.3

* Revert space removal around PRId64

* video branch ffmpeg 2.9 fixes

ffmpeg 2.9 patched removed SSE2 CPU

* Add FFMPEGInit back

* use webvvt to overlay timestamp (honoring Monitor.LabelFormat) to videos in timeline and event

also fixed bug which prevented seeking in timeline video preview

* ffmpeg 3.0 API build failure fixes

* Update README.md

* merge all the commits from the messed up iconnor_video branch

* fix whitespace

* revert

* whitespace fixes

* spelling fix

* put back some text

* add these back

* fix spelling mistake

* Steal some packet dumping routines from ffmpeg. Convert them to use our logging routines

* add a test and error message if the codec is not h264

* these have been removed in master

* add a view to check auth and just send the video

* add some comments, and dump filename and AVFormatContext on failure to write header

* add the toggle for RecordAudio so that the checkbox works to turn off Audio

* Must init videoStore in constuctor

* more debug and comments, return checking

* Fix dropped part of sql query.

* fix extra else and some whitespace

* Fix missing } from merge that was preventing building.

* fix tabs

* get rid of use of separator, just use \n

* Restore lost fixes for deprecation

* Why are these failing

* Respect record_audio flag when setting up video file so dont try and initiliase mp4 with unsupported audio

* Forgot that I was trying to solve case of stream is true and record_audio
is false.

* Pass swscale_ctx back in to getCachedContext or it will create new
context every frame and leak memory like a mofo.

* Add libx264-dev and libmp4v2-dev to build requires to save hassle of
ensuring they are installed before build.

* Merge my Rotation/Orientation work and fixes for bad h264 streams

* need arpa/inet for reverse lookups

* pull in the new byte range code for viewing videos

* Move our recording flag deeper into closeevent

* add braces and only call closeEvent if there is an event

* deprecate the z_frame_rate stuff which is deprecated in ffmpeg

* remark out some debugging

* fix for video on stream 1

* fix audio_stream to audio_st

* Ignore bad decodes

* fix problems with content-length causing viewing to not work in chrome/android

* change logic of sending file contents to handle an off by one and be more readable

* Some fixes pointed out by Maxim Romanov.  Also simply the loading of events to not join the Monitors table

* fix to sql for timeline

* added RecordAudio to sql in README

* Use sub queries instead of joins to fix errors when using new mysql defaults.

* fix sql queries

* Dockerfile to build feature-h264-videostorage

* Must cast codec

* add php-acpu as a dependency

* require php5-acpu

* fix typo

* remove extra /

* Add a line for out-of-tree builds to do api/lib/Cake/bootstrap.php

* delete merge conflict files

* delete merge conflict files
2017-05-15 22:02:48 -04:00