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

2106 Commits

Author SHA1 Message Date
Isaac Connor 90517ed0aa Merge branch 'master' into add_was_alarmed 2017-05-25 14:01:27 -04:00
Isaac Connor a515041e14 Merge branch 'master' into storageareas 2017-05-23 15:17:46 -04:00
Isaac Connor 5c673d5659 google style 2017-05-23 15:07:50 -04:00
Isaac Connor 54c9c37b21 Merge ../ZoneMinder.connortechnology 2017-05-20 09:55:06 -04:00
Isaac Connor 03495e8c23 fix 2017-05-20 09:54:03 -04:00
Isaac Connor bb50784ed2 braces 2017-05-20 09:53:35 -04:00
Isaac Connor 0da03ca5e8 braces/whitespace 2017-05-20 09:41:13 -04:00
Isaac Connor b123bd1da3 remove uneccessary zm_packetqueue.h 2017-05-20 09:12:05 -04:00
Isaac Connor 40993ce401 braces 2017-05-20 09:11:35 -04:00
Isaac Connor 23633ce30b braces 2017-05-20 09:06:12 -04:00
Isaac Connor a5ee8307d0 Merge ../ZoneMinder.connortechnology 2017-05-20 09:03:57 -04:00
Isaac Connor 457d7e5c94 code documentation, whitespace 2017-05-20 09:03:51 -04:00
Isaac Connor dba947346a braces 2017-05-20 09:03:04 -04:00
Isaac Connor 381d44439a merge SA. braces/whitespace debugging 2017-05-20 09:01:32 -04:00
Isaac Connor c24c427409 braces 2017-05-20 08:57:53 -04:00
Isaac Connor ab365dc749 braces 2017-05-20 08:53:27 -04:00
Isaac Connor 62bd134277 whitespace/braces, also ffmpeg deprecation handling 2017-05-20 08:52:24 -04:00
Isaac Connor 3e426b87d3 init duration to 0 to quieten compiler 2017-05-20 08:35:06 -04:00
Isaac Connor 1ab8530aed use enum values to make code more readable. Better error message on event insertion failure 2017-05-20 08:34:46 -04:00
Isaac Connor 7ecbcd8f12 code documentation 2017-05-20 08:26:55 -04:00
Isaac Connor 53abc14143 handle ffmpeg deprecations 2017-05-20 08:22:08 -04:00
Isaac Connor 13273cb50f rmeove unneeded include 2017-05-19 15:13:42 -04:00
Isaac Connor 7caeee6bf8 Merge branch 'master' into storageareas 2017-05-19 15:09:44 -04:00
Isaac Connor afb450573d fix 2017-05-19 15:08:04 -04:00
Isaac Connor e7ca892efd merge more differences from SA 2017-05-19 15:07:41 -04:00
Isaac Connor 91138ba8a1 Merge branch 'master' into storageareas 2017-05-19 14:53:08 -04:00
Isaac Connor 44e5b6f829 remove redundant code 2017-05-19 14:52:45 -04:00
Isaac Connor 9e54efdfcf Merge branch 'master' into storageareas 2017-05-19 14:49:25 -04:00
Isaac Connor 92c5319fdf add missing video_file 2017-05-19 14:43:59 -04:00
Isaac Connor 7c889add76 cleanup sql to load event data. Don't need MonitorName 2017-05-19 14:43:49 -04:00
Isaac Connor 764c76f98a add loading the video filename when loading event data 2017-05-19 14:29:08 -04:00
Isaac Connor e79d2c5a00 Merge branch 'master' into storageareas 2017-05-19 14:26:28 -04:00
Isaac Connor 7dccbac78d clenaup 2017-05-19 14:25:44 -04:00
Isaac Connor ccc9f6fdf6 remove redundant code 2017-05-19 14:24:49 -04:00
Isaac Connor 61204a8b83 Merge branch 'master' into storageareas 2017-05-19 14:11:29 -04:00
Isaac Connor 41cf0a2458 add back analysis fps 2017-05-19 14:05:24 -04:00
Isaac Connor 8568c95fbe handel NULLS in db fields 2017-05-19 14:03:28 -04:00
Isaac Connor 1e4792e13d Merge branch 'master' into storageareas 2017-05-19 13:36:23 -04:00
Isaac Connor aab08db84b Merge branch 'master' into storageareas 2017-05-19 13:35:31 -04:00
Isaac Connor c4e68f8cfd fix some spacing problems caused by missing ; 2017-05-19 13:35:13 -04:00
Isaac Connor 5e2220efa0 add a missing ; at end of line, and remove end of line spaces 2017-05-19 13:30:08 -04:00
Isaac Connor 3fcca1021d add missing; and fix spacing 2017-05-19 13:28:34 -04:00
Isaac Connor bbb77ab7dd reorder lines to make diff from master cleaner 2017-05-19 13:27:18 -04:00
Isaac Connor 96b459a058 Merge branch 'master' into storageareas 2017-05-19 13:19:16 -04:00
Isaac Connor 6d6b453b82 Google code style/whitespace 2017-05-19 12:57:43 -04:00
Isaac Connor e9af81d31c tabs to spaces 2017-05-19 12:29:03 -04:00
Isaac Connor 1c9c6441d4 Merge branch 'master' into storageareas 2017-05-19 12:28:07 -04:00
Isaac Connor 0a8017b780 whitespace/google code style 2017-05-19 12:24:19 -04:00
Isaac Connor cb3ee3484a remove work in progress crap from zm_event 2017-05-18 09:08:31 -04:00
Isaac Connor f4224bb88e Merge branch 'master' into storageareas 2017-05-17 17:47:39 -04:00
Isaac Connor eef5e5cd90 Merge branch 'feature-h264-videostorage' 2017-05-16 13:37:24 -04:00
Isaac Connor 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
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
Isaac Connor d3115219d2 Merge branch 'master' into feature-h264-videostorage 2017-05-15 21:52:58 -04:00
Isaac Connor 68aea50ca9 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-05-15 16:19:57 -04:00
Isaac Connor 9bd6c99586 Merge branch 'master' into storageareas 2017-05-15 12:52:35 -04:00
Andrew Bauer 1e45146db8 Merge pull request #1881 from mastertheknife/aarch64_neon 
Add AArch64 ARM Neon code (complements #1823)
 2017-05-14 07:49:19 -05:00
Kfir Itzhak 5df7499da4 Move ARM Neon data prefetches to be after the loads 2017-05-13 19:08:18 +03:00
Kfir Itzhak c66deb564f Added ARM Neon AArch64 versions of delta 2017-05-13 09:19:13 +03:00
Andrew Bauer 8315be69de Update zm_image.cpp 
remove extra }
 2017-05-12 18:46:19 -05:00
