2014-01-22 22:24:06 +08:00
|
|
|
#dataBar {
|
|
|
|
width: 100%;
|
|
|
|
margin: 2px auto;
|
|
|
|
text-align: center;
|
|
|
|
}
|
|
|
|
|
|
|
|
#dataBar #dataTable {
|
|
|
|
width: 100%;
|
|
|
|
}
|
|
|
|
|
|
|
|
#dataBar #dataTable td {
|
|
|
|
text-align: center;
|
|
|
|
padding: 2px;
|
|
|
|
}
|
|
|
|
|
|
|
|
#menuBar1 {
|
|
|
|
width: 100%;
|
|
|
|
padding: 3px 0;
|
|
|
|
text-align: center;
|
|
|
|
clear: both;
|
|
|
|
}
|
|
|
|
|
|
|
|
#menuBar1 #nameControl {
|
|
|
|
float: left;
|
|
|
|
}
|
|
|
|
|
|
|
|
#menuBar1 #nameControl #eventName {
|
|
|
|
margin-right: 4px;
|
|
|
|
}
|
|
|
|
|
|
|
|
#menuBar1 #replayControl {
|
|
|
|
float: right;
|
|
|
|
margin-left: 8px;
|
|
|
|
}
|
|
|
|
|
|
|
|
#menuBar1 #scaleControl {
|
|
|
|
float: right;
|
|
|
|
margin-left: 8px;
|
|
|
|
}
|
|
|
|
|
|
|
|
#menuBar2 {
|
|
|
|
width: 100%;
|
|
|
|
padding: 3px 0;
|
|
|
|
margin-bottom: 4px;
|
|
|
|
}
|
|
|
|
|
|
|
|
#menuBar2 div {
|
|
|
|
text-align: left;
|
|
|
|
float: left;
|
|
|
|
padding: 0 12px;
|
|
|
|
}
|
|
|
|
|
|
|
|
#menuBar2 #closeWindow {
|
|
|
|
float: right;
|
|
|
|
text-align: right;
|
|
|
|
}
|
|
|
|
|
2016-04-16 03:44:35 +08:00
|
|
|
#menuBar1:after,
|
|
|
|
#menuBar2:after {
|
|
|
|
content: ".";
|
|
|
|
display: block;
|
|
|
|
height: 0;
|
|
|
|
font-size: 0;
|
|
|
|
clear: both;
|
|
|
|
visibility: hidden;
|
|
|
|
}
|
2014-01-22 22:24:06 +08:00
|
|
|
#imageFeed {
|
|
|
|
text-align: center;
|
|
|
|
}
|
|
|
|
|
|
|
|
#monitorStatus {
|
|
|
|
width: 100%;
|
|
|
|
margin-top: 3px;
|
|
|
|
margin-bottom: 2px;
|
|
|
|
text-align: center;
|
|
|
|
}
|
|
|
|
|
|
|
|
#monitorStatus #enableAlarms {
|
|
|
|
position: absolute;
|
|
|
|
left: 4px;
|
|
|
|
}
|
|
|
|
|
|
|
|
#monitorStatus #forceAlarm {
|
|
|
|
position: absolute;
|
|
|
|
right: 4px;
|
|
|
|
}
|
|
|
|
|
|
|
|
#monitorStatus #monitorState {
|
|
|
|
}
|
|
|
|
|
|
|
|
#dvrControls {
|
|
|
|
margin-top: 3px;
|
|
|
|
margin-bottom: 2px;
|
|
|
|
text-align: center;
|
|
|
|
}
|
|
|
|
|
|
|
|
#dvrControls input {
|
2014-04-10 02:19:23 +08:00
|
|
|
padding: 10px 10px;
|
|
|
|
width: 50px;
|
2014-01-22 22:24:06 +08:00
|
|
|
margin: 0 3px;
|
2014-04-10 02:19:23 +08:00
|
|
|
font-weight: 900;
|
2014-01-22 22:24:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
#dvrControls input[disabled=disabled] {
|
|
|
|
color: #aaaaaa;
|
|
|
|
}
|
|
|
|
|
|
|
|
#dvrControls input.active {
|
2014-04-10 02:19:23 +08:00
|
|
|
border: 0;
|
|
|
|
background-color: #2ecc71;
|
|
|
|
color: #fff;
|
2014-01-22 22:24:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
#dvrControls input.inactive {
|
2014-04-10 02:19:23 +08:00
|
|
|
border: 0;
|
|
|
|
background-color: #e67e22;
|
|
|
|
color: #fff;
|
2014-01-22 22:24:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
#dvrControls input.unavail {
|
2014-04-10 02:19:23 +08:00
|
|
|
background-color: #ccc;
|
|
|
|
border: 0;
|
|
|
|
cursor: default;
|
2014-01-22 22:24:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
#replayStatus {
|
|
|
|
margin: 3px 0 2px;
|
|
|
|
text-align: center;
|
|
|
|
clear: both;
|
|
|
|
}
|
|
|
|
|
|
|
|
#replayStatus > span {
|
|
|
|
padding: 0 4px;
|
|
|
|
}
|
|
|
|
|
|
|
|
#progressBar {
|
|
|
|
position: relative;
|
|
|
|
border: 1px solid #666666;
|
|
|
|
height: 15px;
|
|
|
|
margin: 0 auto;
|
|
|
|
}
|
|
|
|
|
|
|
|
#progressBar .progressBox {
|
|
|
|
position: absolute;
|
|
|
|
top: 0px;
|
|
|
|
left: 0px;
|
|
|
|
height: 15px;
|
|
|
|
background: #eeeeee;
|
|
|
|
border-left: 1px solid #999999;
|
|
|
|
}
|
|
|
|
|
|
|
|
#progressBar .complete {
|
|
|
|
background: #aaaaaa;
|
|
|
|
}
|
|
|
|
|
|
|
|
#eventStills {
|
|
|
|
width: 100%;
|
|
|
|
position: relative;
|
|
|
|
}
|
|
|
|
|
|
|
|
#eventThumbsPanel {
|
|
|
|
position: relative;
|
|
|
|
width: 100%;
|
|
|
|
margin: 4px auto;
|
|
|
|
z-index: 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
#eventThumbs {
|
|
|
|
margin: 0 auto;
|
|
|
|
width: 100%;
|
|
|
|
overflow: hidden;
|
|
|
|
height: 300px;
|
|
|
|
}
|
|
|
|
|
|
|
|
#eventThumbs img {
|
|
|
|
height: 25px; /* HACK - Although this is pixels it will be interpreted as a scale %ge, so 25px = 25% scaling for thumbnails */
|
|
|
|
margin: 2px;
|
|
|
|
background-color: #dddddd;
|
|
|
|
}
|
|
|
|
|
|
|
|
#eventThumbs img.placeholder {
|
|
|
|
/* width: 100px; */
|
|
|
|
}
|
|
|
|
|
|
|
|
#eventThumbs img.selected {
|
|
|
|
}
|
|
|
|
|
|
|
|
#eventImagePanel {
|
|
|
|
position: absolute;
|
|
|
|
z-index: 10;
|
|
|
|
}
|
|
|
|
|
|
|
|
#eventImageFrame {
|
|
|
|
border: 2px solid gray;
|
|
|
|
background-color: white;
|
|
|
|
padding: 4px;
|
|
|
|
}
|
|
|
|
|
|
|
|
#eventImage {
|
|
|
|
}
|
|
|
|
|
|
|
|
#eventImageBar {
|
|
|
|
margin-top: 2px;
|
|
|
|
}
|
|
|
|
|
|
|
|
#eventImageStats {
|
|
|
|
float: left;
|
|
|
|
}
|
|
|
|
|
|
|
|
#eventImageData {
|
|
|
|
margin: 0 auto;
|
|
|
|
padding-top: 2px;
|
|
|
|
}
|
|
|
|
|
|
|
|
#eventImageClose {
|
|
|
|
float: right;
|
|
|
|
}
|
|
|
|
|
|
|
|
#eventImageNav {
|
|
|
|
position: relative;
|
|
|
|
}
|
|
|
|
|
|
|
|
#eventImageNav input {
|
|
|
|
width: 32px;
|
|
|
|
font-size: 16px;
|
|
|
|
}
|
|
|
|
|
|
|
|
#thumbsSliderPanel {
|
|
|
|
width: 400px;
|
|
|
|
margin: 4px auto 0;
|
|
|
|
background: #888888;
|
|
|
|
padding: 1px;
|
|
|
|
}
|
|
|
|
|
|
|
|
#thumbsSlider {
|
|
|
|
width: 400px;
|
|
|
|
height: 10px;
|
|
|
|
background: #dddddd;
|
|
|
|
}
|
|
|
|
|
|
|
|
#thumbsKnob {
|
|
|
|
width: 8px;
|
|
|
|
height: 10px;
|
|
|
|
background-color: #444444;
|
|
|
|
}
|
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 d9bbcdf3a94cba4d8955fcd03bd965ed2772f34d.
* 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-16 10:02:48 +08:00
|
|
|
#eventVideo {
|
|
|
|
position: relative;
|
|
|
|
}
|
|
|
|
|
|
|
|
#video-controls {
|
|
|
|
position: absolute;
|
|
|
|
bottom: 0;
|
|
|
|
left: 0;
|
|
|
|
right: 0;
|
|
|
|
padding: 5px;
|
|
|
|
opacity: 0;
|
|
|
|
-webkit-transition: opacity .3s;
|
|
|
|
-moz-transition: opacity .3s;
|
|
|
|
-o-transition: opacity .3s;
|
|
|
|
-ms-transition: opacity .3s;
|
|
|
|
transition: opacity .3s;
|
|
|
|
background-image: linear-gradient(bottom, rgb(3,113,168) 13%, rgb(0,136,204) 100%);
|
|
|
|
background-image: -o-linear-gradient(bottom, rgb(3,113,168) 13%, rgb(0,136,204) 100%);
|
|
|
|
background-image: -moz-linear-gradient(bottom, rgb(3,113,168) 13%, rgb(0,136,204) 100%);
|
|
|
|
background-image: -webkit-linear-gradient(bottom, rgb(3,113,168) 13%, rgb(0,136,204) 100%);
|
|
|
|
background-image: -ms-linear-gradient(bottom, rgb(3,113,168) 13%, rgb(0,136,204) 100%);
|
|
|
|
|
|
|
|
background-image: -webkit-gradient(
|
|
|
|
linear,
|
|
|
|
left bottom,
|
|
|
|
left top,
|
|
|
|
color-stop(0.13, rgb(3,113,168)),
|
|
|
|
color-stop(1, rgb(0,136,204))
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#eventVideo:hover #video-controls {
|
|
|
|
opacity: .9;
|
|
|
|
}
|
|
|
|
|
|
|
|
button {
|
|
|
|
background: rgba(0,0,0,.5);
|
|
|
|
border: 0;
|
|
|
|
color: #EEE;
|
|
|
|
-webkit-border-radius: 3px;
|
|
|
|
-moz-border-radius: 3px;
|
|
|
|
-o-border-radius: 3px;
|
|
|
|
border-radius: 3px;
|
|
|
|
padding: 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
button:hover {
|
|
|
|
cursor: pointer;
|
|
|
|
}
|
|
|
|
|
|
|
|
#seekbar {
|
|
|
|
width: 360px;
|
|
|
|
border: 0;
|
|
|
|
padding: 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
#volume-bar {
|
|
|
|
width: 60px;
|
|
|
|
border: 0;
|
|
|
|
padding: 0;
|
|
|
|
}
|