From 2f72dd39f3dcab0ffbfe75dbf99b790950d21ec4 Mon Sep 17 00:00:00 2001 From: Mr-Dave Date: Wed, 24 Apr 2024 14:52:12 -0600 Subject: [PATCH] Scale each image size in combined image stream --- data/motionplus-dist.conf.in | 2 +- doc/motionplus_config.html | 67 ++++++++- src/motion_loop.cpp | 4 + src/motionplus.cpp | 17 ++- src/motionplus.hpp | 11 ++ src/webu_stream.cpp | 255 ++++++++++++++++++++++++++++++----- 6 files changed, 319 insertions(+), 37 deletions(-) diff --git a/data/motionplus-dist.conf.in b/data/motionplus-dist.conf.in index 38ff0bae..bfec00f6 100644 --- a/data/motionplus-dist.conf.in +++ b/data/motionplus-dist.conf.in @@ -92,7 +92,7 @@ webcontrol_parms 0 ;***** Web Stream ;************************************************* stream_preview_scale 25 -stream_preview_method mjpg +stream_preview_method combined ;************************************************* ; Device config files - One for each device. diff --git a/doc/motionplus_config.html b/doc/motionplus_config.html index d17c4053..dfb02d6c 100644 --- a/doc/motionplus_config.html +++ b/doc/motionplus_config.html @@ -2152,7 +2152,8 @@

@@ -2160,21 +2161,81 @@

stream_preview_location