Kfir Itzhak ec2b6235a0 Added ARM Neon AArch64 version of fastblend 2017-05-12 22:59:08 +03:00
Kfir Itzhak 773ad363be Enable neon (Advanced SIMD) in hwcaps_detect() on AArch64 2017-05-12 22:43:30 +03:00
Isaac Connor 1ddf4e32cf Merge branch 'master' into storageareas 2017-05-11 08:55:42 -04:00
Kfir Itzhak 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
Isaac Connor fd44ff4e60 Merge branch 'master' into storageareas 2017-05-10 13:16:08 -04:00
Kfir Itzhak 0584454aa8 Fix conflicts in Image::Initialise() caused by merging #1810 and #1823 2017-05-10 17:37:25 +03:00
Andrew Bauer 2c0d322924 remove zmf.cpp to fix merge conflict 2017-05-10 08:07:08 -05:00
Andrew Bauer c4f471d967 Merge branch 'master' of https://github.com/abishai/ZoneMinder into abishai-master 2017-05-10 08:06:48 -05:00
Andrew Bauer ccc2cc832f Merge branch 'armv7_neon' of https://github.com/mastertheknife/ZoneMinder into mastertheknife-armv7_neon 2017-05-10 07:45:58 -05:00
Andrew Bauer e6c60737e9 Merge pull request #1756 from SteveGilvarry/zmf_goodbye 
Remove zmf
 2017-05-10 07:07:22 -05:00
