Skip to content

Commit e2472c7

Browse files
committed
Update Documentation
1 parent 1ff5dd6 commit e2472c7

File tree

4 files changed

+246
-90
lines changed

4 files changed

+246
-90
lines changed

doc/CHANGELOG

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
Summary of changes for version 4.6.0 are below
2+
* Documentation updates
3+
* Fix segfault on vaapi decoding
4+
* Add support for DRM HW decode
5+
* Remove default for allowed_media_types
6+
* Fix libweb includes
7+
* Fix autotools and translation files
8+
* Update documentation on libcamerify
9+
* Fix movie_extpipe
10+
* Fix threshold_tune
11+
* Add pragma for mmal code
12+
* Update year in copyright notice
13+
* Revise issue template
14+
* Allow for bad packets when processing file
15+
* Implement consistent time values
16+
* Implement consistent calculation for pixel difference
17+
* Fix compiler warnings
18+
* Revise ioctl for devices to use long variable
19+
* Print log message of signals
120
Summary of changes for version 4.5.1 are below
221
* Improve closing of v4l2 devices
322
* Fix creation of pid_file

doc/motion_build.html

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ <h1>
6767
<button class="dropbtn">Distribution Specific Building</button>
6868
<div class="dropdown-content">
6969
<a href="#Preparation_For_Building"> Preparation For Building </a>
70-
<a href="#BUILD_DEBIAN">Debian/Ubuntu/Raspbian</a>
70+
<a href="#BUILD_DEBIAN">Debian/Ubuntu/Raspberry Pi OS</a>
7171
<a href="#BUILD_OPENSUSE">Open SUSE</a>
7272
<a href="#BUILD_FREEBSD">Free BSD</a>
7373
<a href="#BUILD_CENTOS">CentOS</a>
@@ -100,7 +100,7 @@ <h1>
100100
<h3><a name="Install_Apt"></a> Installing with apt </h3>
101101
<ul>
102102
<p></p>
103-
Motion is part of the Debian, Ubuntu and Raspbian repositories and can be installed with the apt tool. The
103+
Motion is part of the Debian, Ubuntu and Raspberry Pi OS repositories and can be installed with the apt tool. The
104104
version included with apt will be the version that was available when the distribution version
105105
was initially deployed and therefore may not represent the latest release.
106106
<p></p>
@@ -179,11 +179,11 @@ <h3><a name="Abbreviated_Building"></a> Abbreviated Building Guide </a> </h3>
179179
script. If errors occur during the process or you wish to customize the build, please
180180
review the extended building instructions further below.
181181
<p></p>
182-
Debian / Ubuntu / Raspbian Packages
182+
Debian / Ubuntu / Raspberry Pi OS Packages
183183
<ul>
184184
<code><strong>sudo apt-get install autoconf automake autopoint build-essential pkgconf libtool libzip-dev
185185
libjpeg-dev git libavformat-dev libavcodec-dev libavutil-dev libswscale-dev libavdevice-dev
186-
libwebp-dev gettext libmicrohttpd-dev</strong></code>
186+
libwebp-dev gettext libmicrohttpd-dev libcamera-tools libcamera-dev</strong></code>
187187
<p></p>
188188
<code><strong>cd ~</strong></code>
189189
<br /><code><strong>git clone https://github.com/Motion-Project/motion.git</strong></code>
@@ -247,13 +247,13 @@ <h3><a name="Preparation_For_Building"></a> Preparation For Building</a> </h3>
247247
<p></p>
248248
<p></p>
249249

250-
<h4><a name="BUILD_DEBIAN"></a>Debian/Ubuntu/Raspbian</a> </h4>
250+
<h4><a name="BUILD_DEBIAN"></a>Debian/Ubuntu/Raspberry Pi OS</a> </h4>
251251
<ul>
252252
<li>Required</li>
253253
<ul>
254254
<p></p>
255-
<code><strong>sudo apt-get install autoconf automake autopoint build-essential pkgconf
256-
libtool git libzip-dev libjpeg62-turbo-dev gettext libmicrohttpd-dev</strong></code>
255+
<code><strong>sudo apt-get install autoconf automake autopoint build-essential pkgconf libtool libzip-dev
256+
libjpeg-dev git gettext libmicrohttpd-dev </strong></code>
257257
<p></p>
258258
</ul>
259259
<p></p>
@@ -293,10 +293,10 @@ <h4><a name="BUILD_DEBIAN"></a>Debian/Ubuntu/Raspbian</a> </h4>
293293
<code><strong>sudo apt-get install libsqlite3-dev</strong></code>
294294
<p></p>
295295
</ul>
296-
<li>JPEG Turbo</li>
296+
<li>libcamera</li>
297297
<ul>
298298
<p></p>
299-
<code><strong>sudo apt-get install libjpeg-turbo8 libjpeg-turbo8-dev</strong></code>
299+
<code><strong>sudo apt-get install libcamera-tools libcamera-dev</strong></code>
300300
<p></p>
301301
</ul>
302302
<li>Webp Image Support</li>

