6c3a3d3d50
store the scale value for watch and event views in a cookie, differentiated by monitorId.
2016-09-27 09:46:04 -04:00
f00b5d26b1
only start videostore on keyframe so as not to record non-keyframes
2016-09-26 20:43:08 -04:00
0580ef0c88
whitespace changes
2016-09-26 20:09:09 -04:00
079aa827c5
whitespace
2016-09-26 20:08:45 -04:00
30acfcc2fd
do the videostore test in the constructor
2016-09-26 20:08:20 -04:00
85dd5ea00c
do the videostore test in the constructor
2016-09-26 20:08:09 -04:00
1bd652ce4b
just more messing around trying to get audio transcoding to work
2016-09-26 17:04:04 -04:00
06da04c5d7
Merge ../ZoneMinder.master into storageareas
2016-09-26 11:01:52 -04:00
bd22d72e18
cleanups, code style, free resample_context
2016-09-26 11:01:47 -04:00
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
c81f48716a
Was audio stream calls in middle of video packet write correct, was seg faulting
2016-09-27 00:42:40 +10:00
ab5dff1650
Match spacing, nope cannot be perfect
2016-09-26 21:43:08 +10:00
664bfded6f
Match spacing
2016-09-26 21:38:39 +10:00
2eba0b4c45
Swap event and web path around the right way
2016-09-26 21:22:58 +10:00
8f6007bb49
fixes
2016-09-25 11:26:48 -04:00
aaab089b72
make storagea->Path absolute by appending PATH_WEB
2016-09-25 09:31:20 -04:00
8e6136c821
reset start pts and dts when values are out of sync
2016-09-23 18:06:40 -04:00
0d418882e7
sorta works
2016-09-23 15:39:52 -04:00
b8c7b6ae77
Merge branch 'storageareas' into record_audio
2016-09-23 11:34:15 -04:00
782f9395ae
turn down the debugging
2016-09-23 09:51:03 -04:00
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
3dcc1c3697
fix php outputting extra newlines after content
2016-09-22 10:37:32 -04:00
95bbaf42b6
change the version test to include ffmpeg 56.60.100 for av_packet_unref
2016-09-21 16:03:24 -04:00
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
32d145cf2e
free writejpg_ccinfo structs as well
2016-09-21 16:02:14 -04:00
d96febd967
when ZM_DIR_EVENTS is relative, append ZM_PATH_WEB
2016-09-21 16:00:23 -04:00
4b5af390fd
merge
2016-09-21 12:44:27 -04:00
249d3cadc5
fix for video on stream 1
2016-09-21 12:17:09 -04:00
1310aee1cc
handle video stream at index 1 without audio
2016-09-21 12:12:40 -04:00
6292ce3748
undo stupid thing
2016-09-21 12:07:58 -04:00
2f248cd4b1
log time bases on videostore instantiation instead of every packet
2016-09-21 11:58:59 -04:00
f5405a4131
clearer debug output
2016-09-21 11:57:42 -04:00
ae63861cd1
better codec_tag setting
2016-09-21 11:57:30 -04:00
8b13401250
more debugging
2016-09-21 11:37:59 -04:00
a8c4fdd616
more debug
2016-09-21 10:58:02 -04:00
e1a29f47b9
more debug
2016-09-21 10:57:21 -04:00
4359c65601
better debugging of timebase
2016-09-21 10:56:09 -04:00
091459004c
ServerId can be 0
2016-09-21 10:30:31 -04:00
e0b0b42966
fixup dts calcs
2016-09-21 10:29:49 -04:00
a3eae187f9
Merge ../ZoneMinder.connortechnology into storageareas
2016-09-21 10:15:54 -04:00
01d4ca96c7
av_unref_packet should be av_packet_unref
2016-09-21 10:15:23 -04:00
288b03290c
remark out some debugging
2016-09-21 09:05:55 -04:00
e4887e1c94
Merge branch 'storageareas' of https://github.com/bhaal2/ZoneMinder into storageareas
2016-09-21 21:53:24 +10:00
b9b1dd144c
@connortechnology changed the selectName back to Id from filterId in filter.php, this had a flowon effect in filtersave.php as well.
2016-09-21 21:41:22 +10:00
34d586a936
@connortechnology changed the selectName back to Id from filterId in filter.php, this had a flowon effect in filtersave.php as well.
2016-09-21 20:54:15 +10:00
6c3d877d99
Storageareas ( #2 )
...
* quick update to Monitor to use Object methods
* add more debugging and fix LinkPath -> LinkPath
* add disk_usage_percent and fix whitespace
* fixup saving Filters and executing them
* fix getDiskPercent to take a StorageArea as a param and use it's disk_usage_percent function. When parsing filter, DiskPercent requires a storagearea now, so look for it in the terms
* replace getDiskPercent call with code to show percent for all storageareas
* instead of filterId, use Id so that the object in is properly filled out. Add object=filter to hidden fields
* add ffmpeg as an option to libav-tools
* update zm_create.sql.in to match the update scripts
* contains due to glob
* don't output jpeg header unless there is some kind of success
* maybe fixes, maybe big memleaks
2016-09-21 10:11:40 +10:00
f0a9820096
need to convert NULL values before saying not null
2016-09-20 17:53:35 -04:00
912d6b0f6c
Merge ../ZoneMinder.connortechnology into storageareas
2016-09-20 17:03:23 -04:00
19a60b01da
maybe fixes, maybe big memleaks
2016-09-20 16:59:43 -04:00
364a80fb94
don't output jpeg header unless there is some kind of success
2016-09-20 15:55:28 -04:00
Isaac Connor
Isaac Connor
Steve Gilvarry
bhaal2