90517ed0aa
Merge branch 'master' into add_was_alarmed
2017-05-25 14:01:27 -04:00
a515041e14
Merge branch 'master' into storageareas
2017-05-23 15:17:46 -04:00
5c673d5659
google style
2017-05-23 15:07:50 -04:00
54c9c37b21
Merge ../ZoneMinder.connortechnology
2017-05-20 09:55:06 -04:00
03495e8c23
fix
2017-05-20 09:54:03 -04:00
bb50784ed2
braces
2017-05-20 09:53:35 -04:00
0da03ca5e8
braces/whitespace
2017-05-20 09:41:13 -04:00
b123bd1da3
remove uneccessary zm_packetqueue.h
2017-05-20 09:12:05 -04:00
40993ce401
braces
2017-05-20 09:11:35 -04:00
23633ce30b
braces
2017-05-20 09:06:12 -04:00
a5ee8307d0
Merge ../ZoneMinder.connortechnology
2017-05-20 09:03:57 -04:00
457d7e5c94
code documentation, whitespace
2017-05-20 09:03:51 -04:00
dba947346a
braces
2017-05-20 09:03:04 -04:00
381d44439a
merge SA. braces/whitespace debugging
2017-05-20 09:01:32 -04:00
c24c427409
braces
2017-05-20 08:57:53 -04:00
ab365dc749
braces
2017-05-20 08:53:27 -04:00
62bd134277
whitespace/braces, also ffmpeg deprecation handling
2017-05-20 08:52:24 -04:00
3e426b87d3
init duration to 0 to quieten compiler
2017-05-20 08:35:06 -04:00
1ab8530aed
use enum values to make code more readable. Better error message on event insertion failure
2017-05-20 08:34:46 -04:00
7ecbcd8f12
code documentation
2017-05-20 08:26:55 -04:00
53abc14143
handle ffmpeg deprecations
2017-05-20 08:22:08 -04:00
13273cb50f
rmeove unneeded include
2017-05-19 15:13:42 -04:00
7caeee6bf8
Merge branch 'master' into storageareas
2017-05-19 15:09:44 -04:00
afb450573d
fix
2017-05-19 15:08:04 -04:00
e7ca892efd
merge more differences from SA
2017-05-19 15:07:41 -04:00
91138ba8a1
Merge branch 'master' into storageareas
2017-05-19 14:53:08 -04:00
44e5b6f829
remove redundant code
2017-05-19 14:52:45 -04:00
9e54efdfcf
Merge branch 'master' into storageareas
2017-05-19 14:49:25 -04:00
92c5319fdf
add missing video_file
2017-05-19 14:43:59 -04:00
7c889add76
cleanup sql to load event data. Don't need MonitorName
2017-05-19 14:43:49 -04:00
764c76f98a
add loading the video filename when loading event data
2017-05-19 14:29:08 -04:00
e79d2c5a00
Merge branch 'master' into storageareas
2017-05-19 14:26:28 -04:00
7dccbac78d
clenaup
2017-05-19 14:25:44 -04:00
ccc9f6fdf6
remove redundant code
2017-05-19 14:24:49 -04:00
61204a8b83
Merge branch 'master' into storageareas
2017-05-19 14:11:29 -04:00
41cf0a2458
add back analysis fps
2017-05-19 14:05:24 -04:00
8568c95fbe
handel NULLS in db fields
2017-05-19 14:03:28 -04:00
1e4792e13d
Merge branch 'master' into storageareas
2017-05-19 13:36:23 -04:00
aab08db84b
Merge branch 'master' into storageareas
2017-05-19 13:35:31 -04:00
c4e68f8cfd
fix some spacing problems caused by missing ;
2017-05-19 13:35:13 -04:00
5e2220efa0
add a missing ; at end of line, and remove end of line spaces
2017-05-19 13:30:08 -04:00
3fcca1021d
add missing; and fix spacing
2017-05-19 13:28:34 -04:00
bbb77ab7dd
reorder lines to make diff from master cleaner
2017-05-19 13:27:18 -04:00
96b459a058
Merge branch 'master' into storageareas
2017-05-19 13:19:16 -04:00
6d6b453b82
Google code style/whitespace
2017-05-19 12:57:43 -04:00
e9af81d31c
tabs to spaces
2017-05-19 12:29:03 -04:00
1c9c6441d4
Merge branch 'master' into storageareas
2017-05-19 12:28:07 -04:00
0a8017b780
whitespace/google code style
2017-05-19 12:24:19 -04:00
cb3ee3484a
remove work in progress crap from zm_event
2017-05-18 09:08:31 -04:00
f4224bb88e
Merge branch 'master' into storageareas
2017-05-17 17:47:39 -04:00
eef5e5cd90
Merge branch 'feature-h264-videostorage'
2017-05-16 13:37:24 -04:00
b1f8485969
Fix videostorage ( #1885 )
...
* merge relevant c bits to make h264 recording work
* h264 code requires libavresample and boost
* Need libavresample
2017-05-16 12:04:56 -04:00
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
2017-05-15 22:02:48 -04:00
d3115219d2
Merge branch 'master' into feature-h264-videostorage
2017-05-15 21:52:58 -04:00
68aea50ca9
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-05-15 16:19:57 -04:00
9bd6c99586
Merge branch 'master' into storageareas
2017-05-15 12:52:35 -04:00
1e45146db8
Merge pull request #1881 from mastertheknife/aarch64_neon
...
Add AArch64 ARM Neon code (complements #1823 )
2017-05-14 07:49:19 -05:00
5df7499da4
Move ARM Neon data prefetches to be after the loads
2017-05-13 19:08:18 +03:00
c66deb564f
Added ARM Neon AArch64 versions of delta
2017-05-13 09:19:13 +03:00
8315be69de
Update zm_image.cpp
...
remove extra }
2017-05-12 18:46:19 -05:00
ec2b6235a0
Added ARM Neon AArch64 version of fastblend
2017-05-12 22:59:08 +03:00
773ad363be
Enable neon (Advanced SIMD) in hwcaps_detect() on AArch64
2017-05-12 22:43:30 +03:00
1ddf4e32cf
Merge branch 'master' into storageareas
2017-05-11 08:55:42 -04:00
0d864b2c6c
Fix delta self-test introduced in #1823 failing ( #1878 )
...
* Fix self-test introduced in #1823 failing and improve logging about the failure
* Remove unnecessary newline added by previous commit
2017-05-11 07:13:04 -04:00
fd44ff4e60
Merge branch 'master' into storageareas
2017-05-10 13:16:08 -04:00
0584454aa8
Fix conflicts in Image::Initialise() caused by merging #1810 and #1823
2017-05-10 17:37:25 +03:00
2c0d322924
remove zmf.cpp to fix merge conflict
2017-05-10 08:07:08 -05:00
c4f471d967
Merge branch 'master' of https://github.com/abishai/ZoneMinder into abishai-master
2017-05-10 08:06:48 -05:00
ccc2cc832f
Merge branch 'armv7_neon' of https://github.com/mastertheknife/ZoneMinder into mastertheknife-armv7_neon
2017-05-10 07:45:58 -05:00
e6c60737e9
Merge pull request #1756 from SteveGilvarry/zmf_goodbye
...
Remove zmf
2017-05-10 07:07:22 -05:00
747583e9f4
Merge pull request #1810 from mastertheknife/ssse3_improvements
...
Minor zm_image SSSE3 improvements
2017-05-10 07:06:33 -05:00
fc52766606
Merge branch 'master' into storageareas
2017-05-08 22:17:37 -04:00
9ac20999b3
rough in
2017-05-05 21:11:23 -04:00
a6a2339eea
play with setting moov flags
2017-05-05 14:25:54 -04:00
35b89b6ef0
When zms hits then end of an event, if in single event mode, reset the frame index to the beginning so it starts again
2017-05-05 14:04:57 -04:00
8251e7ac03
fix uridecode(password) to uridecode(value)
2017-05-05 09:47:15 -04:00
2e8022419b
Delete zmstreamer.cpp again
...
we previously deleted this file with commit 4837585601
2017-05-05 08:17:22 -05:00
2660c8316a
add a test for if the analysis image doesn't exist, fall back to the capture image when streaming.
2017-05-05 09:04:07 -04:00
6827e0412c
white and google style
2017-04-28 10:34:48 -04:00
10dc6b98ca
fix if LIBAVRESAMPLE structure
2017-04-24 11:28:24 -04:00
c4ec01c0d2
fix compile when no libavresample
2017-04-19 14:28:37 -04:00
5246844b10
turn down log level
2017-04-19 14:15:10 -04:00
d2fb4a7874
braces, spacing cleanup. Remove unused variable wasRecording
2017-04-19 10:34:17 -04:00
c3e9b2b177
add some code comments
2017-04-18 14:17:57 -04:00
d53639c2bf
fix braces
2017-04-18 14:17:48 -04:00
d4e0b456c0
Fix HAVE_LIBAVRESAMPLE tests so that the build works without it
2017-04-18 10:49:27 -04:00
273229858f
Merge branch 'master' into storageareas
2017-04-16 11:26:18 -04:00
71e6735b60
Neon32 functions now work on 64 bytes at a time. This results in 4-6x performance increase over standard functions
...
Memory allocations and image size requirements changed to be as needed for 64 byte alignment.
Self-test code for Blend modified accordingly and added Self-test for the delta functions.
2017-04-16 10:57:37 +03:00
8c298b96d0
Merge pull request #1820 from SteveGilvarry/Remove_arg_r
...
Remove zmc -r argument as it does not seem to be implemented.
2017-04-15 07:17:56 -05:00
6b0f587725
invert timestamp_on_capture condition
2017-04-13 15:51:50 -05:00
83219d3e34
define av_frame_free to av_freep on older ffmpeg. Undo c++11 requirements.
2017-04-13 09:47:19 -04:00
d1f04a60f9
fix errors calculating dts
2017-04-12 16:16:37 -04:00
d039227f79
Merge branch 'master' into storageareas
2017-04-12 13:51:10 -04:00
51d5bfc8d5
introduce a helper function to print out a timeval
2017-04-12 13:40:38 -04:00
ecb57f8f04
change bool recording to a timeval.
2017-04-12 13:40:17 -04:00
575b3138de
change it from a queue to a list. Implement a clearQueue that keeps some frames, and a function clear out unwanted frames
2017-04-12 13:39:47 -04:00
a0b57cedeb
change bool recording to a timeval. and add GetPreEventCount
2017-04-12 13:39:12 -04:00
e3d3fc3411
change bool recording to a timeval.
2017-04-12 13:38:56 -04:00
59c85c1fbb
change bool recording to a timeval.
2017-04-12 13:38:39 -04:00
8efeb41f7d
use new clear_unwanted_packets and a clearQueue version that keeps the approprate # of frames
2017-04-12 13:38:12 -04:00
954c863ad8
add a non-const version of StartTime() which we need in order to assign to video_data->recording
2017-04-12 13:36:49 -04:00
7e920eb5d3
add a non-const version of StartTime() which we need in order to assign to video_data->recording
2017-04-12 13:36:39 -04:00
669a23c408
change type of width and height to unsigned int and recording from bool to timeval
2017-04-12 13:35:07 -04:00
bdb6dd63a3
change type of width and height to unsigned int and recording from bool to timeval
2017-04-12 13:32:22 -04:00
eb390c323e
Merge branch 'storageareas' into ffmpeg_321
2017-04-11 11:14:23 -04:00
161aaac3f2
cleanup swsresample stuff. resampling now works
2017-04-11 10:39:43 -04:00
a2a823e3ec
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-04-11 08:54:54 -04:00
9291c154a1
Merge branch 'split_monitor_stream' into storageareas
2017-04-10 21:58:01 -04:00
42e94d1a7c
contains the MonitorStream class
2017-04-10 21:57:31 -04:00
620797ac18
replace swresample with libavresample
2017-04-10 21:54:23 -04:00
2220b04203
need to include zm_monitorstream.h now
2017-04-10 21:52:29 -04:00
766925d9a7
Split MonitorStream into it's own files.
2017-04-10 21:51:18 -04:00
48d658790a
Merge branch 'storageareas' into optimisations
2017-04-09 17:36:24 -04:00
4215f227da
Merge branch 'mastertheknife-ssse3_improvements' into storageareas
2017-04-07 13:43:09 -04:00
6ec340d525
Merge branch 'ssse3_improvements' of https://github.com/mastertheknife/ZoneMinder into mastertheknife-ssse3_improvements
2017-04-07 13:38:50 -04:00
68ab2cb756
Merge pull request #1837 from DarkDeepBlue/fix-format-string-local-cam
...
zm_local_camera.cpp: Improve format strings
2017-04-06 08:54:20 -04:00
6a9819e16b
whitespace, comments
2017-04-05 16:10:21 -04:00
452e9571ee
add a different size warning
2017-04-05 16:08:29 -04:00
15e69fc817
fix . to ->
2017-04-05 10:39:38 -04:00
1dbf599f10
add a cast to get rid of build warning
2017-04-05 10:36:44 -04:00
1f3eecbd6c
change how opkt.pts/dts are calculated by using the diff since the last input packet instead of the diff since the beginning of stream. This should allow us to handle input pts/dts wrapping.
2017-04-04 15:15:37 -04:00
b609b9ad4c
Merge pull request #1826 from connortechnology/uri_decode_in_zms
...
Uri decode in zms
2017-04-03 20:13:30 -05:00
e70c7fa1ef
whitespace and comments
2017-03-31 23:34:58 -04:00
30455feef7
code style
2017-03-31 11:12:52 -04:00
9c495b07dd
code style, whitespace, comments
2017-03-31 11:12:42 -04:00
26dfe45ec6
delete the videostore on camera delete so that the .mp4 gets written to disk
2017-03-31 11:06:15 -04:00
f2dcd18297
Merge branch 'armv7_neon' of https://github.com/mastertheknife/ZoneMinder into storageareas
2017-03-30 13:46:30 -04:00
5f6332f313
Fixed the assembly in hwcaps_detect() to compile with -fpic & -fPIC and added SSE4.1, SSE4.2 and AVX detection
2017-03-30 20:35:31 +03:00
1d146b112a
remark out some code that detects when the pts is < last_pts. The rest isn't implemented yet so it's bogus
2017-03-30 13:04:54 -04:00
8b7acb68a3
fix password and add debug
2017-03-29 20:07:58 -04:00
184eb507a7
zm_local_camera.cpp: Improve format strings
...
This avoids printing '0x0' as char and hence terminating the output too
early.
2017-03-29 12:45:44 +02:00
7162c62d26
Implemented a fix to get the Neon code to compile successfully with GCC < 6.0
2017-03-25 21:49:15 +03:00
5800598666
put back code that got merged out
2017-03-24 13:43:56 -04:00
a33a8402ef
Merge branch 'armv7_neon' of https://github.com/mastertheknife/ZoneMinder into neon
...
Conflicts:
src/zmf.cpp
src/zms.cpp
2017-03-24 12:14:16 -04:00
3a8a04c213
Merge branch 'master' into feature-h264-videostorage
2017-03-22 09:02:02 -04:00
3431cf7732
Reduce code duplication in the SSSE3 functions: a single function for delta and a single function for RGB32->grayscale convert
2017-03-22 11:38:15 +02:00
df5a238857
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-03-20 15:14:50 -04:00
0a1b2eab01
Merge branch 'uri_decode_in_zms' into storageareas
2017-03-20 15:13:19 -04:00
f5dc896a45
missed one case
2017-03-20 15:12:23 -04:00
7b8ff44163
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-03-20 15:04:54 -04:00
816b0a9e01
add getsockopt test
2017-03-20 15:04:05 -04:00
a546c9e37f
merge uri_decode in zms
2017-03-20 12:00:14 -04:00
9f30ccfa75
Use new UriDecode function to decode username and password
2017-03-20 11:16:39 -04:00
3b15ba91d1
Rough in a CURL based UriDecode
2017-03-20 11:16:21 -04:00
ca99d84995
Only include sys/auxv.h on ARM systems. That way the code can compile with glibc < 2.16
2017-03-20 15:12:28 +02:00
8b593b701b
Fixed hwcaps_detect() failing to compile on x86-64
2017-03-19 15:11:06 +02:00
29885135a6
Corrected issues in last two ARM Neon commits
2017-03-19 13:39:24 +02:00
510f65c414
Added ARM Neon (AArch32) FastBlend function
2017-03-19 13:31:44 +02:00
c5c9b52d18
Added ARM Neon (AArch32) Delta functions for 32bit color and 8bit grayscale
2017-03-19 13:02:42 +02:00
e02e033cc8
Renamed ssedetect() to hwcaps_detect() and added ARM Neon and AVX2 detection
2017-03-19 02:05:01 +02:00
e5b18ee213
Remove zmc -r argument as it does not seem to be implemented.
2017-03-18 23:25:14 +11:00
c24853ad11
Merge pull request #1806 from adam900710/compile_fix
...
ZoneMinder: Rename public enum CHAR_WIDTH/CHAR_HEIGHT to avoid conflicts
2017-03-17 09:42:15 -04:00
b041e299fc
Merge branch 'adam900710-compile_fix' into storageareas
2017-03-17 09:41:42 -04:00
654282d82e
fix merge
2017-03-17 09:41:04 -04:00
d9c665b021
Merge branch 'fix_crash_with_invalid_zones' into storageareas
2017-03-17 09:35:11 -04:00
6a447194eb
Fix zmc crashing when zones are no good bby decreasing n_zone before continuing
2017-03-16 10:55:13 -04:00
f7fcab24c4
Fixed a mistake in recent commit e7a681b8ff
2017-03-14 22:46:36 +02:00
f30192e5da
Use standard memcpy() on x86-64, as it behaves similar performs the equal or better
2017-03-14 22:41:35 +02:00
67f7ad40ae
Removed SSSE3 deinterlacing functions, as they were typically equal or slower than the standard code (when compiled with -O2 or better)
...
The function is too complicated to be vectorized efficiently
2017-03-14 22:36:26 +02:00
e7a681b8ff
Added BGRA, ARGB and ABGR variants of SSSE3 32bit color to grayscale conversion and made the code actually use them all
2017-03-14 22:29:55 +02:00
20604c2150
SSSE3 rgba->gray8 convert function now uses less instructions and is 10-20% faster
2017-03-14 16:54:00 +02:00
844b4bb5ee
SSSE3 delta functions now use less instructions and are 5-10% faster
2017-03-14 12:17:01 +02:00
0b9853e1d4
ZoneMinder: Rename public enum CHAR_WIDTH/CHAR_HEIGHT to avoid conflicts
...
CHAR_WIDTH is defined by limits.h, and class Image redefines it to 6,
which causes gcc6, clang, gcc5 to complain about it.
Fix by adding ZM_ prefix to CHAR_WIDTH and CHAR_HEIGHT, so it can be
compiled.
Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
2017-03-12 22:00:46 +08:00
3f7583ebda
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-03-06 16:22:25 -05:00
e723b6dbef
Must cast codec
2017-02-21 16:28:53 -05:00
0880412e7f
Merge branch 'master' into feature-h264-videostorage
2017-02-21 16:04:27 -05:00
34d462a5d5
Merge branch 'zm_packet' into ffmpeg_321
2017-02-18 15:23:21 -05:00
f19b3d5505
create zm_packet
2017-02-18 15:22:56 -05:00
a97941edd3
change level from error to debug on message about not supporting non-FLTP
2017-02-16 13:30:34 -05:00
d135216ac7
Merge branch 'master' into storageareas
2017-02-15 09:30:35 -05:00
808d070414
don't copy smCodes, just get a pointer to it.
2017-02-14 11:29:43 -05:00
4ca2bcacde
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-02-13 17:02:59 -05:00
d5bb6f3210
remove line that causes endless reading when doing single image mode
2017-02-11 09:57:36 -05:00
74dd8ab027
make clang happy take two
2017-02-06 09:57:22 +03:00
aae4a1f83b
remove extraneous setting of NULL to videowriter which is already NULL
2017-02-04 11:20:21 -05:00
8d5a8f5512
make clang happy
2017-02-03 14:53:53 +03:00
f73bf0aee0
add a cast to fix compilation with clang
2017-02-02 12:43:13 -05:00
1102f449aa
don't do extra copy of classString
2017-02-02 09:22:13 -05:00
1687217d18
switch to POSIX basename()
2017-01-31 11:10:25 +03:00
97380f009b
implement platform-agnostic comparison without abs()
2017-01-31 10:42:57 +03:00
7ab6818fa0
Merge branch 'sanitize_image_path' of https://github.com/knnniggett/ZoneMinder into storageareas_sanitize
2017-01-25 17:14:30 -05:00
41b6369c36
Merge branch 'master' into feature-h264-videostorage
2017-01-25 09:46:06 -05:00
61827fec0c
remove redundant mkdir eventdir.
2017-01-18 09:31:08 -05:00
7116d66500
use the correct pointer casts
2017-01-16 21:57:21 -05:00
1f3644f6bd
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-01-16 21:14:39 -05:00
19bc79a5ec
move nRet into the block where it is used. Add a comment.
2017-01-16 21:11:28 -05:00
f6d1707382
fix event insert
2017-01-16 21:08:13 -05:00
2f3ebd80da
Remove zmf, die..die..die
2017-01-16 13:20:05 -08:00
5833196a84
packpack - change error code handling
2017-01-16 08:36:46 -06:00
c5ad62b9fc
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-01-15 14:24:58 -05:00
29acad163c
Add some casts to quiet warnings. The warnings happen because we are doing arithmetic on pointers.
2017-01-15 14:24:50 -05:00
b7ee64ff41
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-01-15 13:35:45 -05:00
899b1b82b9
Merge branch 'filter_by_runstate' into storageareas
2017-01-14 17:07:20 -05:00
242e5a56d8
rough in the ability to filter on RunState
2017-01-14 16:55:28 -05:00
babe4f07fb
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-01-14 10:53:49 -05:00
21c1e1d26f
add a call to av_interleaved_write_Frame to clear out the queues in the destructor
2017-01-13 14:37:18 -05:00
251264ac92
bump ffmpeg version required to use codecpar
2017-01-11 14:31:30 -05:00
7f059b750f
fix whitespacing causing a warning when compiling. In this case braces are not neccessary.
2017-01-11 14:25:46 -05:00
23b40da598
fix whitespacing causing a warning when compiling. In this case braces are not neccessary.
2017-01-11 14:25:12 -05:00
8653822bff
cleanup av_packet_unref/free_packet by using our zm_av_packet_unref
2017-01-11 14:22:37 -05:00
87daba346b
fix else behaviour by adding braces
2017-01-11 14:18:56 -05:00
0d5910644e
whitespace and braces fixes. Also add some braces to fixup a compiler error about the else not doing what it should be.
2017-01-11 14:18:11 -05:00
5d03e9f50e
Merge branch 'fix_1743_Edimax' into storageareas
2017-01-11 10:34:08 -05:00
c0e929f136
change regexp to handle quotes in the content-type line. This is needed for edimax cameras
2017-01-11 09:11:27 -05:00
8ae02b9ac0
use a FrameType enum instead of string comparisons
2017-01-08 16:53:29 -05:00
8f3e40d7af
add a const array of char * strings for the frame types so that we can make better use of the FrameType enum for more efficient code
2017-01-08 16:53:15 -05:00
dccd1e9732
fix
2017-01-05 13:54:34 -05:00
71ad08613e
fix
2017-01-05 11:30:01 -05:00
d1ed472db0
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-01-05 10:09:11 -05:00
d5ad757116
Merge branch 'master' into feature-h264-videostorage
2017-01-02 10:00:02 -05:00
5ae34a7561
Merge branch 'master' into storageareas
2017-01-02 09:39:10 -05:00
0d549f1db3
spelling fixes
2016-12-29 10:31:05 +01:00
254fcbcef7
update gpl 2 mailing address in source files
2016-12-26 09:23:16 -06:00
727d4b9714
add tests when select returns true, but no bytes available, in single image mode
2016-12-23 11:27:50 -05:00
61d3ecf9c1
when a socket times out, use getsockopt to see if there are any errors
2016-12-22 13:31:42 -05:00
f6c377c2b4
Merge branch 'master' into feature-h264-videostorage
2016-12-15 16:47:32 -05:00
87e8f91868
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2016-12-13 15:06:07 -05:00
92a4641e1b
Merge branch 'log_failed_log_insert' into storageareas
2016-12-12 21:46:53 -05:00
6fa3b25d2a
fix whitespace
2016-12-12 21:44:03 -05:00
1f6a6f9758
fix whitespace
2016-12-12 21:43:07 -05:00
9b76a16af4
log failed sql when db insert fails. Also, don't permanently turn off db logging just for one failed insert
2016-12-12 21:41:55 -05:00
d97c1f1cff
Merge branch 'fix_braces' into storageareas
2016-12-08 14:58:38 -05:00
7f2bf04c2f
Merge branch 'cookie_http_only' into storageareas
2016-12-08 14:26:13 -05:00
c27a18a758
fix braces in zm_monitor.cpp
2016-12-08 11:49:54 -05:00
fac6de6cb1
Instead of passing orientation, pass the whole monitor object so that we can use it's other features.
2016-12-06 11:54:34 -05:00
ead1631fce
copy some filter code into the object
2016-12-02 13:24:59 -05:00
0e302001dd
fix snprintf format for 64bit type
2016-11-29 15:26:19 -05:00
1a25b957ad
check for and create events dir for monitor on Object instantiation
2016-11-27 20:10:12 -05:00
873bb9902b
recalculating zmswap at this point is unnesessary
2016-11-19 08:53:17 -06:00
3afa8937d8
calculate string lengths and array ndx's properly
2016-11-19 08:52:22 -06:00
2bd080a6a6
Merge branch 'master' into storageareas
2016-11-15 08:41:00 -05:00
d3a7fca079
only unlink if zmc is being destroyed
2016-11-14 19:01:00 -06:00
6c7d71361a
unlink the mmap file when the monitor object is destroyed
2016-11-13 16:40:54 -06:00
11b160b7d1
document code blocks
2016-11-03 16:44:03 -04:00
dbd7d7d095
fix crash when not compiled with sws_resample
2016-11-03 16:43:48 -04:00
a2f782d61a
Merge branch 'master' into feature-h264-videostorage
2016-11-03 16:26:18 -04:00
6a16db0361
get rid of extra line feed
2016-10-26 14:45:13 -04:00
420d141bc7
split the reading of max fps and alarm max fps to remove an extra atof and make them more understandable
2016-10-18 09:50:01 -04:00
5b8b9c5345
merge update
2016-10-12 09:24:10 -04:00
9656a7c3e8
Store Oriention on event creation
2016-10-12 09:12:09 -04:00
2b37999cd5
Merge branch 'fix_zm_image_memleak' into storageareas
2016-10-07 11:39:03 -04:00
006fcad10a
move jpeg context freeing to a Deinitialise function instead of ~Image. Turn down the logging
2016-10-07 11:35:14 -04:00
37a4c67ae6
move jpeg context freeing to a Deinitialise function instead of ~Image. Turn down the logging
2016-10-07 11:33:25 -04:00
a7979eb63b
Merge branch 'master' into feature-h264-videostorage
2016-10-03 13:21:50 -04:00
056e560b70
Merge ../ZoneMinder.master into storageareas
2016-10-02 12:25:51 -04:00
0df70a7e0f
if out the new code that frees structure on Image destroy. It creates a memleak
2016-10-02 12:24:33 -04:00
4fc64e4874
fix crash when not compiled with libswresample
2016-10-02 12:24:19 -04:00
f5914939df
Revert "if out the new code that frees structure on Image destroy. It creates a memleak"
...
This reverts commit bb174ba49d
2016-10-02 12:21:56 -04:00
bb174ba49d
if out the new code that frees structure on Image destroy. It creates a memleak
2016-10-02 12:20:39 -04:00
fb4a2babc7
better debug message
2016-09-30 09:37:41 -04:00
cf9fa78ca3
work on fixing event view
2016-09-29 09:28:48 -04:00
48d9f31fa9
add more debug
2016-09-28 09:08:00 -04:00
00ef0f4d78
alter code to use libv4l2
2016-09-28 08:43:41 -04:00
187e952ffc
append PATH_WEB for relative dir_events when instsantiating default Storage Object
2016-09-28 07:10:20 -04:00
89d4b9fec5
ifdef the libswresample lib stuff
2016-09-27 13:34:10 -04:00
13e8979a98
refactor some redundant code
2016-09-27 09:47:19 -04:00
f00b5d26b1
only start videostore on keyframe so as not to record non-keyframes
2016-09-26 20:43:08 -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
c81f48716a
Was audio stream calls in middle of video packet write correct, was seg faulting
2016-09-27 00:42:40 +10:00
6be3938ae1
Ignore bad decodes
2016-09-26 22:36:53 +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
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
5722f3af2f
fix audio_stream to audio_st
2016-09-21 14:01:32 -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
e0b0b42966
fixup dts calcs
2016-09-21 10:29:49 -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
19a60b01da
maybe fixes, maybe big memleaks
2016-09-20 16:59:43 -04:00
4750c016c4
define a zm version of av_frame_alloc to clean up code
2016-09-20 14:05:28 -04:00
97053df0b1
define a zm version of av_frame_alloc to clean up code
2016-09-20 14:05:25 -04:00
d26f3c9a6c
define a zm version of av_frame_alloc to clean up code
2016-09-20 14:05:16 -04:00
0614af4f51
work on audio encoding
2016-09-20 10:10:02 -04:00
ae80fd4d2d
put startTime init back where it belongs
2016-09-19 21:33:20 -04:00
61df6e9d75
Work on aac encoding
2016-09-16 15:54:13 -04:00
d4645cd94a
we should be queueing packets regardless of recording state
2016-09-16 11:03:16 -04:00
fbc0729c83
code cleanup, more use of av_strerr to give better error logs.
2016-09-16 10:14:58 -04:00
05f061b84b
Merge ../ZoneMinder.master into packetqueue
2016-09-16 09:58:04 -04:00
bd076fed69
Merge branch 'storageareas' into packetqueue
2016-09-16 09:56:41 -04:00
81c0b28786
fix call to setStartTime
2016-09-15 11:43:08 -04:00
06c73954d6
move set|getStartTime functions down to where they need to be.
2016-09-15 11:42:51 -04:00
8f33ed6ca6
introduce another sharedmem variable called startup_time, which is set by zmc indicating when the process started.
2016-09-15 11:16:05 -04:00
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
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
ef8d8bd1e5
try inserting NUll for StorageId when creating event
2016-09-14 09:02:32 -04:00
f82cd461b2
more debug
2016-09-13 12:01:02 -04:00
a6b23f50d5
Merge branch 'feature-h264-videostorage' into storageareas
2016-09-13 10:21:14 -04:00
2b4bad86cb
Merge branch 'master' into storageareas
2016-09-13 10:21:10 -04:00
59b28e8346
deprecate the z_frame_rate stuff which is deprecated in ffmpeg
2016-09-13 10:15:47 -04:00
88d86afd85
Merge ../ZoneMinder.master into storageareas
2016-09-13 10:02:53 -04:00
2bc5742aec
Merge branch 'feature-h264-videostorage' into storageareas
2016-09-13 09:53:39 -04:00
39e06b929f
add braces and only call closeEvent if there is an event
2016-09-13 09:36:45 -04:00
fc060135fe
Move our recording flag deeper into closeevent
2016-09-13 22:58:38 +10:00
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
6366d137bc
add more debug code
2016-09-12 21:34:18 -04:00
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
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
4cfd5cfbb9
deprecate safepkt, not sure why it was needed
2016-09-09 10:05:54 -04:00
caaaffbb5d
change sematics of pop to return the packet* instead of boolean. Free packets in clearQueue
2016-09-09 10:05:29 -04:00
c6607ea5fe
change sematics of pop to return the packet* instead of boolean. Free packets in clearQueue
2016-09-09 10:05:24 -04:00
5e7404d448
define zm_av_unref_packet
2016-09-09 10:04:54 -04:00
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
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
6e9cb06290
Merge branch 'storageareas' into packetqueue
2016-09-08 09:40:52 -04:00
f67a58723c
Merge ../ZoneMinder.Steve into packetqueue
2016-09-08 09:40:05 -04:00
34a85ba3f1
Moron forgot a file
2016-09-08 23:39:04 +10:00
7a62d84bd2
Merge ../ZoneMinder.Steve into packetqueue
2016-09-08 09:23:31 -04:00
33baa3b302
Free Audio and pickup unconverted video codec context.
2016-09-06 23:25:59 +10:00
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
dfb06fd548
Merge pull request #1607 from mattdurant/fix_issue_1460
...
Fix issue #1460
2016-09-01 14:02:13 -04:00
586eab25e6
Merge branch 'fix_issue_1460' of https://github.com/mattdurant/ZoneMinder into merge_1607
2016-09-01 10:25:00 -04:00
9262487a77
deprecate wasRecording
2016-09-01 10:10:16 -04:00
f723e29b33
stash refactor in zm_remote_camera_rtsp
2016-09-01 10:10:03 -04:00
350352d956
Added check for SINGLE_IMAGE if ReadData() detects the socket closed by remote side to return 0 instead of -1.
2016-08-31 20:56:30 -05:00
0950ecbcb9
Replaced loops to create color tables during initialization with statically declared arrays.
2016-08-31 19:36:14 -05:00
17e7f0ecfb
Merge branch 'monitor_packetqueue' into packetqueue
2016-08-31 16:59:43 -04:00
d5f60ad3f8
merge pertinent restructuring and packet queue worko
2016-08-31 16:58:59 -04:00
9d19e2587c
fix should only write out the queue if we are starting a new event
2016-08-31 16:58:41 -04:00
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
8bb956c3b1
re-organize to remove code duplication and make logic clearer
2016-08-31 16:47:15 -04:00
9153d2a986
when the audio stream is not aac, don't save it.
2016-08-31 15:59:05 -04:00
a1941c5a65
variable renaming to be more readable. Don't save anythign except AAC.
2016-08-31 15:46:19 -04:00
a51944b2c5
cleanup, remove separate audio and video queues
2016-08-31 15:38:44 -04:00
4dce24a276
write out queued packets when instantiating videostore
2016-08-31 15:38:24 -04:00
824d7c5b43
Merge ../ZoneMinder.Steve into packetqueue
2016-08-31 11:58:22 -04:00
55c6e5a6db
cleanup putting packetqueue in the monitor. It should be in the camera
2016-08-31 11:47:42 -04:00
d1bcb14629
Right direction
2016-09-01 00:00:10 +10:00
81dd65352d
better debugging and testing for different aspect ratios
2016-08-29 21:54:32 -04:00
19d46c2d09
Merge branch 'master' into storageareas
2016-08-15 10:45:50 -04:00
44df4a830d
Merge branch 'feature-h264-videostorage' into monitor_packetqueue
2016-08-11 20:44:48 +10:00
1277f3c792
need arpa/inet for reverse lookups
2016-08-10 12:32:58 -04:00
6ac1a70b9c
Merge my Rotation/Orientation work and fixes for bad h264 streams
2016-08-10 12:22:04 -04:00
62a2ce56fb
Merge Rotation/Orientation work, rename id to monitor_id in cameras and also make it an unsigned int since logically that is what it is. Also some fixups for bad rtsp h264 streams.
2016-08-10 12:19:53 -04:00
21c46bb519
Merge branch 'feature-h264-videostorage' into monitor_packetqueue
2016-08-11 00:52:35 +10:00
5d8159462c
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-08-11 00:51:46 +10:00
3f713df826
bump libavutil version check as per @SteveGilvarry
2016-08-09 13:14:10 -04:00
252ac5228a
fix merge
2016-08-09 08:41:22 -04:00
2451768295
Merge branch 'master' into storageareas
2016-08-08 18:08:46 -04:00
177c2c741b
Fixes #1584 . I've just copied the relevant functions from ffmpeg source. Please review carefully before merging.
2016-08-07 10:55:19 -04:00
f67394ffb7
Merge pull request #1567 from SteveGilvarry/avdictparsestring
...
Use av_dict_parse_string to create AVDictionary of options
2016-08-06 09:50:49 -05:00
382896dc0d
Merge pull request #1498 from josh4trunks/mysql_port_socket
...
Add support for MySQL Port / Unix Socket
2016-08-06 09:32:32 -05:00
ea1ae815f1
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-08-05 23:03:06 +10:00
cf84dde613
segfault cause I think I am missing the queue
2016-08-03 23:48:33 +10:00
ed5d6b37ee
Merge ../ZoneMinder.Steve into storageareas
2016-08-02 13:57:52 -04:00
0425c68d59
Merge remote-tracking branch 'upstream/feature-h264-videostorage' into monitor_packetqueue
2016-08-02 20:17:35 +10:00
208337635a
Merge branch 'master' into storageareas
2016-08-01 19:30:01 -04:00
1a684b7709
Remove whitespace
2016-07-28 23:22:34 +10:00
71e3789bd0
Use av_dict_parse_string to split ffmpeg options, and remove creating strings to split them in next step for rtsp_transport
2016-07-28 23:15:01 +10:00
45fadaf297
Use Monitor Id instead of Name when writing diag images. The name symlink might not exist
2016-07-26 13:08:32 -04:00
541f879b26
when time_base is not set in codec, set it to video_st->time_base
2016-07-25 21:42:50 -04:00
8db20a4543
change test for prevDTS >= dts to just prevDTS > dts
2016-07-25 13:23:44 -04:00
b9a48eb464
Pass swscale_ctx back in to getCachedContext or it will create new
...
context every frame and leak memory like a mofo.
2016-07-17 08:11:53 +10:00
14d8496972
add NULL test for RTSPDesribe
2016-07-14 10:27:24 -04:00
b7096b742d
implement some checks for valid values when opening the output file
2016-07-13 15:29:29 -04:00
f68527674a
merge Steve's tree, which allegedly fixes the header problems
2016-07-13 12:38:12 -04:00
f1acc52913
spellcheck/codespell
2016-07-14 00:30:39 +10:00
b05eabfe1d
Forgot that I was trying to solve case of stream is true and record_audio
...
is false.
2016-07-13 08:31:10 +10:00
91ef963738
add case for no rotation to get rid of log message
2016-07-12 12:06:12 -04:00
26369268bb
merge Steve's updates, work on zmaudit
2016-07-12 11:27:25 -04:00
a30610fbda
Merge branch 'master' into storageareas
2016-07-12 10:31:10 -04:00
f1b9e1205a
Respect record_audio flag when setting up video file so dont try and initiliase mp4 with unsupported audio
2016-07-12 23:13:02 +10:00
5d2ece0063
Why are these failing
2016-07-10 11:57:08 +10:00
25f7a8cadf
Restore lost fixes for deprecation
2016-07-09 22:31:01 +10:00
142784746c
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-07-07 19:33:04 +10:00
75a98601ef
fix jpeg buffer too small
2016-07-03 14:59:05 -05:00
0a4eee323b
Use a subquery instead of a join to fix group by errors when sql_mode=only_full_group_by
2016-06-27 10:26:52 -04:00
97baf4ecd3
Merge pull request #1529 from ZoneMinder/fix_1526
...
connect needs a +1
2016-06-24 09:53:46 -05:00
6644db3bea
check for null on various Monitor fields
2016-06-24 10:29:50 -04:00
081c0add72
fix
2016-06-23 11:25:50 -04:00
ccea620531
check for null before instantiating strings
2016-06-23 11:13:26 -04:00
1383e0b774
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-06-22 09:41:47 -04:00
7496dc392f
get rid of use of separator, just use \n
2016-06-21 14:06:07 -04:00
c6761dd094
fix merge
2016-06-21 14:02:36 -04:00
e29a0ebe71
Merge branch 'feature-h264-videostorage' into storageareas
2016-06-21 13:48:32 -04:00
ce22e6534e
fix tabs
2016-06-21 12:26:08 -04:00
dfc885a12a
fix tabs
2016-06-21 12:25:13 -04:00
6a8db582ff
whitespacing updates
2016-06-21 12:21:18 -04:00
d8f6cc952d
Fix missing } from merge that was preventing building.
2016-06-19 07:22:14 +10:00
08c8da3e8f
fix extra else and some whitespace
2016-06-17 11:37:20 -04:00
26bba58c56
Merge branch 'master' into feature-h264-videostorage
2016-06-17 11:09:47 -04:00
98fab6528d
always use \n as separator and remove the segfault
2016-06-13 14:00:24 -04:00
910fd8212f
Merge branch 'fix_1526' into storageareas
2016-06-13 09:45:34 -04:00
472973e975
connect needs a +1
2016-06-12 15:45:24 -04:00
fad1d95011
fix NULL in linkedMonitors column
2016-06-09 13:06:57 -04:00
d9f2911f0d
handle null values in Monitors columns
2016-06-09 12:51:22 -04:00
f289b84901
move VIDEO_MAX_FRAME up
2016-06-06 19:04:02 -05:00
06923d44ba
Set VIDEO_MAX_FRAME if it is not defined
2016-06-06 16:27:13 -05:00
b8c406f969
Merge branch 'master' into storageareas
2016-06-03 09:32:55 -04:00
2385575c56
fix +1 being outside bind()
2016-06-02 16:23:04 -04:00
f99f394a3d
hopefully fixup zm_av_packet_ref for libavtools
2016-05-25 21:05:08 -04:00
b3fd156c11
add boost to build depends
2016-05-25 20:01:42 -04:00
eb30a9079e
code style, commenting
2016-09-29 14:04:32 -04:00
52df5174e7
fix zm_av_frame_alloc define for trusty
2016-09-29 13:21:24 -04:00
07d8d008ba
Merge branch 'fix_auth_timeout' into storageareas
2016-09-29 12:22:56 -04:00
e423e0802c
put back the needed sql and add a lot of debugging
2016-09-29 12:22:32 -04:00
5c867aa5f5
Merge branch 'fix_auth_timeout' into storageareas
2016-09-29 10:10:38 -04:00
8bc7b9562f
introduce config option ZM_AUTH_HASH_TTL which is the # of hours to make an auth hash valid for
2016-09-29 10:04:53 -04:00
02ef99584c
Revert "alter code to use libv4l2"
...
This reverts commit 00ef0f4d78
2016-09-29 09:30:12 -04:00
b309837f02
put back zmDbRow use
2016-05-25 10:21:44 -04:00
7a08d4620f
Merge branch 'master' into storageareas
2016-05-25 10:17:46 -04:00
8fabeb78d3
Merge branch 'fix_zone_edit' into storageareas
2016-05-24 15:55:49 -04:00
d12b9dc16d
fix typo. needs }
2016-05-24 09:24:18 -05:00
6e82f2c9a9
add messages back with debug 3
2016-05-24 08:50:09 -05:00
bc163b33fc
move multiserver message to once during startup only
2016-05-23 20:06:29 -05:00
2ab79820a1
Add back changes
2016-05-22 08:08:12 -07:00
0abfb7378a
Buffer work
2016-05-18 00:01:33 +10:00
58d326681a
quick fix for gcc6
2016-05-17 09:17:19 -04:00
435a1f7a2e
remove duplicated locking code created by bind_fixes
2016-05-17 09:11:52 -04:00
710ecd5b19
Put rotation metadata in the video stream metadata where it belongs
2016-05-16 14:36:09 -04:00
c11a92efdd
implement 180,270 rorations and cleanup
2016-05-13 15:11:17 -04:00
943a4cef73
Merge branch 'storageareas' into rotate_video
2016-05-13 15:00:50 -04:00
71e9553648
add rotation to video
2016-05-13 14:51:26 -04:00
4843cb094e
more debug
2016-05-11 11:59:41 -04:00
958cf6f3c7
fix merge problem causing duplicated lock
2016-05-11 11:35:38 -04:00
add4992dea
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-05-09 21:08:13 -04:00
a8de0bff71
Merge branch 'master' into storageareas
2016-05-09 19:30:02 -04:00
413eced6df
Merge pull request #1450 from ZoneMinder/bind_fixes
...
add some error checking, but fix the call to bind
2016-05-10 08:00:10 +10:00
1f3b3d1203
Revert "WIP packetqueue shared memory"
...
This reverts commit 8aa1cb6bf6
2016-05-08 15:25:18 +10:00
a3eabe9c72
Shared Memory WIP
2016-05-08 15:14:24 +10:00
654d4d2bee
Merge branch 'api_fixes' into storageareas
2016-05-07 10:56:47 -04:00
18461b0c64
Add some debugging
2016-05-06 12:39:10 -04:00
fd896acd50
Merge branch 'RTSP-IPv6' of https://github.com/schrorg/ZoneMinder into schrorg-RTSP-IPv6
2016-05-06 08:32:21 -04:00
49dc917b2e
Merge isaac:ZoneMinder.p1 into storageareas
2016-05-05 15:24:14 -04:00
e64376ed02
increase debug level for Zone motion detection
2016-05-05 14:51:41 -04:00
88a0bdc026
Add some code comments. Make mocord always honour section_length
2016-05-05 14:51:26 -04:00
e8cbb90125
increase log debug level for blend routing reporting
2016-05-05 14:50:50 -04:00
c3628a8dfd
Merge branch 'updated-console' into storageareas
2016-05-03 14:34:58 -04:00
02013cef94
Merge remote-tracking branch 'upstream/feature-h264-videostorage' into packetqueue
2016-05-03 21:15:46 +10:00
8aa1cb6bf6
WIP packetqueue shared memory
2016-05-03 20:07:45 +10:00
341ebc7b45
Merge branch 'master' into bind_fixes
2016-05-02 12:39:55 -04:00
b9a6273f32
Fix dropped part of sql query.
2016-05-01 15:59:53 +10:00
da157f5a1a
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-04-30 22:27:10 +10:00
819dad455e
whitespace/tabs
2016-04-29 09:11:14 -04:00
b41a3b1b25
fix tabs/shiftwidth
2016-04-29 09:01:28 -04:00
5eebc50bfb
tabs to spaces
2016-04-29 08:57:31 -04:00
728bffa6a0
Check and set audio to mono
2016-04-29 08:52:25 -04:00
af66105c37
Merge branch 'master' into storageareas
2016-04-29 08:28:53 -04:00
e73935a15b
Clean up extraneous avutil include
2016-04-29 21:29:07 +10:00
8452c4bce5
Fix tab to spaces merge issues
2016-04-29 21:27:28 +10:00
097e7f3906
Merge branch 'master' into storageareas
2016-04-28 16:40:44 -04:00
0dc2987b84
add some error checking, but fix the call to bind which really should have a +1 in it.
2016-04-28 16:32:50 -04:00
30b3fa8a8b
add a cast to help the compile figure out which function to use
2016-04-28 12:57:38 -04:00
1096461793
Need a cast to handle old avformat
2016-04-28 12:57:14 -04:00
1282e36bb2
av_get_media_type_string is not available in trusty
2016-04-28 12:56:40 -04:00
337d8a748c
simplify the separator stuff
2016-04-28 12:56:19 -04:00
fac07cba6d
Merge branch 'master' into tabs_to_spaces
2016-04-28 09:31:40 -04:00
629f141734
Merge pull request #1441 from SteveGilvarry/remove_commented_code
...
Delete large commented out code segment
2016-04-28 09:30:43 -04:00
59406fd03a
Merge branch 'master' into storageareas
2016-04-28 09:24:36 -04:00
24e3306955
master master
2016-04-28 09:20:56 -04:00
af361042ef
Merge pull request #1446 from ZoneMinder/stdstring_instead_of_c_string
...
use std::string instead of C strings. Mostly this will quiet build wa…
2016-04-28 22:13:44 +10:00
d9fd0faa32
Merge pull request #1447 from ZoneMinder/simplify_zm_signal
...
Simplify zm signal
2016-04-28 21:37:55 +10:00
dcf3852124
Starting to convert to boost.interprocess
2016-04-28 01:28:37 +10:00
69d5065ebf
move ip down as well
2016-04-26 16:05:37 -04:00
5d88acb8a6
re-arrange a few lines to remove some duplicate ifdef's. And move the cr2 def into the area that uses it to remove build warnings on freebsd
2016-04-26 16:03:26 -04:00
7d7249f328
use std::string instead of C strings. Mostly this will quiet build warnings on FreeBSD and removes the potential for buffer overflows
2016-04-26 15:48:21 -04:00
9aff84fbbb
unbreak build under FreeBSD 32 bit II
2016-04-26 21:53:50 +03:00
2d8c484792
rotate dimensions when instantiating the Monitor object
2016-04-25 16:48:26 -04:00
d936312207
revert
2016-04-25 16:46:23 -04:00
8c53925fdc
redo rotation fix. cameras have to be given the width and height that the camera will be sending. The monitor will report rotated dimensions.
2016-04-25 16:00:34 -04:00
851e8f46ff
redo fix_rotate
2016-04-25 15:57:39 -04:00
26a45d5fa9
Don't rotate dimensions when constructing the monitor because they are already rotated
2016-04-25 13:55:28 -04:00
4ca61b7bd8
Removed 180 lines of commented out code that has been hanging around
...
in here for a long time.
2016-04-25 22:12:49 +10:00
7fcd12fab9
Packetqueue tweaks, need to move this stuff up to monitor to maintain a packet buffer
2016-04-25 22:06:07 +10:00
44f32f46b7
deprecate zmdbFetchOne in favor of zmDbRow
2016-04-20 11:56:58 -04:00
2fcdee87d9
Merge branch 'storageareas' into valgrind
2016-04-20 10:01:30 -04:00
71d79fac99
Merge ../ZoneMinder.SteveGilvarry into valgrind
2016-04-20 09:59:08 -04:00
d2870f0692
move the mysql_free_result, looks like we can't free it until we free the row
2016-04-20 09:44:11 -04:00
98fa65310b
whitespace changes
2016-04-17 09:29:00 -04:00
d6f640907f
add avformat_network_init
2016-04-17 09:28:43 -04:00
72bf8ac2b8
up the debug level for Have Keyframe
2016-04-16 15:13:36 -04:00
e4f116af2f
more debug and comments, return checking
2016-04-15 15:32:48 -04:00
111b1a1566
add back lastKeyframePkt
2016-04-15 15:23:22 -04:00
db52a61b01
More debugging and restore copying lastkeyframe. Also init videoStore to NULL so that we don't crash
2016-04-15 15:22:58 -04:00
f1e69463b6
More debugging and restore copying lastkeyframe. Also init videoStore to NULL so that we don't crash
2016-04-15 15:22:47 -04:00
b3e68ca2f7
Must init videoStore in constuctor
2016-04-15 15:10:26 -04:00
1e8450ecbf
av_set_parameters was deprecated a long time ago
2016-04-15 12:50:05 -04:00
21b35c4df0
Merge /home/iconnor/sandbox/ZoneMinder.connortechnology into storageareas
2016-04-14 22:12:52 -04:00
b19f990147
Merge /home/iconnor/sandbox/ZoneMinder.connortechnology into storageareas
2016-04-14 22:12:49 -04:00
3e683e3002
Add a call to av_set_parameters, found some code that says it must be called
2016-04-14 22:12:34 -04:00
bcec1813e6
More return value checking/commenting
2016-04-14 21:54:17 -04:00
c7dceafd67
fix first param to zm_dump_stream_format
2016-04-14 12:42:47 -04:00
30066f788d
Merge branch 'feature-h264-videostorage' into storageareas
2016-04-14 12:35:21 -04:00
c189e60d9b
add some comments, and dump filename and AVFormatContext on failure to write header
2016-04-14 12:34:52 -04:00
fb48c909ce
Merge branch 'log_include_mId' into storageareas
2016-04-12 08:42:38 -04:00
2724b10163
Include mId in syslog logging.
2016-04-12 08:42:12 -04:00
28b30ecb47
Merge pull request #1377 from ZoneMinder/random_fixes
...
Random fixes
2016-04-11 12:04:05 -05:00
61bd60184a
Merge branch 'random_fixes' into storageareas
2016-04-11 11:28:24 -04:00
7c0f524e1f
Merge branch 'master' into random_fixes
2016-04-11 11:24:41 -04:00
e1cbaed2a3
Merge branch 'icon_video' into storageareas
2016-04-06 12:50:46 -04:00
fefa2dc804
add a test and error message if the codec is not h264
2016-04-06 12:48:16 -04:00
dc7f2ff353
fix merge problems
2016-04-06 11:44:57 -04:00
d83ab4d46c
Steal some packet dumping routines from ffmpeg. Convert them to use our logging routines
2016-04-06 11:25:05 -04:00
765f79a87f
Merge branch 'icon_video' into storageareas
2016-04-06 11:16:38 -04:00
2a6071561d
use zm_dump_stream_format to dump information about the packet to the log
2016-04-06 10:51:58 -04:00
9dd1c8cb4a
add some packet dumping functions, stolen from ffmpeg, but these will use our logging functions
2016-04-06 10:51:20 -04:00
2f1376950a
spelling fix
2016-04-06 10:50:12 -04:00
9aeba8ced8
whitespace fixes
2016-04-06 10:50:00 -04:00
0ef02287dd
revert
2016-04-06 10:49:42 -04:00
222f7755fe
fix whitespace
2016-04-06 10:27:41 -04:00
30d2b475eb
increase log level on some success debug statements
2016-04-06 08:39:33 -04:00
a92764f71a
check return codes and report errors when writing trailer and closing file
2016-04-06 08:39:09 -04:00
dd408cc9a1
Don't skip audo stream detection by finding video stream
2016-04-06 08:38:34 -04:00
4bc200f839
fix merge
2016-04-06 08:38:10 -04:00
9d9369db6f
Don't skip audio stream by finding a video stream
2016-04-06 08:37:28 -04:00
9a795432cf
merge all the commits from the messed up iconnor_video branch
2016-04-05 17:14:46 -04:00
60642c1fff
Merge branch 'iconnor_video' into storageareas
2016-04-05 12:32:33 -04:00
04800afaf5
Some documenting comments and debug lines, mostly just trying to understand what the code does
2016-04-05 12:30:22 -04:00
238a25a302
Merge branch 'master' into iconnor_video
2016-04-05 09:38:59 -04:00
f1331df4d9
Use != instead of == when checking dts tiemscale stuff
2016-04-05 09:01:54 -04:00
4d7ded5ef0
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
configure.ac
src/Makefile.am
web/js/Makefile.am
2016-04-05 22:06:14 +10:00
be13e56c3c
add some comments
2016-04-04 21:58:16 -04:00
4e9a925933
Merge branch 'Autotools_delete' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-Autotools_delete
2016-04-04 20:52:49 -05:00
7ff8d36598
Merge branch 'depracation_nation' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-depracation_nation
2016-04-04 20:44:53 -05:00
a60a0959fc
fix SQL for inserting event. output the sql on error
2016-04-04 17:41:06 -04:00
de5b9c6dae
I don't know what the Name of an event is, but the column count and value count are off
2016-04-04 16:56:40 -04:00
03b1ced568
tabs to spaces and use 2space indenting
2016-04-04 10:11:48 -04:00
966fbb1a10
Add Packet Queue
2016-04-04 20:04:14 +10:00
9287cd0e0a
undo code style changes and whitespace changes
2016-04-01 15:47:40 -04:00
89598da5c1
undo code style changes and whitespace changes
2016-04-01 15:30:30 -04:00
58c39f930e
revert some structure changes
2016-04-01 14:57:48 -04:00
f4fc129ecf
revert some structure changes
2016-04-01 14:15:31 -04:00
86c888d079
revert some structure changes
2016-04-01 14:14:02 -04:00
9493e99587
Add video file to event data.
2016-04-01 14:06:31 -04:00
03cae9d2f2
Add video file to event data.
2016-04-01 14:06:28 -04:00
82b32578ec
Merge branch 'master' into iconnor_video
2016-04-01 12:54:09 -04:00
Isaac Connor
Isaac Connor
Andrew Bauer
Kfir Itzhak
Andrew Bauer
Michael Schupikov
Isaac Connor
SteveGilvarry
Qu Wenruo
abishai
klemens
Andy Bauer
Isaac Connor
Matt Durant
Isaac Connor
Dmitry Smirnov
Isaac Connor
josh4trunks
abi
root