mirror/motion
1
0
Fork 0
mirror of https://github.com/Motion-Project/motion.git synced 2026-02-04 12:01:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update to guide for mjpeg passthrough

Browse Source 
Closes #773
This commit is contained in:
Mr-DaveDev
2018-10-20 17:02:51 -06:00
committed by Mr-Dave
parent dddfe9c9c1
commit 0afea9cc4e
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
motion_config.html
View File

@@ -2992,19 +2992,22 @@
<li> Default: Not defined</li>
</ul>
<p></p>
The network camera high resolution URL. This option can be used in conjunction with the netcam_url for rtsp/rtmp cameras.
Users may specify the normal resolution url in the netcam_url which will be used for the motion detection and then
specify the high resolution url for this parameter. Motion detection on the normal resolution will trigger the saving
of images from the high resolution stream. Note that the ONLY overlay that will be present on the resulting high
resolution pictures and movies is the privacy mask. The other overlays such as date/time, motion boxes, camera
name, etc will not be included. Users wishing to see those overlays on the resulting images and movies will need to
specify the high resolution url as the netcam_url and not use this option.
The network camera high resolution URL. This option can be used in conjunction with the netcam_url for
rtsp/rtmp/mjpeg cameras. Users may specify the normal resolution url in the netcam_url which will be used for
the motion detection and then specify the high resolution url for this parameter. For mjpeg cameras,
the url must use the <code>mjpeg</code> prefix and not <code>http</code>.
<br>
Motion detection on the normal resolution will trigger the saving of images from the high resolution stream.
Note that the ONLY overlay that will be present on the resulting high resolution pictures and movies is the
privacy mask. The other overlays such as date/time, motion boxes, camera name, etc will not be
included. Users wishing to see those overlays on the resulting images and movies will need to specify the
high resolution url as the netcam_url and not use this option.
<p></p>
If the netcam_url is not specified, this option is ignored.
<p></p>
When this option is used with the <a href="#movie_passthrough">movie_passthrough</a> even less processing occurs. Since
the <a href="#movie_passthrough">movie_passthrough</a> bypasses decoding the stream, images will be saved only as normal
resolution and the privacy mask will not be overlaid on to the high resolution images.
When this option is used with the <a href="#movie_passthrough">movie_passthrough</a> even less processing occurs.
Since the <a href="#movie_passthrough">movie_passthrough</a> bypasses decoding the stream, images will be saved
only as normal resolution and the privacy mask will not be overlaid on to the high resolution images.
<p></p>
<h3><a name="netcam_userpass"></a> netcam_userpass </h3>
@@ -4413,8 +4416,9 @@
<li> Default: off</li>
</ul>
<p></p>
When using a RTSP or RTMP camera, create movie files of the motion with the packets obtained directly from
the camera.
When using a RTSP, RTMP or mjpeg camera, create movie files of the motion with the packets obtained directly
from the camera. For mjpeg cameras, the url must be specified using the <code>mjpeg</code> prefix rather than
as <code>http</code>
<p></p>
When using only the single <a href="#netcam_url">netcam_url</a> this option will reduce the processing
required when encoding the images to the resulting movie file. Decoding of the image will still occur on the