mirror/motion
1
0
Fork 0
mirror of https://github.com/Motion-Project/motion.git synced 2026-04-22 15:07:02 -04:00
Code Issues Packages Projects Releases Wiki Activity
881 Commits 15 Branches 23 Tags
828d70ac44e85cf4be115ebbfa5e40451c2be97e
Commit Graph

881 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
MrDave
828d70ac44 Split motion_loop - Tuning 
Add the motionloop_tuning function
 2016-12-04 22:40:27 -07:00
MrDave
d13dafdea1 Split motion_loop - detection 
Add the motionloop_detection function
 2016-12-04 22:35:22 -07:00
MrDave
bbf696cd53 Split motion_loop - capture 
Add the motionloop_capture function
 2016-12-04 22:28:30 -07:00
MrDave
7b1dc4bf14 Split motion_loop - retry 
Add the motionloop_retry function
 2016-12-04 22:23:46 -07:00
MrDave
d1d3c9a807 Split motion_loop - resetimages 
Add the motionloop_resetimages function
 2016-12-04 22:20:00 -07:00
MrDave
d29ebee3e3 Split motion_loop 
Move more initialization to the motion_init routine.
 2016-12-04 22:15:34 -07:00
MrDave
42a1449c98 Split motion_loop 
Break out the motionloop_prepare
 2016-12-04 21:57:50 -07:00
MrDave
baaf9765d8 Split motion_loop 
Segregate the area_detection initialization and processing section
 2016-12-04 21:40:40 -07:00
MrDave
edd116e1ee Eliminate forward declares 2016-12-04 21:17:57 -07:00
MrDave
9336f1e036 RTSP Without ffmpeg 
Fix the warnings for trying to run rtsp without ffmpeg.
 2016-11-24 22:19:25 -07:00
MrDave
1b33f958f2 HAVE_FFMPEG consolidation 
1.  Consolidate the HAVE_FFMPEG pre-processor directives that are scattered
through the code into the ffmpeg.c module.  This makes it so that a single
pre-processor check can be used rather than surrounding every call scattered
through the code.

2.  Always compile/include the ffmpeg.c module
 2016-11-24 20:59:17 -07:00
Joseph Heenan
9df0c11fad Merge pull request #260 from slokhorst/cmake4 
CMake: fix setting of WITHOUT_V4L
 2016-11-17 16:45:47 +00:00
Sebastiaan Lokhorst
e12e6c4308 CMake: fix setting of WITHOUT_V4L 2016-11-17 17:10:31 +01:00
Joseph Heenan
424b5a1164 Merge pull request #259 from slokhorst/cmake3 
CMake: add V4L detection
 2016-11-17 15:42:25 +00:00
Joseph Heenan
b2ded24ee6 Merge pull request #255 from slokhorst/rm-sdl 
Remove SDL support
 2016-11-17 15:38:59 +00:00
Sebastiaan Lokhorst
62627da2f4 CMake: add V4L detection 
Switch some lines in video2.c, so the #defines from config.h are usable at the start
 2016-11-17 12:26:14 +01:00
Joseph Heenan
f77de18a79 Merge pull request #254 from slokhorst/cmake2 
CMake improvements
 2016-11-16 15:52:07 +00:00
Mr-Dave
2de3689202 Merge pull request #253 from jogu/master 
Update macOS readme
 2016-11-14 17:00:28 -07:00
Sebastiaan Lokhorst
8ba53b683b Remove SDL support 2016-11-13 20:28:15 +01:00
Sebastiaan Lokhorst
3a0f007714 CMake: fix libary dirs of libraries found with pkg-config 2016-11-13 20:03:44 +01:00
Sebastiaan Lokhorst
a511b0a6bc CMake: specify that motion only need a C compiler 
Fix compilation issue on systems which don't have a C++ compiler
 2016-11-13 18:38:23 +01:00
Joseph Heenan
7b04145895 Update macOS readme 
macOS uses the new Cmake build system

Also:
- remove obsolete ffmpeg patch
- add files CMake generates in Xcode output mode to gitignore

Closes #199
 2016-11-13 13:02:33 +00:00
Joseph Heenan
1cfc6031fc Merge pull request #236 from slokhorst/cmake 
CMake build system
 2016-11-13 12:02:40 +00:00
Joseph Heenan
e8eccd1ae3 Merge pull request #252 from Mr-DaveDev/small_fixes 
Small fixes
 2016-11-13 10:58:23 +00:00
MrDave
434099b96b Small fixes 
Closes #245 - Comment within comment warning
Closes #249 - Crash when too many filler frames
Closes #251 - Simple instruction in guide for installing a deb
 2016-11-12 19:56:48 -07:00
Sebastiaan Lokhorst
915c889257 Add CMake build system 2016-11-11 21:47:37 +01:00
Mr-Dave
37b3595c55 Merge pull request #244 from ccrisan/master 
motion_guide.html: minor typo fixes and updates
 2016-11-02 17:39:54 -06:00