Andrew Bauer 747583e9f4 Merge pull request #1810 from mastertheknife/ssse3_improvements 
Minor zm_image SSSE3 improvements
 2017-05-10 07:06:33 -05:00
Isaac Connor fc52766606 Merge branch 'master' into storageareas 2017-05-08 22:17:37 -04:00
Isaac Connor 9ac20999b3 rough in 2017-05-05 21:11:23 -04:00
Isaac Connor a6a2339eea play with setting moov flags 2017-05-05 14:25:54 -04:00
Isaac Connor 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
Isaac Connor 8251e7ac03 fix uridecode(password) to uridecode(value) 2017-05-05 09:47:15 -04:00
Andrew Bauer 2e8022419b Delete zmstreamer.cpp again 
we previously deleted this file with commit 4837585601 but it came back like a zombie that would not die. Deleting zmstreamer.cpp again.
 2017-05-05 08:17:22 -05:00
Isaac Connor 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
Isaac Connor 6827e0412c white and google style 2017-04-28 10:34:48 -04:00
Isaac Connor 10dc6b98ca fix if LIBAVRESAMPLE structure 2017-04-24 11:28:24 -04:00
Isaac Connor c4ec01c0d2 fix compile when no libavresample 2017-04-19 14:28:37 -04:00
Isaac Connor 5246844b10 turn down log level 2017-04-19 14:15:10 -04:00
Isaac Connor d2fb4a7874 braces, spacing cleanup. Remove unused variable wasRecording 2017-04-19 10:34:17 -04:00
Isaac Connor c3e9b2b177 add some code comments 2017-04-18 14:17:57 -04:00
Isaac Connor d53639c2bf fix braces 2017-04-18 14:17:48 -04:00
Isaac Connor d4e0b456c0 Fix HAVE_LIBAVRESAMPLE tests so that the build works without it 2017-04-18 10:49:27 -04:00
Isaac Connor 273229858f Merge branch 'master' into storageareas 2017-04-16 11:26:18 -04:00
Kfir Itzhak 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
Andrew Bauer 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
Andrew Bauer 6b0f587725 invert timestamp_on_capture condition 2017-04-13 15:51:50 -05:00
Isaac Connor 83219d3e34 define av_frame_free to av_freep on older ffmpeg. Undo c++11 requirements. 2017-04-13 09:47:19 -04:00
Isaac Connor d1f04a60f9 fix errors calculating dts 2017-04-12 16:16:37 -04:00
Isaac Connor d039227f79 Merge branch 'master' into storageareas 2017-04-12 13:51:10 -04:00
Isaac Connor 51d5bfc8d5 introduce a helper function to print out a timeval 2017-04-12 13:40:38 -04:00
Isaac Connor ecb57f8f04 change bool recording to a timeval. 2017-04-12 13:40:17 -04:00
Isaac Connor 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
Isaac Connor a0b57cedeb change bool recording to a timeval. and add GetPreEventCount 2017-04-12 13:39:12 -04:00
Isaac Connor e3d3fc3411 change bool recording to a timeval. 2017-04-12 13:38:56 -04:00
Isaac Connor 59c85c1fbb change bool recording to a timeval. 2017-04-12 13:38:39 -04:00
Isaac Connor 8efeb41f7d use new clear_unwanted_packets and a clearQueue version that keeps the approprate # of frames 2017-04-12 13:38:12 -04:00
Isaac Connor 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
Isaac Connor 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
Isaac Connor 669a23c408 change type of width and height to unsigned int and recording from bool to timeval 2017-04-12 13:35:07 -04:00
Isaac Connor bdb6dd63a3 change type of width and height to unsigned int and recording from bool to timeval 2017-04-12 13:32:22 -04:00
Isaac Connor eb390c323e Merge branch 'storageareas' into ffmpeg_321 2017-04-11 11:14:23 -04:00
Isaac Connor 161aaac3f2 cleanup swsresample stuff. resampling now works 2017-04-11 10:39:43 -04:00
Isaac Connor a2a823e3ec Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-04-11 08:54:54 -04:00
Isaac Connor 9291c154a1 Merge branch 'split_monitor_stream' into storageareas 2017-04-10 21:58:01 -04:00
Isaac Connor 42e94d1a7c contains the MonitorStream class 2017-04-10 21:57:31 -04:00
Isaac Connor 620797ac18 replace swresample with libavresample 2017-04-10 21:54:23 -04:00
Isaac Connor 2220b04203 need to include zm_monitorstream.h now 2017-04-10 21:52:29 -04:00
Isaac Connor 766925d9a7 Split MonitorStream into it's own files. 2017-04-10 21:51:18 -04:00
Isaac Connor 48d658790a Merge branch 'storageareas' into optimisations 2017-04-09 17:36:24 -04:00
Isaac Connor 4215f227da Merge branch 'mastertheknife-ssse3_improvements' into storageareas 2017-04-07 13:43:09 -04:00
Isaac Connor 6ec340d525 Merge branch 'ssse3_improvements' of https://github.com/mastertheknife/ZoneMinder into mastertheknife-ssse3_improvements 2017-04-07 13:38:50 -04:00
Isaac Connor 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
Isaac Connor 6a9819e16b whitespace, comments 2017-04-05 16:10:21 -04:00
Isaac Connor 452e9571ee add a different size warning 2017-04-05 16:08:29 -04:00
Isaac Connor 15e69fc817 fix . to -> 2017-04-05 10:39:38 -04:00
Isaac Connor 1dbf599f10 add a cast to get rid of build warning 2017-04-05 10:36:44 -04:00
Isaac Connor 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
Andrew Bauer b609b9ad4c Merge pull request #1826 from connortechnology/uri_decode_in_zms 
Uri decode in zms
 2017-04-03 20:13:30 -05:00
