Commit Graph

1079 Commits

Author SHA1 Message Date
telemaxx
29ea11e629 Update webhttpd.c (#484)
Just adding a newline to get a nicer looking html.
<BODY> was in the same line as the meta line.
2017-09-10 20:00:02 -06:00
Mr-DaveDev
0e7566360f Additional Travis Tests (#499)
* Additional Travis Testing

This commit includes the following revisions to the testing.
1.  Add a output from the configure script to indicate version of libavformat.
2.  Add test_builds.sh script which includes tests for following with/without options.
    --with-developer-flags, --without-ffmpeg, --without-mysql, --without-pgsql
    --without-v4l2, --without-mysqlite3
3.  Add testing via docker for 16.04 and 17.04
2017-09-10 09:19:06 -06:00
Mr-DaveDev
eeecf611f7 Resolve Developer Warnings (#497)
1.  Revise the developer warnings to treat all warnings as errors
2.  Revise a few of the comparisons of signed to unsigned.
3.  Isolate the setjmp to separate function since it is warning on 14.04
4.  Remove redundant clang OSX test since gcc is really clang according to travis logs
2017-09-08 18:18:20 -06:00
Mr-Dave
b2faa694e4 Merge pull request #488 from Mr-DaveDev/travis-update
Travis Update
2017-09-04 10:05:12 -06:00
Mr-Dave
5a03718a4b Merge pull request #485 from ferdinandkeil/master
Documentation update for building on CentOS 7
2017-09-03 14:35:47 -06:00
MrDave
df35d2b7ef Travis Update
This commit updates the travis testing for the following:

1.  Adds Mac OS X testing for gcc and clang
2.  Removes the testing on precise
3.  Adds the developer flags to the configure
4.  For trusty, tests both the default ffmpeg libraries from apt as well as those in the ppa.
2017-09-02 14:30:29 -06:00
Ferdinand Keil
329f99515c switched to rpmfusion.org's RPM repository for ffmpeg 2017-09-02 18:48:31 +02:00
Ferdinand Keil
cd815a52e7 added list of packages for CentOS 7 to motion_guide.html 2017-09-01 20:05:57 +02:00
Mr-Dave
9f4f0e99dc Merge pull request #468 from genius3000/master+web_cam_count
Cosmetic fixes to the Web Control
2017-08-30 19:57:31 -06:00
Mr-Dave
8e1d23a3a5 Merge pull request #482 from Mr-DaveDev/buff-overflow
Reset stream port when unable to open.  Closes #450
2017-08-30 18:45:51 -06:00
Mr-Dave
89e28577fb Merge pull request #481 from Mr-DaveDev/netcam-null-ref
Netcam Boundary Fix.  Closes #389
2017-08-30 18:44:34 -06:00
Mr-Dave
527d0532f9 Merge pull request #480 from Mr-DaveDev/cmake
Remove CMake
closes #460 
closes #458 
closes #444 
closes #229
2017-08-30 17:40:25 -06:00
Mr-Dave
ecada777ae Merge pull request #479 from Mr-DaveDev/config
Autotool Update  Closes #351
2017-08-29 22:12:55 -06:00
MrDave
29a88f31e9 Reset stream port when unable to open 2017-08-28 19:11:56 -06:00
MrDave
36ae6e8a82 Netcam Boundary
If the boundary is not found for http streaming netcams in the header
report and return error code.
2017-08-28 17:49:24 -06:00
MrDave
b48084dac3 Force mmal_vc_client linking 2017-08-28 12:08:15 -06:00
MrDave
b2b198cb03 Remove CMake 2017-08-28 09:49:31 -06:00
MrDave
3b7164f7f9 Autotool Update
1.  Revised the MYSQL/PGSQL to search directories
2.  Revised the MYSQL/PGSQL to use the package config files if available.
3.  Revised the CPU options to honor the --without-optimizecpu option.
4.  Revised the include for MYSQL/PGSQL to conform with search and package results.
2017-08-27 14:42:03 -06:00
Mr-Dave
d23e263490 Merge pull request #462 from tosiara/always-create-subdirs-temp
Fix for file names that contain "/" and non existing subdirs
2017-08-27 10:40:24 -06:00
Mr-Dave
e04f020256 Merge pull request #475 from inodlite/mmal-configure
Allow configuration of include and lib paths for MMAL.
2017-08-26 17:02:28 -06:00
Mr-Dave
ed8ab5e3b6 Merge pull request #443 from tosiara/libjpeg-dev
Missing libjpeg-dev is fatal configure error.  Closes #424
2017-08-26 15:52:34 -06:00
Mr-Dave
e128ddf7c0 Merge pull request #446 from genius3000/master+config_write
Fixes for Config writing issues closes #307
2017-08-26 15:38:35 -06:00
inodlite
e6920fbbe8 Allow configuration of include and lib path for MMAL. 2017-08-19 12:26:32 -07:00
tosiara
544ae4489c Made the fix permanent as it is valid 2017-08-18 14:10:55 +00:00
genius3000
d219d1c7a3 Add backwards compatibility to deprecated options.
Allow setting a 'conf_value' and 'copy_func' to the deprecated option.
This way some backwards compatibility can be obtained by simply
setting the new option to the wanted value. The deprecated option
will not exist within the config structure, so it won't be able
to accidently print out in a config write.
2017-08-17 14:25:18 -06:00
genius3000
5973233460 Add a deprecated options array
With the config system, maintaining backwards-compatability
can be quite difficult. Especially with things like the Web
control config-write ability.
Furthermore, most config options are either totally removed
or succeeded by a different set of options. This does not require
any backwards-compatability.

The `dep_config_params` array is checked when a config option
is unknown to the current system (`config_params`).
If the option is found, a warning is logged for the user to see.
We tell them the last version it was used and why it changed.
2017-08-17 14:25:07 -06:00
genius3000
7f8410e544 Prevent preview duplicate if mis-configured
When running multiple cameras or a single camera with the
config `camera` lines, motion creates a thread for each
camera (even if just the one).
A mis-configuration can easily happen where the `stream_port`
option remains set in `motion.conf`. This causes the Web control
preview section to show a duplicate of one stream.
Prevent this by knowing that if we are multi-threaded,
the main thread has no active camera and don't loop over it.
2017-08-17 00:22:37 -06:00
genius3000
768a1d9cc8 Show proper camera count on web-control
The camera count was using the thread count, which is wrong
if we have more than one thread (in most cases).
2017-08-17 00:22:37 -06:00
genius3000
5afafcb09f Flag files loaded by camera_dir
Add an (int) flag to the context structure to flag config files
loaded by `camera_dir`. We do this to skip writing them out
as separate `camera` lines.
Also fixed the printing of a blank line to the config when
printing out the default disabled `camera` line.
2017-08-16 23:55:14 -06:00
genius3000
da556d7ef0 Properly store the value of camera_dir from the config
Previously the directory was being used for the camera files but not
being stored and therefore a Web Control config write would override
the `camera_dir` line with the default value.
Also changed the incorrect function name in the comment.
2017-08-16 23:55:14 -06:00
genius3000
3af03ad642 Improvements to the camera_dir config option
- The `camera_dir` option was always being set to a default path
which was missing a 'motion/' compared to the installed config
file default. This caused it to always check that folder and
upon a Web config-write, to always write out as enabled.
We now set it NULL like most other options and read the config
value into it, if enabled.
- Upon a Web config-write if the option is disabled, we now write
out the installed default path with it (remaining disabled).
- Improved the guide and config help to be more clear of how the
option works.
2017-08-16 23:55:14 -06:00
genius3000
6f881cf420 Code comment improvements and fixes
Fixed a few typos.
Changed the use of 'thread' in regards to config files to 'camera'.
Added missing function comments.
2017-08-16 23:55:14 -06:00
genius3000
6b1e626a25 Add a timestamp to the config write header 2017-08-16 23:33:03 -06:00
tosiara
434359bae8 Whitespace fix 2017-08-08 17:43:34 +03:00
tosiara
bc2f9644e6 Temporary solution for file names that contain "/" and non existing subdirs
See https://github.com/Motion-Project/motion/issues/360#issuecomment-320937660
2017-08-08 15:33:20 +03:00
Joseph Heenan
6e08e951f8 Merge pull request #455 from Mr-DaveDev/v4l2-jpg
Rewrite jpegutils.c
2017-08-07 10:42:02 +01:00
MrDave
d1e5a8f91b jpegutils small fixes 2017-08-06 18:29:47 -06:00
MrDave
2539f76165 Add Documentation
Add some documentation to jpegutils.c
2017-08-06 15:29:40 -06:00
MrDave
563a688777 jpegutils.c Error Messages
Filter out the extra error messages from jpeg libary
2017-08-05 19:02:04 -06:00
MrDave
eaaf8b47d9 Rewrite jpegutils.c
The previous version of jpegutils.c was performing the downsampling of images manually
This commit rewrites the decompression to take advantage of the built in downsampling
and image color space conversion that is part of the JPEG libaries.

This function is currently only called from the vid_mjpegtoyuv420p routine.
2017-08-05 17:50:50 -06:00
Mr-Dave
ab9e800d59 Merge pull request #441 from jasaw/fix-pts-int64-logging
Motion Log change for printing PTS/DTS on 32 bit platforms.
2017-08-02 21:56:04 -06:00
Joseph Heenan
714c9a023f Merge pull request #449 from jasaw/fix-close-all-fds
fix close all fds off by one error
2017-08-02 11:18:46 +01:00
Joseph Heenan
8217b03f06 Merge pull request #447 from telemaxx/patch-1
On mobiles text inside the WEB UI is to small.
2017-08-02 11:14:49 +01:00
telemaxx
3644646fb6 On mobiles text inside the WEB UI is to small.
using "viewport" to solve that.
#381
#437
2017-08-01 19:43:35 +02:00
Joo Aun Saw
d11c9006ec fix close all fds off by one error 2017-08-01 13:12:49 +10:00
tosiara
34a3fbd2c7 Made missing libjpeg-dev fatal configure error 2017-07-31 14:40:30 +03:00
Joo Aun Saw
8c996d1561 fix logging of int64 PTS values 2017-07-31 11:42:15 +10:00
tosiara
e9e0a2d292 Extpipe path write access check refactor (#417)
* Change how the path access is verified. Instead of creating a dummy file use access() function

* Extpipe path check improvement

* Minor extpipe event path check code optimization
2017-07-30 18:43:29 -06:00
tosiara
910412f175 Changed MOTION_LOG macro (#428)
* Changed MOTION_LOG macro and remover "%s:" from the format string
Function name will be now auto added

* Re-applied log-update after conflict resolution

* Some old style logging still remaining, updated
2017-07-30 17:07:40 -06:00
Joseph Heenan
f300d39442 Merge pull request #439 from tosiara/automake-fix
Replaced "AC_LINK_IFELSE" with "AC_COMPILE_IFELSE"
2017-07-30 14:05:49 +01:00