Commit Graph

952 Commits

Author SHA1 Message Date
MrDave
329eade94a Autotool Rewrite
Update the autotools to use packaged applications/locations and
remove the obsolete options.
2017-02-12 22:08:08 -07:00
Mr-Dave
efb4c877be Merge pull request #321 from Mr-DaveDev/whitespace
Whitespace and Tab cleanup
2017-02-12 21:29:21 -07:00
MrDave
f196a2c5af Whitespace and Tab cleanup
Remove trailing whitespace and convert tabs to four spaces.
No code changes.
2017-02-12 18:25:43 -07:00
Mr-Dave
bde92a4186 Merge pull request #320 from Mr-DaveDev/v4l2-base
v4l2 Revisions
Closes #290 
Closes #272
2017-02-12 16:30:48 -07:00
MrDave
1a41fe8ab7 v4l2 Revisions
This commit includes:
1.  Consolidate functions into appropriate modules
2.  Rename modules to reflect contents (v4l2, bktr, common)
3.  Combines v4l2 and bktr so they can be used together
4.  Implements functional prefixes
5.  Uses HAVE_V4L2, HAVE_BKTR instead of WITHOUT_
6.  Include pthread_np.h for FreeBSD
2017-02-12 16:20:27 -07:00
Mr-Dave
ce93905d6a Merge pull request #319 from Mr-DaveDev/webp
Webp Default to Off
2017-02-12 15:30:45 -07:00
MrDave
b5e71f7ac3 Webp Default to Off
The webp image format option is not available on older distributions
This commit revises the default for the webp to OFF.  Once the older
distributions reach EOL, the default can be changed back to ON.
2017-02-12 15:17:42 -07:00
Mr-Dave
9276f04bb0 Merge pull request #311 from jayslovak/master
Add webp image compression support.  Closes #310  Thanks @jayslovak.
2017-02-09 18:47:24 -07:00
Radek Hvizdos
c19ee468e8 Change webp->jpeg fallback message log level to ERR 2017-02-09 13:07:11 +01:00
Radek Hvizdos
670fcef4e2 Replace further references to libwebp with webp and move from CFLAGS to AC_DEFINE 2017-02-09 12:56:20 +01:00
Radek Hvizdos
6163d76384 Fallback to jpeg if webp was selected in the config file, but the support for it was not compiled in 2017-02-09 12:43:20 +01:00
Radek Hvizdos
a2deae32c4 Correct build instructions for Debian/Ubuntu 2017-02-09 12:30:20 +01:00
Radek Hvizdos
ed82011979 change the configure to use --without-webp instead of --without-libwebp 2017-02-09 12:28:46 +01:00
Mr-Dave
4e93414f3f Merge pull request #315 from Mr-DaveDev/prvcy
Privacy Mask
2017-02-04 21:16:18 -07:00
MrDave
2a07dd1277 Privacy Mask
This commit fully implements the privacy mask on all color components of the image.

Since activity could still be detected with just the cr/cb this change addresses
putting the mask on these color components in addition to just the y component.

It also changes the mask to black since we have to manually assign the cr/cb
to x80 to have it reflect a acceptable color for the masked area.
2017-02-02 17:06:59 -07:00
Radek Hvizdos
0fcb9c63e7 Merge remote-tracking branch 'refs/remotes/Motion-Project/master' 2017-01-31 16:04:34 +01:00
Mr-Dave
dba8ad1a65 Merge pull request #305 from tothi/master
fix raw detection paused/resume response
2017-01-28 17:44:46 -07:00
Radek Hvizdos
0e4663ae7e Adding webp build fixes and documentation update #1 2017-01-27 14:30:16 +01:00
Radek Hvizdos
31364dc841 Add initial webp image compression support.
Only basic webp compression is supported (the only tunable is 0-100%
compression adjustment), without EXIF metadata.
Motion build scripts are configured to build in the support by default
and will emit an error if the needed library is missing. Suport can be
manualy disabled at configuration stage adding --without-libwebp.

Documentation update will follow in a separate commit.

Tested on x86-64 Linux only.
2017-01-26 19:06:11 +01:00
István Tóth
1bb883e869 fix raw detection paused response 2017-01-20 09:31:51 +01:00
Mr-Dave
fa6e5b9ae6 Merge pull request #303 from slokhorst/service-daemon
Force motion to run in non-daemon mode in systemd service
2017-01-18 21:00:15 -07:00
Mr-Dave
9db131da2f Merge pull request #301 from pascal-fb-martin/word_specifiers
Initial support for conversion specifier words
2017-01-18 20:51:23 -07:00
Joseph Heenan
954a541f00 Merge pull request #304 from Mr-DaveDev/contrib
Add Contributing Guide
2017-01-17 10:55:23 +00:00
MrDave
638e8f4316 Add Contributing file 2017-01-16 18:16:03 -07:00
Sebastiaan Lokhorst
34faa49adf Force motion to run in non-daemon mode in systemd service 2017-01-16 18:09:32 +01:00
Pascal Martin
088f39516c Initial support for conversion specifier words 2017-01-16 00:42:42 -08:00
Mr-Dave
459ff685fe Merge pull request #292 from genius3000/master+event_cam_found
Add in a 'on_camera_found' event
2017-01-12 21:59:34 -07:00
genius3000
2d262e5f49 Added on_camera_found event: for when a lost camera is found. 2017-01-08 19:47:12 -07:00
Mr-Dave
be2328ae67 Merge pull request #287 from slokhorst/fix-netcam-connect
Fix netcam getaddrinfo/connect usage
2017-01-06 17:56:12 -07:00
Sebastiaan Lokhorst
687ba29a52 Fix netcam getaddrinfo/connect usage 2017-01-06 01:46:06 +01:00
Mr-Dave
994da28f81 Merge pull request #284 from bcl/master-post-capture
Always save post_capture images
2017-01-03 19:40:55 -07:00
Brian C. Lane
72cf0c8470 Always save post_capture images
Previously the post_captured images were only saved when using
ffmpeg_output or use_extpipe. This changes the behavior to always save
them when post_capture is > 0.
2017-01-02 10:56:41 -08:00
Joseph Heenan
d830288c2a Merge pull request #275 from Mr-DaveDev/cont-movies
Multiple Issues
2016-12-29 11:26:57 +00:00
MrDave
72fe05c64d MacOS config and duplicated format
Small changes to the config.h.in to remove old V4L declares and remove
a duplicated format.
2016-12-28 19:35:14 -07:00
MrDave
422115e49d Eliminate Developer Flag Warnings
Eliminate the warnings that occur when compiling with developer-flags
2016-12-26 12:13:48 -07:00
MrDave
28f1abf75b Regression without ffmpeg fix
This commit resolves a regression error when selecting the without-ffmpeg option.