Isaac Connor e70c7fa1ef whitespace and comments 2017-03-31 23:34:58 -04:00
Isaac Connor 30455feef7 code style 2017-03-31 11:12:52 -04:00
Isaac Connor 9c495b07dd code style, whitespace, comments 2017-03-31 11:12:42 -04:00
Isaac Connor 26dfe45ec6 delete the videostore on camera delete so that the .mp4 gets written to disk 2017-03-31 11:06:15 -04:00
Isaac Connor f2dcd18297 Merge branch 'armv7_neon' of https://github.com/mastertheknife/ZoneMinder into storageareas 2017-03-30 13:46:30 -04:00
Kfir Itzhak 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
Isaac Connor 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
Isaac Connor 8b7acb68a3 fix password and add debug 2017-03-29 20:07:58 -04:00
Michael Schupikov 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
Kfir Itzhak 7162c62d26 Implemented a fix to get the Neon code to compile successfully with GCC < 6.0 2017-03-25 21:49:15 +03:00
Isaac Connor 5800598666 put back code that got merged out 2017-03-24 13:43:56 -04:00
Isaac Connor 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
Isaac Connor 3a8a04c213 Merge branch 'master' into feature-h264-videostorage 2017-03-22 09:02:02 -04:00
Kfir Itzhak 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
Isaac Connor df5a238857 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-03-20 15:14:50 -04:00
Isaac Connor 0a1b2eab01 Merge branch 'uri_decode_in_zms' into storageareas 2017-03-20 15:13:19 -04:00
Isaac Connor f5dc896a45 missed one case 2017-03-20 15:12:23 -04:00
Isaac Connor 7b8ff44163 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-03-20 15:04:54 -04:00
Isaac Connor 816b0a9e01 add getsockopt test 2017-03-20 15:04:05 -04:00
Isaac Connor a546c9e37f merge uri_decode in zms 2017-03-20 12:00:14 -04:00
Isaac Connor 9f30ccfa75 Use new UriDecode function to decode username and password 2017-03-20 11:16:39 -04:00
Isaac Connor 3b15ba91d1 Rough in a CURL based UriDecode 2017-03-20 11:16:21 -04:00
Kfir Itzhak 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
Kfir Itzhak 8b593b701b Fixed hwcaps_detect() failing to compile on x86-64 2017-03-19 15:11:06 +02:00
Kfir Itzhak 29885135a6 Corrected issues in last two ARM Neon commits 2017-03-19 13:39:24 +02:00
Kfir Itzhak 510f65c414 Added ARM Neon (AArch32) FastBlend function 2017-03-19 13:31:44 +02:00
Kfir Itzhak c5c9b52d18 Added ARM Neon (AArch32) Delta functions for 32bit color and 8bit grayscale 2017-03-19 13:02:42 +02:00
Kfir Itzhak e02e033cc8 Renamed ssedetect() to hwcaps_detect() and added ARM Neon and AVX2 detection 2017-03-19 02:05:01 +02:00
SteveGilvarry e5b18ee213 Remove zmc -r argument as it does not seem to be implemented. 2017-03-18 23:25:14 +11:00
Isaac Connor 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
Isaac Connor b041e299fc Merge branch 'adam900710-compile_fix' into storageareas 2017-03-17 09:41:42 -04:00
Isaac Connor 654282d82e fix merge 2017-03-17 09:41:04 -04:00
Isaac Connor d9c665b021 Merge branch 'fix_crash_with_invalid_zones' into storageareas 2017-03-17 09:35:11 -04:00
Isaac Connor 6a447194eb Fix zmc crashing when zones are no good bby decreasing n_zone before continuing 2017-03-16 10:55:13 -04:00
Kfir Itzhak f7fcab24c4 Fixed a mistake in recent commit e7a681b8ff 2017-03-14 22:46:36 +02:00
Kfir Itzhak f30192e5da Use standard memcpy() on x86-64, as it behaves similar performs the equal or better 2017-03-14 22:41:35 +02:00
Kfir Itzhak 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
Kfir Itzhak 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
Kfir Itzhak 20604c2150 SSSE3 rgba->gray8 convert function now uses less instructions and is 10-20% faster 2017-03-14 16:54:00 +02:00
Kfir Itzhak 844b4bb5ee SSSE3 delta functions now use less instructions and are 5-10% faster 2017-03-14 12:17:01 +02:00
Qu Wenruo 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
Isaac Connor 3f7583ebda Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-03-06 16:22:25 -05:00
Isaac Connor e723b6dbef Must cast codec 2017-02-21 16:28:53 -05:00
Isaac Connor 0880412e7f Merge branch 'master' into feature-h264-videostorage 2017-02-21 16:04:27 -05:00
Isaac Connor 34d462a5d5 Merge branch 'zm_packet' into ffmpeg_321 2017-02-18 15:23:21 -05:00
Isaac Connor f19b3d5505 create zm_packet 2017-02-18 15:22:56 -05:00
Isaac Connor a97941edd3 change level from error to debug on message about not supporting non-FLTP 2017-02-16 13:30:34 -05:00
Isaac Connor d135216ac7 Merge branch 'master' into storageareas 2017-02-15 09:30:35 -05:00
Isaac Connor 808d070414 don't copy smCodes, just get a pointer to it. 2017-02-14 11:29:43 -05:00
Isaac Connor 4ca2bcacde Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-02-13 17:02:59 -05:00
Isaac Connor d5bb6f3210 remove line that causes endless reading when doing single image mode 2017-02-11 09:57:36 -05:00
abishai 74dd8ab027 make clang happy take two 2017-02-06 09:57:22 +03:00
Isaac Connor aae4a1f83b remove extraneous setting of NULL to videowriter which is already NULL 2017-02-04 11:20:21 -05:00
abishai 8d5a8f5512 make clang happy 2017-02-03 14:53:53 +03:00
Isaac Connor f73bf0aee0 add a cast to fix compilation with clang 2017-02-02 12:43:13 -05:00
Isaac Connor 1102f449aa don't do extra copy of classString 2017-02-02 09:22:13 -05:00
abishai 1687217d18 switch to POSIX basename() 2017-01-31 11:10:25 +03:00
abishai 97380f009b implement platform-agnostic comparison without abs() 2017-01-31 10:42:57 +03:00
Isaac Connor 7ab6818fa0 Merge branch 'sanitize_image_path' of https://github.com/knnniggett/ZoneMinder into storageareas_sanitize 2017-01-25 17:14:30 -05:00
Isaac Connor 41b6369c36 Merge branch 'master' into feature-h264-videostorage 2017-01-25 09:46:06 -05:00
Isaac Connor 61827fec0c remove redundant mkdir eventdir. 2017-01-18 09:31:08 -05:00
Isaac Connor 7116d66500 use the correct pointer casts 2017-01-16 21:57:21 -05:00
Isaac Connor 1f3644f6bd Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-01-16 21:14:39 -05:00
Isaac Connor 19bc79a5ec move nRet into the block where it is used. Add a comment. 2017-01-16 21:11:28 -05:00
Isaac Connor f6d1707382 fix event insert 2017-01-16 21:08:13 -05:00
SteveGilvarry 2f3ebd80da Remove zmf, die..die..die 2017-01-16 13:20:05 -08:00
Andrew Bauer 5833196a84 packpack - change error code handling 2017-01-16 08:36:46 -06:00
Isaac Connor c5ad62b9fc Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-01-15 14:24:58 -05:00
Isaac Connor 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
Isaac Connor b7ee64ff41 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-01-15 13:35:45 -05:00
Isaac Connor 899b1b82b9 Merge branch 'filter_by_runstate' into storageareas 2017-01-14 17:07:20 -05:00
Isaac Connor 242e5a56d8 rough in the ability to filter on RunState 2017-01-14 16:55:28 -05:00
Isaac Connor babe4f07fb Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-01-14 10:53:49 -05:00
Isaac Connor 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
Isaac Connor 251264ac92 bump ffmpeg version required to use codecpar 2017-01-11 14:31:30 -05:00
Isaac Connor 7f059b750f fix whitespacing causing a warning when compiling. In this case braces are not neccessary. 2017-01-11 14:25:46 -05:00
Isaac Connor 23b40da598 fix whitespacing causing a warning when compiling. In this case braces are not neccessary. 2017-01-11 14:25:12 -05:00
Isaac Connor 8653822bff cleanup av_packet_unref/free_packet by using our zm_av_packet_unref 2017-01-11 14:22:37 -05:00
Isaac Connor 87daba346b fix else behaviour by adding braces 2017-01-11 14:18:56 -05:00
Isaac Connor 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
Isaac Connor 5d03e9f50e Merge branch 'fix_1743_Edimax' into storageareas 2017-01-11 10:34:08 -05:00
Isaac Connor 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
Isaac Connor 8ae02b9ac0 use a FrameType enum instead of string comparisons 2017-01-08 16:53:29 -05:00
Isaac Connor 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
Isaac Connor dccd1e9732 fix 2017-01-05 13:54:34 -05:00
Isaac Connor 71ad08613e fix 2017-01-05 11:30:01 -05:00
Isaac Connor d1ed472db0 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-01-05 10:09:11 -05:00
Isaac Connor d5ad757116 Merge branch 'master' into feature-h264-videostorage 2017-01-02 10:00:02 -05:00
Isaac Connor 5ae34a7561 Merge branch 'master' into storageareas 2017-01-02 09:39:10 -05:00
klemens 0d549f1db3 spelling fixes 2016-12-29 10:31:05 +01:00
Andy Bauer 254fcbcef7 update gpl 2 mailing address in source files 2016-12-26 09:23:16 -06:00
Isaac Connor 727d4b9714 add tests when select returns true, but no bytes available, in single image mode 2016-12-23 11:27:50 -05:00
Isaac Connor 61d3ecf9c1 when a socket times out, use getsockopt to see if there are any errors 2016-12-22 13:31:42 -05:00
Isaac Connor f6c377c2b4 Merge branch 'master' into feature-h264-videostorage 2016-12-15 16:47:32 -05:00
Isaac Connor 87e8f91868 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2016-12-13 15:06:07 -05:00
Isaac Connor 92a4641e1b Merge branch 'log_failed_log_insert' into storageareas 2016-12-12 21:46:53 -05:00
Isaac Connor 6fa3b25d2a fix whitespace 2016-12-12 21:44:03 -05:00
Isaac Connor 1f6a6f9758 fix whitespace 2016-12-12 21:43:07 -05:00
Isaac Connor 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
Isaac Connor d97c1f1cff Merge branch 'fix_braces' into storageareas 2016-12-08 14:58:38 -05:00
Isaac Connor 7f2bf04c2f Merge branch 'cookie_http_only' into storageareas 2016-12-08 14:26:13 -05:00
Isaac Connor c27a18a758 fix braces in zm_monitor.cpp 2016-12-08 11:49:54 -05:00
Isaac Connor 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
Isaac Connor ead1631fce copy some filter code into the object 2016-12-02 13:24:59 -05:00
Isaac Connor 0e302001dd fix snprintf format for 64bit type 2016-11-29 15:26:19 -05:00
Isaac Connor 1a25b957ad check for and create events dir for monitor on Object instantiation 2016-11-27 20:10:12 -05:00
Andy Bauer 873bb9902b recalculating zmswap at this point is unnesessary 2016-11-19 08:53:17 -06:00
Andy Bauer 3afa8937d8 calculate string lengths and array ndx's properly 2016-11-19 08:52:22 -06:00
Isaac Connor 2bd080a6a6 Merge branch 'master' into storageareas 2016-11-15 08:41:00 -05:00
Andy Bauer d3a7fca079 only unlink if zmc is being destroyed 2016-11-14 19:01:00 -06:00
Andy Bauer 6c7d71361a unlink the mmap file when the monitor object is destroyed 2016-11-13 16:40:54 -06:00
Isaac Connor 11b160b7d1 document code blocks 2016-11-03 16:44:03 -04:00
Isaac Connor dbd7d7d095 fix crash when not compiled with sws_resample 2016-11-03 16:43:48 -04:00
Isaac Connor a2f782d61a Merge branch 'master' into feature-h264-videostorage 2016-11-03 16:26:18 -04:00
Isaac Connor 6a16db0361 get rid of extra line feed 2016-10-26 14:45:13 -04:00
Isaac Connor 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
Isaac Connor 5b8b9c5345 merge update 2016-10-12 09:24:10 -04:00
Isaac Connor 9656a7c3e8 Store Oriention on event creation 2016-10-12 09:12:09 -04:00
Isaac Connor 2b37999cd5 Merge branch 'fix_zm_image_memleak' into storageareas 2016-10-07 11:39:03 -04:00
Isaac Connor 006fcad10a move jpeg context freeing to a Deinitialise function instead of ~Image. Turn down the logging 2016-10-07 11:35:14 -04:00
Isaac Connor 37a4c67ae6 move jpeg context freeing to a Deinitialise function instead of ~Image. Turn down the logging 2016-10-07 11:33:25 -04:00
Isaac Connor a7979eb63b Merge branch 'master' into feature-h264-videostorage 2016-10-03 13:21:50 -04:00
Isaac Connor 056e560b70 Merge ../ZoneMinder.master into storageareas 2016-10-02 12:25:51 -04:00
Isaac Connor 0df70a7e0f if out the new code that frees structure on Image destroy. It creates a memleak 2016-10-02 12:24:33 -04:00
Isaac Connor 4fc64e4874 fix crash when not compiled with libswresample 2016-10-02 12:24:19 -04:00
Isaac Connor 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
Isaac Connor bb174ba49d if out the new code that frees structure on Image destroy. It creates a memleak 2016-10-02 12:20:39 -04:00
Isaac Connor fb4a2babc7 better debug message 2016-09-30 09:37:41 -04:00