Calin Crisan
fb47e89762 motion_guide.html: the despeckle option is actually called despeckle_filter 2016-11-01 22:17:32 +02:00
Calin Crisan
057725249f motion_guide.html: minor typo fixes and updates 2016-10-31 23:22:01 +02:00
Mr-Dave
dbd7282dad Merge pull request #239 from jogu/macos 
Macos port fixes
 2016-10-30 20:32:03 -06:00
Mr-Dave
b78739e338 Merge pull request #212 from dagmcr/master 
Added support for V4L2_PIX_FMT_Y10 and V4L2_PIX_FMT_Y12 formats
 2016-10-30 20:10:08 -06:00
Joseph Heenan
cc3c25527d Merge pull request #243 from ffontaine/master 
Rename base64_encode
 2016-10-30 20:21:51 +00:00
Fabrice Fontaine
0da5428bdf Rename base64_encode 
base64_encode is already defined in gnutls so rename it as
motion_base64_encode to prevent a definition clash when linking
statically with gnutls

Fixes:
  - http://autobuild.buildroot.org/results/592672b8826f4c731c50d29725da964d876573c4

Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com>
 2016-10-30 19:30:46 +01:00
Joseph Heenan
b063b1c4ab Merge pull request #241 from Mr-DaveDev/version-fix 
Version fix
 2016-10-27 11:32:04 +01:00
Mr-Dave
420caaa5f1 Merge pull request #235 from jogu/master 
updates to conf.c
 2016-10-26 18:42:32 -06:00
MrDave
c90679bbe8 Remove redundant sed from Makefile 2016-10-26 18:17:04 -06:00
MrDave
940c879bc8 Version script Update 
1.  Revise version number to 4.0.1
2.  Remove obsolete version scripts
3.  Change from echo to printf for compatability
4.  Update Makefile.in to remove obsolete svn and git variants
5.  Update Makefile.in to remove obsolete updateguide
 2016-10-24 21:39:54 -06:00
MrDave
c01389dbc0 Merge branch 'fix-version' of https://github.com/slokhorst/motion into slokhorst-fix-version 2016-10-24 21:13:45 -06:00
Joseph Heenan
5de436f3d5 Merge pull request #240 from infinity0/patch-1 
Fix manpage typo
 2016-10-23 19:43:34 +01:00
Ximin Luo
020fd01b76 Fix manpage typo 2016-10-23 20:40:03 +02:00
Joseph Heenan
c175892e3c Correct bad format string in handle_md5_digest 
Format string for size_t is %zu
 2016-10-23 12:44:41 +01:00
Joseph Heenan
0055ef32ae MacOS: Fix warnings about mismatched format specifiers 
Most changing %hu (unsigned short) to %u (unsigned int) for the
threadnumber, which is an unsigned int - but various other fixes
along the same lines.
 2016-10-23 12:44:41 +01:00
Joseph Heenan
67ae55d003 macOS: Fix warnings about always true comparison 
Fix the warnings like:

Comparison of array 'command' not equal to a null pointer is always true

command is an array, so can never be NULL, so don't bother checking
 2016-10-23 12:44:41 +01:00
Joseph Heenan
9f531674ab macOS: Fix sockaddr type mismatch warnings 
Add missing casts
 2016-10-23 12:44:41 +01:00
Joseph Heenan
10258c4434 Tidyup http_bindsock 
Make sure we pass IPPROTO_TCP, and check all the socket operations for
success.
 2016-10-23 12:44:41 +01:00
Joseph Heenan
841f8500d6 MacOS: Fix socket binding 
macOS's bind() insists that the size argument passed is correct for
the type of socket in use.

Also update the relevant MOTION_LOG to include errno.
 2016-10-23 12:44:41 +01:00
Joseph Heenan
a8709463e7 Move from old GNU field designator to the standard C99 way 
The GNU style syntax has been marked as obsolete since gcc 2.5 I believe,
which was released in 1993.

Fixes some warnings in the macOS builds.
 2016-10-23 12:44:41 +01:00
Joseph Heenan
ab5835d435 MacOS: Add support for Mac variant of pthread_setname_np 
We add a simple wrapper #define to hide the difference between the
Mac and other platforms version of this function. The tests should
cover all our supported platforms, so remove the configure test.
 2016-10-23 12:44:41 +01:00
Joseph Heenan
445f11db95 Updates to conf.c 
Various minor things:
- update some comments to match motion-dist.conf
- remove some odd trailing spaces
- remove some superfluous newlines
- fix some obviously misleading comments
 2016-10-23 12:39:26 +01:00
Joseph Heenan
871e0dae8a MacOS: Remove our implementation of get_current_dir_name 
MacOS doesn't have this in the system, and we were providing our
own version. This really isn't necessary as the system getcwd()
is trivially usable instead, making the code the same on all platforms.
 2016-10-23 12:34:27 +01:00