1.  The ffmpeg configuration options are now valid whether or not the user has
    included ffmpeg.  Instead the user is notified when ffmpeg options are
    requested.

2.  The initial consolidation of the HAVE_FFMPEG duplicated the public functions
    in the #else (no ffmpeg) section.  This commit changes this so that the #IF
    are inside of the public functions so we don't have to worry about keeping
    the parameters the same between them.

3.  The timevalue was added to the ffmpeg header for the situation when
    ffmpeg is not included.
2016-12-26 11:32:03 -07:00
MrDave
2345295cbd CMakeLists.txt Revision
This commit includes three revisions to the CMakeLists.txt
  1.  Unset the ffmpeg and sqlite3 from the cache so that user
      revised parameters are recognized.
  2.  Revise the WITHOUT_V4L2 conditions.  For each distribution
      have the CMakeList look for the headers that are applicable
      for that distribution.
  3.  At the end of the CMakeList, print out messages to the developer
      indicating some of the values that resulted from cmake.
2016-12-21 18:22:02 -07:00
MrDave
0e0a2ca8f1 v4l2loopback cleanup
This commit cleans up some of the items for the v4l2loopback.
  Replace tabs with spaces
  Replace printf with MOTION_LOG
  Update guide to eliminate instructions for building old vloopback
  New v4l2 does not support the - option
2016-12-17 17:09:53 -07:00
MrDave
74b4223f6e v4l update
This update removes the components for v4l and implements only
the v4l2 and BSD option.  This commit also consolidates some
of the pre-processor directives and only uses the WITHOUT_V4L2
instead of the multiple.  The checks for the HAVE_LINUX_VIDEODEV2_H
were removed from the code because the WITHOUT_V4L2 is actually
set based upon the existance of the HAVE_LINUX_VIDEODEV2_H.
Finally, this renames some files to be more consistent.
2016-12-15 21:44:41 -07:00
MrDave
f01b81a8f8 Merge dpenkler/v4l2loop 2016-12-14 22:28:56 -07:00
MrDave
a500a80299 Merge motion-project/master 2016-12-14 22:12:37 -07:00
Mr-Dave
778199d13d Merge pull request #273 from slokhorst/track-videodev2
Fix track.c with V4L2
2016-12-13 17:18:23 -07:00
Mr-Dave
1f300016be Merge pull request #271 from slokhorst/bsd-fix
Fix OpenBSD and NetBSD compilation
2016-12-13 17:09:16 -07:00
MrDave
686b75a35f Eliminate pauses in movies during events
The PTS is based upon the actual time associated with the image
when we have the motion->no motion->motion situation, the second
motion is setting the time from that image and calculating the
duration from the initial start of the movie.  During this entire
sequence, there is a ffmpeg_output defined.  This commit resets the
starting time after there is a period of no motion.
2016-12-12 20:01:12 -07:00
MrDave
b590ba1d18 Add conv_greytoyuv420p to the header 2016-12-12 19:44:22 -07:00
Sebastiaan Lokhorst
92ea490df9 Fix track.c with V4L2 2016-12-12 20:14:06 +01:00
MrDave
d6fabf8d84 Merge lastest changes from upstream into branch 2016-12-11 21:53:26 -07:00
MrDave
66af42a2e5 Add support for greyscale v4l2
Add support for greyscale v4l2 devices and update some of the parameters
from the last change regarding pixel formats supported
2016-12-11 19:39:34 -07:00
Sebastiaan Lokhorst
29667fce7c Fix OpenBSD and NetBSD compilation 2016-12-12 02:14:20 +01:00
MrDave
b2dec836e8 Add mask_privacy option
This commit adds the functionality to completely mask out
user specified areas of the images via a pgm file.   The
masking is applied only to the y component of the image
From reviewing the resulting image, it does not appear that
it is necessary to apply the mask to the cr or cb components.
It may be desired to apply the mask to these components in the
future to have a true digital mask rather than just a visual
mask.  As indicated in the code comments, the resulting blocked
section appear as white in the images since this facilitates
quicker processing.
2016-12-11 16:16:20 -07:00