diff --git a/data/motion-dist.conf.in b/data/motion-dist.conf.in
index 86a67f8c..d95b391a 100644
--- a/data/motion-dist.conf.in
+++ b/data/motion-dist.conf.in
@@ -76,7 +76,7 @@ picture_filename %v-%Y%m%d%H%M%S-%q
;*************************************************
movie_output on
movie_max_time 120
-movie_quality 45
+movie_quality 60
movie_container mkv
movie_filename %v-%Y%m%d%H%M%S
@@ -84,13 +84,13 @@ movie_filename %v-%Y%m%d%H%M%S
;***** Web Control
;*************************************************
webcontrol_port 8080
-webcontrol_localhost off
+webcontrol_localhost on
webcontrol_parms 2
;*************************************************
;***** Web Stream
;*************************************************
-stream_preview_scale 25
+stream_preview_scale 100
stream_preview_method combined
;*************************************************
diff --git a/doc/motion_config.html b/doc/motion_config.html
index 82dbcc38..52e86954 100644
--- a/doc/motion_config.html
+++ b/doc/motion_config.html
@@ -1918,10 +1918,10 @@
despeckle_filter
- - Values: Combinations of E,e,D,d and l | Default: Not defined
+ - Values: Combinations of E,e,D,d and l | Default: EedDl
Despeckle the image using combinations of (E/e)rode or (D/d)ilate. And ending with optional (l)abeling.
This reduces noise in the motion image. Adding a trailing l enables labeling in which only the largest
- section section is used to calculate the threshold. Typical value is EedDl
+ section section is used to calculate the threshold.
@@ -1999,14 +1999,14 @@
pre_capture
- - Values: Integer | Default: 0
+ - Values: Integer | Default: 3
The number of pre-captured (buffered) frames to be captured before an event.
post_capture
- - Values: Integer | Default: 0
+ - Values: Integer | Default: 10
The number of frames to be captured after an event has ended.
@@ -2340,15 +2340,15 @@
webcontrol_port
- - Values: 0 to 65535 | Default: 0 (disabled)
- The port number for the web based control of Motion.
+ - Values: 0 to 65535 | Default: 8080
+ The port number for the web based interface of Motion.
- webcontrol_port
+ webcontrol_port2
- Values: 0 to 65535 | Default: 0 (disabled)
- Second port for the web control that does not use TLS. This allows for specifying one port that
+ Second port for the web interface that does not use TLS. This allows for specifying one port that
provides a TLS connection (to be used externally) while this port serves the local lan without getting
certificate domain warnings.
@@ -2377,7 +2377,7 @@
webcontrol_parms
- - Values: 0 - 3 | Default: 0
+ - Values: 0 - 3 | Default: 2
Set the type of parameters that can be accessed via the webcontrol page.
- 0: None - No configuration parameters or actions will be available.
@@ -2386,12 +2386,9 @@
typically require Motion to be restarted to become effective.
- 3: Restricted - User IDs, passwords and "on_" commands.
- The default for this parameter is 0 (none) to enhance the security of the web interface. The
- setting of the webcontrol_parms is not included on the web interface and this parameter
- can only be specified via the configuration file.
-
- Once Motion has been configured, it is advised to complete the setup by setting
- this value to zero.
+ webcontrol_parms is not shown or allowed to be revised from the web interface. This
+ allows users to lock out any changes to parameters. This may be desired if the
+ webcontrol port is opened to the internet.
@@ -2519,7 +2516,7 @@
stream_preview_scale
- - Values: Integer | Default: 25
+ - Values: Integer | Default: 100
The percentage to scale the stream image when it is placed on the webcontrol
page or into the combined image when the stream_preview_method is set to combined.
Numbers greater than 100 are permitted.
diff --git a/src/conf.cpp b/src/conf.cpp
index 79ca5706..e94bcbaa 100644
--- a/src/conf.cpp
+++ b/src/conf.cpp
@@ -1422,7 +1422,7 @@ void cls_config::edit_noise_tune(std::string &parm, enum PARM_ACT pact)
void cls_config::edit_despeckle_filter(std::string &parm, enum PARM_ACT pact)
{
if (pact == PARM_ACT_DFLT) {
- despeckle_filter = "";
+ despeckle_filter = "EedDl";
} else if (pact == PARM_ACT_SET) {
despeckle_filter = parm;
} else if (pact == PARM_ACT_GET) {
@@ -1594,7 +1594,7 @@ void cls_config::edit_pre_capture(std::string &parm, enum PARM_ACT pact)
{
int parm_in;
if (pact == PARM_ACT_DFLT) {
- pre_capture = 0;
+ pre_capture = 3;
} else if (pact == PARM_ACT_SET) {
parm_in = atoi(parm.c_str());
if ((parm_in < 0) || (parm_in > 1000)) {
@@ -1613,7 +1613,7 @@ void cls_config::edit_post_capture(std::string &parm, enum PARM_ACT pact)
{
int parm_in;
if (pact == PARM_ACT_DFLT) {
- post_capture = 0;
+ post_capture = 10;
} else if (pact == PARM_ACT_SET) {
parm_in = atoi(parm.c_str());
if ((parm_in < 0) || (parm_in > 2147483647)) {
@@ -2287,7 +2287,7 @@ void cls_config::edit_webcontrol_port(std::string &parm, enum PARM_ACT pact)
{
int parm_in;
if (pact == PARM_ACT_DFLT) {
- webcontrol_port = 0;
+ webcontrol_port = 8080;
} else if (pact == PARM_ACT_SET) {
parm_in = atoi(parm.c_str());
if ((parm_in < 0) || (parm_in > 65535)) {
@@ -2378,7 +2378,7 @@ void cls_config::edit_webcontrol_parms(std::string &parm, enum PARM_ACT pact)
{
int parm_in;
if (pact == PARM_ACT_DFLT) {
- webcontrol_parms = 0;
+ webcontrol_parms = 2;
} else if (pact == PARM_ACT_SET) {
parm_in = atoi(parm.c_str());
if ((parm_in < 0) || (parm_in > 3)) {
@@ -2589,7 +2589,7 @@ void cls_config::edit_stream_preview_scale(std::string &parm, enum PARM_ACT pact
{
int parm_in;
if (pact == PARM_ACT_DFLT) {
- stream_preview_scale = 25;
+ stream_preview_scale = 100;
} else if (pact == PARM_ACT_SET) {
parm_in = atoi(parm.c_str());
if ((parm_in < 1) || (parm_in > 1000)) {