Skip to content

Commit 0afea9c

Browse files
Mr-DaveDevMr-Dave
authored andcommitted
Update to guide for mjpeg passthrough
Closes #773
1 parent dddfe9c commit 0afea9c

1 file changed

Lines changed: 16 additions & 12 deletions

File tree

motion_config.html

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2992,19 +2992,22 @@ <h3><a name="netcam_highres"></a> netcam_highres </h3>
29922992
<li> Default: Not defined</li>
29932993
</ul>
29942994
<p></p>
2995-
The network camera high resolution URL. This option can be used in conjunction with the netcam_url for rtsp/rtmp cameras.
2996-
Users may specify the normal resolution url in the netcam_url which will be used for the motion detection and then
2997-
specify the high resolution url for this parameter. Motion detection on the normal resolution will trigger the saving
2998-
of images from the high resolution stream. Note that the ONLY overlay that will be present on the resulting high
2999-
resolution pictures and movies is the privacy mask. The other overlays such as date/time, motion boxes, camera
3000-
name, etc will not be included. Users wishing to see those overlays on the resulting images and movies will need to
3001-
specify the high resolution url as the netcam_url and not use this option.
2995+
The network camera high resolution URL. This option can be used in conjunction with the netcam_url for
2996+
rtsp/rtmp/mjpeg cameras. Users may specify the normal resolution url in the netcam_url which will be used for
2997+
the motion detection and then specify the high resolution url for this parameter. For mjpeg cameras,
2998+
the url must use the <code>mjpeg</code> prefix and not <code>http</code>.
2999+
<br>
3000+
Motion detection on the normal resolution will trigger the saving of images from the high resolution stream.
3001+
Note that the ONLY overlay that will be present on the resulting high resolution pictures and movies is the
3002+
privacy mask. The other overlays such as date/time, motion boxes, camera name, etc will not be
3003+
included. Users wishing to see those overlays on the resulting images and movies will need to specify the
3004+
high resolution url as the netcam_url and not use this option.
30023005
<p></p>
30033006
If the netcam_url is not specified, this option is ignored.
30043007
<p></p>
3005-
When this option is used with the <a href="#movie_passthrough">movie_passthrough</a> even less processing occurs. Since
3006-
the <a href="#movie_passthrough">movie_passthrough</a> bypasses decoding the stream, images will be saved only as normal
3007-
resolution and the privacy mask will not be overlaid on to the high resolution images.
3008+
When this option is used with the <a href="#movie_passthrough">movie_passthrough</a> even less processing occurs.
3009+
Since the <a href="#movie_passthrough">movie_passthrough</a> bypasses decoding the stream, images will be saved
3010+
only as normal resolution and the privacy mask will not be overlaid on to the high resolution images.
30083011
<p></p>
30093012

30103013
<h3><a name="netcam_userpass"></a> netcam_userpass </h3>
@@ -4413,8 +4416,9 @@ <h3><a name="movie_passthrough"></a> movie_passthrough </h3>
44134416
<li> Default: off</li>
44144417
</ul>
44154418
<p></p>
4416-
When using a RTSP or RTMP camera, create movie files of the motion with the packets obtained directly from
4417-
the camera.
4419+
When using a RTSP, RTMP or mjpeg camera, create movie files of the motion with the packets obtained directly
4420+
from the camera. For mjpeg cameras, the url must be specified using the <code>mjpeg</code> prefix rather than
4421+
as <code>http</code>
44184422
<p></p>
44194423
When using only the single <a href="#netcam_url">netcam_url</a> this option will reduce the processing
44204424
required when encoding the images to the resulting movie file. Decoding of the image will still occur on the

0 commit comments

Comments
 (0)