doc/motion_config.html

Lines changed: 4 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -234,67 +234,18 @@ <h2><a name="Basic_Setup"></a> Basic Setup </h2>
234234
<p></p>
235235

236236
<a name="basic_setup_picam"></a>
237-
<strong>The raspberry Pi camera</strong> is set up multiple ways depending upon the distro being used.
238-
<p></p>
239-
In the Raspbian version based upon Debian release of 'bullseye' (and presumably later releases), Raspbian
240-
allows access to the PI camera via an application called
237+
<strong>The raspberry Pi camera</strong> is set up via an application called
241238
<i><small><code>libcamera</code></small></i>. <i><small><code>libcamera</code></small></i> provides
242239
access to the camera as a v4l2 device but this interface is only available when using a special
243240
application. Users must run Motion using the
244241
command <i><small><code>libcamerify motion</code></small></i> and
245242
then specify the /dev/videoX device in the Motion configuration file.
246243
<p></p>
247-
The PI camera's drivers expose the camera's full functionality as a set of low-level /dev/videoX
248-
devices, while Motion (and other applications) expect a single high-level /dev/videoX device. The
249-
libcamerify wrapper transparently manages these low-level devices and presents a high-level
250-
interface on one of the /dev/videoX device nodes to Motion
251-
(<a href="https://libcamera.org/docs.html#v4l2-compatibility-layer">libcamera docs</a>).
252-
<p></p>
253244
With just one camera connected to the Pi, the device name should normally be
254245
<i><small><code>/dev/video0</code></small></i>. With multiple cameras connected, e.g. a regular
255-
USB web and the Pi camera, you should use the device names provided by V4L
256-
(<i><small><code>v4l2-ctl --list-devices</code></small></i>). The wrapper doesn't seem to affect
257-
the device names seen by Motion. In the below example, the PI camera is at
258-
<i><small><code>/dev/video2</code></small></i> while an external USB camera is at
259-
<i><small><code>/dev/video0</code></small></i> ("CSI" stands for the
260-
<a href="https://en.wikipedia.org/wiki/Camera_Serial_Interface">interface used by the Pi camera</a>).
261-
<p></p>
262-
Also, /dev/videoN names are dynamically assigned and may not always point to the same camera (e.g.
263-
when a USB camera is hot-plugged). Take a look at the stable symlinks under
264-
<i><small><code>/dev/v4l/by-path/</code></small></i> and consider using them in your Motion config
265-
instead of /dev/videoX.
266-
<pre>
267-
root@raspberrypi:~# v4l2-ctl --list-devices
268-
unicam (platform:3f801000.csi):
269-
/dev/video2 # <== PI Camera
270-
/dev/media2
271-
272-
bcm2835-codec-decode (platform:bcm2835-codec):
273-
/dev/video10 # <=== Low level devices
274-
/dev/video11 # for the Pi cam, ignore
275-
....
276-
277-
bcm2835-isp (platform:bcm2835-isp):
278-
/dev/video13 # <=== Low level devices
279-
/dev/video14 # for the Pi cam, ignore
280-
....
281-
282-
Venus USB2.0 Camera: Venus USB2 (usb-3f980000.usb-1.2):
283-
/dev/video0 # <== USB webcam
284-
/dev/video1
285-
/dev/media4
286-
</pre>
287-
<p></p>
288-
For Raspbian releases prior to 'bullseye', the PI camera can be set up two different ways. If Motion is installed by using the
289-
apt packages (e.g. apt-get install motion), then the camera must be set up using the bcm2835-v4l2 module which creates
290-
a v4l2 device for the camera. Users will need to install this module using the
291-
command <code>sudo modprobe bcm2835-v4l2</code>. This
292-
will set up the camera as a normal v4l2 device and it can be accessed via a standard /dev/videoX device. If Motion is
293-
built from source or installed via the deb packages on the project release page, then an additional option is to set
294-
up the camera using the <a href="#mmalcam_name" >mmalcam_name</a> parameter or using
295-
the bcm2835-v4l2 module. <strong>When Motion is installed via apt, the mmalcam option is not available.</strong>
296-
It has been noted that this historical method of accessing the PI camera may be available in newer
297-
releases via the enabling the legacy camera stack but it is unclear how long this method will be permitted.
246+
USB web and the Pi camera, you will need to determine the device associated with the
247+
Pi camera and the USB camera. The list of devices can be seen using the command
248+
(<i><small><code>v4l2-ctl --list-devices</code></small></i>).
298249
<p></p>
299250

300251
<a name="basic_setup_composite"></a>

0 commit comments

Comments
 (0)