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

ffmpeg 3.1 fix, v4l2 via netcam

Browse Source 
Resolve crash when decode returned invalid results
Catch interupts on opening netcam
Eliminate option to use h264 with videodevice
Revise configure for pthread
Revise config file to point to guide
This commit is contained in:
MrDave
2017-03-11 11:39:16 -07:00
parent d121a93019
commit 845b39b914
6 changed files with 268 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
conf.c
View File

@@ -261,34 +261,7 @@ config_param config_params[] = {
{
"v4l2_palette",
"# v4l2_palette allows one to choose preferable palette to be use by motion\n"
"# to capture from those supported by your videodevice. (default: 17)\n"
"# E.g. if your videodevice supports both V4L2_PIX_FMT_SBGGR8 and\n"
"# V4L2_PIX_FMT_MJPEG then motion will by default use V4L2_PIX_FMT_MJPEG.\n"
"# Setting v4l2_palette to 2 forces motion to use V4L2_PIX_FMT_SBGGR8\n"
"# instead.\n"
"#\n"
"# Values :\n"
"# V4L2_PIX_FMT_SN9C10X : 0 'S910'\n"
"# V4L2_PIX_FMT_SBGGR16 : 1 'BYR2'\n"
"# V4L2_PIX_FMT_SBGGR8 : 2 'BA81'\n"
"# V4L2_PIX_FMT_SPCA561 : 3 'S561'\n"
"# V4L2_PIX_FMT_SGBRG8 : 4 'GBRG'\n"
"# V4L2_PIX_FMT_SGRBG8 : 5 'GRBG'\n"
"# V4L2_PIX_FMT_PAC207 : 6 'P207'\n"
"# V4L2_PIX_FMT_PJPG : 7 'PJPG'\n"
"# V4L2_PIX_FMT_MJPEG : 8 'MJPEG'\n"
"# V4L2_PIX_FMT_JPEG : 9 'JPEG'\n"
"# V4L2_PIX_FMT_RGB24 : 10 'RGB3'\n"
"# V4L2_PIX_FMT_SPCA501 : 11 'S501'\n"
"# V4L2_PIX_FMT_SPCA505 : 12 'S505'\n"
"# V4L2_PIX_FMT_SPCA508 : 13 'S508'\n"
"# V4L2_PIX_FMT_UYVY : 14 'UYVY'\n"
"# V4L2_PIX_FMT_YUYV : 15 'YUYV'\n"
"# V4L2_PIX_FMT_YUV422P : 16 '422P'\n"
"# V4L2_PIX_FMT_YUV420 : 17 'YU12'\n"
"# V4L2_PIX_FMT_Y10 : 18 'Y10'\n"
"# V4L2_PIX_FMT_Y12 : 19 'Y12'\n"
"# V4L2_PIX_FMT_GREY : 20 'GREY'\n"
"# See motion_guide.html for the valid options and values. (default: 17)\n"
"#",
0,
CONF_OFFSET(v4l2_palette),

32
motion-dist.conf.in
View File

@@ -1,7 +1,7 @@
# Rename this distribution example file to motion.conf
#
# This config file was generated by @PACKAGE_NAME@ @PACKAGE_VERSION@
# Documentation: @prefix@/share/doc/motion/motion_guide.html
############################################################
# Daemon
@@ -39,35 +39,7 @@ log_type all
videodevice /dev/video0
# v4l2_palette allows one to choose preferable palette to be use by motion
# to capture from those supported by your videodevice. (default: 17)
# E.g. if your videodevice supports both V4L2_PIX_FMT_SBGGR8 and
# V4L2_PIX_FMT_MJPEG then motion will by default use V4L2_PIX_FMT_MJPEG.
# Setting v4l2_palette to 2 forces motion to use V4L2_PIX_FMT_SBGGR8
# instead.
#
# Values :
# V4L2_PIX_FMT_SN9C10X : 0 'S910'
# V4L2_PIX_FMT_SBGGR16 : 1 'BYR2'
# V4L2_PIX_FMT_SBGGR8 : 2 'BA81'
# V4L2_PIX_FMT_SPCA561 : 3 'S561'
# V4L2_PIX_FMT_SGBRG8 : 4 'GBRG'
# V4L2_PIX_FMT_SGRBG8 : 5 'GRBG'
# V4L2_PIX_FMT_PAC207 : 6 'P207'
# V4L2_PIX_FMT_PJPG : 7 'PJPG'
# V4L2_PIX_FMT_MJPEG : 8 'MJPEG'
# V4L2_PIX_FMT_JPEG : 9 'JPEG'
# V4L2_PIX_FMT_RGB24 : 10 'RGB3'
# V4L2_PIX_FMT_SPCA501 : 11 'S501'
# V4L2_PIX_FMT_SPCA505 : 12 'S505'
# V4L2_PIX_FMT_SPCA508 : 13 'S508'
# V4L2_PIX_FMT_UYVY : 14 'UYVY'
# V4L2_PIX_FMT_YUYV : 15 'YUYV'
# V4L2_PIX_FMT_YUV422P : 16 '422P'
# V4L2_PIX_FMT_YUV420 : 17 'YU12'
# V4L2_PIX_FMT_Y10 : 18 'Y10'
# V4L2_PIX_FMT_Y12 : 19 'Y12'
# V4L2_PIX_FMT_GREY : 20 'GREY'
#
# See motion_guide.html for the valid options and values. (default: 17)
v4l2_palette 17
# Tuner device to be used for capturing using tuner as source (default /dev/tuner0)

342
motion_guide.html
View File

@@ -4,7 +4,7 @@
<ul>
<li> <a href="#Motion_Overview"> Overview </a> </li>
<li> <a href="#Install_Build"> Installing with apt / Building from source </a></li>
<li> <a href="#Install_Build"> Installing with apt / debs / building from source </a></li>
<li> <a href="#Important_Definitions"> Important Definitions </a></li>
<li> <a href="#The_Config_Files"> The Configuration Files </a></li>
<li> <a href="#Command_Line_Options"> Command Line Options </a></li>
@@ -171,11 +171,12 @@ and <a href="https://github.com/Motion-Project/motion/issues">Issues</a> for kno
</ul>
<h2><a name="Install_Build"></a> Installing with apt / Building from source </h2>
<h2><a name="Install_Build"></a> Installing with apt / debs / building from source </h2>
<ul>
<p></p>
<ul>
<li> <a href="#Install_Apt"> Installing with apt</a></li>
<li> <a href="#Install_Deb"> Installing with a release deb package</a></li>
<li> <a href="#Abbreviated_Building"> Abbreviated Building Guide</a></li>
<li> <a href="#Preparation_For_Building"> Preparation For Building </a></li>
<li> <a href="#Configure_Script"> Configure Script </a></li>
@@ -196,41 +197,31 @@ Motion is part of the Ubuntu and Debian repositories and can be installed with t
<p></p>
Open up a terminal window and type: <code><strong>sudo apt-get install motion</strong></code>
<p></p>
Motion can also be installed from the release deb files. First, get the link to the deb file
for the distribution and platform from the <a href="https://github.com/Motion-Project/motion/releases">Releases</a>
page.
</ul>
<h3><a name="Install_Deb"></a> Installing with a release deb package </h3>
<ul>
Motion can also be installed from the release deb files.
<p></p>
Open up a terminal window and type:
Determine the deb file name that is appropriate for the distribution and platform from
the <a href="https://github.com/Motion-Project/motion/releases">Releases</a> page
and open up a terminal window and type:
<p></p>
<ul>
<code><strong>wget https://github.com/Motion-Project/motion/releases/{deb package name} </strong></code>
Next, there are multiple options to install a deb package, the below is one option
and uses the gdebi tool.
</ul>
<p></p>
Next, install the retrieved deb package. Below is a sample method to install that
uses the gdebi tool.
<p></p>
<ul>
<code><strong>sudo apt-get install gdebi-core</strong></code>
<p></p>
<code><strong>sudo gdebi {deb package name}</strong></code>
<p></p>
Before we start configuring Motion, we will copy the config file to our Home folder so that the master copy
won't be affected. Open a terminal and copy the configuration file to your Home folder with following commands:
<p></p>
<code><strong>mkdir .motion</strong></code>
<p></p>
(Note: This will create a hidden folder <em>.motion</em> in your Home directory.)
<p></p>
<code><strong>cp /etc/motion/motion-dist.conf ~/.motion/motion.conf</strong></code>
<p></p>
(Note: This command will copy the original motion configuration file to its location.)
<p></p>
Now can open the configuration file for editing:
<p></p>
<code><strong>sudo nano ~/.motion/motion.conf</strong></code>
<p></p>
After you you have made all the appropriate adjustments to the configuration file, close it.
Then start motion in the terminal simply by typing:
<p></p>
<code><strong>motion</strong></code>
<p></p>
</ul>
<p></p>
</ul>
<h3><a name="Abbreviated_Building"></a> Abbreviated Building Guide </a> </h3>
<ul>
@@ -241,7 +232,7 @@ script for Ubuntu. If errors occur during the process or you wish to customize
review the extended building instructions further below.
<p></p>
<code><strong>sudo apt-get install autoconf automake build-essential pkgconf libtool libzip-dev
libjpeg62 libjpeg62-dev git libavformat-dev libavcodec-dev libavutil-dev libswscale-dev </strong></code>
libjpeg62 libjpeg62-dev git libavformat-dev libavcodec-dev libavutil-dev libswscale-dev libavdevice-dev </strong></code>
<p></p>
<code><strong>cd ~</strong></code>
<br><code><strong>git clone https://github.com/Motion-Project/motion.git</strong></code>
@@ -286,7 +277,7 @@ Ubuntu / Debian Packages
<li>FFMpeg Functionality(Required for creating movies, using network cameras, etc. See note below!)</li>
<ul>
<p></p>
<code><strong>sudo apt-get install libavformat-dev libavcodec-dev libavutil-dev libswscale-dev</strong></code>
<code><strong>sudo apt-get install libavformat-dev libavcodec-dev libavutil-dev libswscale-dev libavdevice-dev</strong></code>
<p></p>
</ul>
<li>MySQL database functionality</li>
@@ -807,8 +798,6 @@ A few important definitions.
</ul>
<h2><a name="The_Config_Files"></a> The Configuration Files </h2>
<ul>
<p></p>
If Motion was invoked with command line option <code>-c pathname</code> Motion will expect the config file to be as specified. When you specify the config file on the command line with -c you can call it anything.
<p></p>
@@ -2590,45 +2579,161 @@ either this alternative method or for a normal network camera, the videodevice o
<p></p>
<ul>
<li> Type: String</li>
<li> Range / Valid values: Max 4095 characters</li>
<li> Range / Valid values: 0 - 21</li>
<li> Default: </li>
</ul>
<p></p>
The v4l2_palette allows the user to choose preferable palette to be use by Motion. Note that this
is only the preferred option. If the video device does not support the requested format, Motion will
loop through the available palettes to try to find one that is supported by both Motion and the device.
The v4l2_palette allows the user to choose preferable palette to be use by Motion. This
is only the <u>preferred</u> option. If the video device does not support this preferred format,
Motion will loop through the available palettes to try to find one that is supported by both Motion
and the device.
Motion will report the supported palettes of the device when Motion starts when the log_level
is specified as NTC or higher. The default of 17 is highly preferred since this the native
is specified as NTC or higher.
<p></p>
The default of 17 is highly preferred over <u>all</u> other formats since this the native
format that Motion uses internally.
<p></p>
The following are each of the palette options. For the Motion configuration,
specify the numeric value as the Motion option.
<p></p>
<table border="1" class="fixed" >
<colgroup>
<col width="250px">
<col width="200px">
<col width="200px">
</colgroup>
<tbody>
<tr>
<td bgcolor="#edf4f9" align="center" > V4l2 Option</td>
<td bgcolor="#edf4f9" align="center" > FOURCC</td>
<td bgcolor="#edf4f9" align="center" > v4l2_palette option </td>
</tr>
<tr>
<td bgcolor="#edf4f9" align="left" >V4L2_PIX_FMT_SN9C10X</td>
<td bgcolor="#edf4f9" align="center" >S910</td>
<td bgcolor="#edf4f9" align="center" >0</td>
</tr>
<tr>
<td bgcolor="#edf4f9" align="left" >V4L2_PIX_FMT_SBGGR16</td>
<td bgcolor="#edf4f9" align="center" >BYR2</td>
<td bgcolor="#edf4f9" align="center" >1</td>
</tr>
<tr>
<td bgcolor="#edf4f9" align="left" >V4L2_PIX_FMT_SBGGR8</td>
<td bgcolor="#edf4f9" align="center" >BA81</td>
<td bgcolor="#edf4f9" align="center" >2</td>
</tr>
<tr>
<td bgcolor="#edf4f9" align="left" >V4L2_PIX_FMT_SPCA561</td>
<td bgcolor="#edf4f9" align="center" >S561</td>
<td bgcolor="#edf4f9" align="center" >3</td>
</tr>
<tr>
<td bgcolor="#edf4f9" align="left" >V4L2_PIX_FMT_SGBRG8</td>
<td bgcolor="#edf4f9" align="center" >GBRG</td>
<td bgcolor="#edf4f9" align="center" >4</td>
</tr>
<tr>
<td bgcolor="#edf4f9" align="left" >V4L2_PIX_FMT_SGRBG8</td>
<td bgcolor="#edf4f9" align="center" >GRBG</td>
<td bgcolor="#edf4f9" align="center" >5</td>
</tr>
<tr>
<td bgcolor="#edf4f9" align="left" >V4L2_PIX_FMT_PAC207</td>
<td bgcolor="#edf4f9" align="center" >P207</td>
<td bgcolor="#edf4f9" align="center" >6</td>
</tr>
<tr>
<td bgcolor="#edf4f9" align="left" > V4L2_PIX_FMT_PJPG</td>
<td bgcolor="#edf4f9" align="center" >PJPG</li>
<td bgcolor="#edf4f9" align="center" >7</td>
</tr>
<tr>
<td bgcolor="#edf4f9" align="left" > V4L2_PIX_FMT_MJPEG</td>
<td bgcolor="#edf4f9" align="center" >MJPG</li>
<td bgcolor="#edf4f9" align="center" >8</td>
</tr>
<tr>
<td bgcolor="#edf4f9" align="left" > V4L2_PIX_FMT_JPEG</td>
<td bgcolor="#edf4f9" align="center" >JPEG</li>
<td bgcolor="#edf4f9" align="center" >9</td>
</tr>
<tr>
<td bgcolor="#edf4f9" align="left" > V4L2_PIX_FMT_RGB24</td>
<td bgcolor="#edf4f9" align="center" >RGB3</li>
<td bgcolor="#edf4f9" align="center" >10</td>
</tr>
<tr>
<td bgcolor="#edf4f9" align="left" > V4L2_PIX_FMT_SPCA501</td>
<td bgcolor="#edf4f9" align="center" >S501</li>
<td bgcolor="#edf4f9" align="center" >11</td>
</tr>
<tr>
<td bgcolor="#edf4f9" align="left" > V4L2_PIX_FMT_SPCA505</td>
<td bgcolor="#edf4f9" align="center" >S505</li>
<td bgcolor="#edf4f9" align="center" >12</td>
</tr>
<tr>
<td bgcolor="#edf4f9" align="left" > V4L2_PIX_FMT_SPCA508</td>
<td bgcolor="#edf4f9" align="center" >S508</li>
<td bgcolor="#edf4f9" align="center" >13</td>
</tr>
<tr>
<td bgcolor="#edf4f9" align="left" > V4L2_PIX_FMT_UYVY</td>
<td bgcolor="#edf4f9" align="center" >UYVY</li>
<td bgcolor="#edf4f9" align="center" >14</td>
</tr>
<tr>
<td bgcolor="#edf4f9" align="left" > V4L2_PIX_FMT_YUYV</td>
<td bgcolor="#edf4f9" align="center" >YUYV</li>
<td bgcolor="#edf4f9" align="center" >15</td>
</tr>
<tr>
<td bgcolor="#edf4f9" align="left" > V4L2_PIX_FMT_YUV422P</td>
<td bgcolor="#edf4f9" align="center" >422P</li>
<td bgcolor="#edf4f9" align="center" >16</td>
</tr>
<tr>
<td bgcolor="#edf4f9" align="left" > V4L2_PIX_FMT_YUV420</td>
<td bgcolor="#edf4f9" align="center" >YU12</li>
<td bgcolor="#edf4f9" align="center" >17</td>
</tr>
<tr>
<td bgcolor="#edf4f9" align="left" > V4L2_PIX_FMT_Y10</td>
<td bgcolor="#edf4f9" align="center" >YU10</li>
<td bgcolor="#edf4f9" align="center" >18</td>
</tr>
<tr>
<td bgcolor="#edf4f9" align="left" > V4L2_PIX_FMT_Y12</td>
<td bgcolor="#edf4f9" align="center" >YU12</li>
<td bgcolor="#edf4f9" align="center" >19</td>
</tr>
<tr>
<td bgcolor="#edf4f9" align="left" > V4L2_PIX_FMT_GREY</td>
<td bgcolor="#edf4f9" align="center" >GREY</li>
<td bgcolor="#edf4f9" align="center" >20</td>
</tr>
<tr>
<td bgcolor="#edf4f9" align="left" > V4L2_PIX_FMT_H264</td>
<td bgcolor="#edf4f9" align="center" >H264</li>
<td bgcolor="#edf4f9" align="center" >21</td>
</tr>
</tbody>
</table>
<p></p>
It is possible that after looping through all of the palette options for the camera, Motion will not
find a palette that is acceptable for processing. In this situation, it is possible to use the
<a href="#netcam_url" >netcam_url</a> option with the v4l2 prefix. In the situation that the
<a href="#netcam_url" >netcam_url</a> is used, the v4l2_palette option is ignored.
<a href="#netcam_url" >netcam_url</a> option with the v4l2 prefix. When using the
<a href="#netcam_url" >netcam_url</a> option, the v4l2_palette option can be used to specify the
V4L2_PIX_FMT_MJPEG and V4L2_PIX_FMT_H264 options ONLY. If any of the other palette options
are specified when using the <a href="#netcam_url" >netcam_url</a> the v4l2_palette option
is ignored and the camera default is used.
<ul>
<li> V4L2_PIX_FMT_SN9C10X : 0 'S910'</li>
<li> V4L2_PIX_FMT_SBGGR16 : 1 'BYR2'</li>
<li> V4L2_PIX_FMT_SBGGR8 : 2 'BA81'</li>
<li> V4L2_PIX_FMT_SPCA561 : 3 'S561'</li>
<li> V4L2_PIX_FMT_SGBRG8 : 4 'GBRG'</li>
<li> V4L2_PIX_FMT_SGRBG8 : 5 'GRBG'</li>
<li> V4L2_PIX_FMT_PAC207 : 6 'P207'</li>
<li> V4L2_PIX_FMT_PJPG : 7 'PJPG'</li>
<li> V4L2_PIX_FMT_MJPEG : 8 'MJPEG'</li>
<li> V4L2_PIX_FMT_JPEG : 9 'JPEG'</li>
<li> V4L2_PIX_FMT_RGB24 : 10 'RGB3'</li>
<li> V4L2_PIX_FMT_SPCA501 : 11 'S501'</li>
<li> V4L2_PIX_FMT_SPCA505 : 12 'S505'</li>
<li> V4L2_PIX_FMT_SPCA508 : 13 'S508'</li>
<li> V4L2_PIX_FMT_UYVY : 14 'UYVY'</li>
<li> V4L2_PIX_FMT_YUYV : 15 'YUYV'</li>
<li> V4L2_PIX_FMT_YUV422P : 16 '422P'</li>
<li> V4L2_PIX_FMT_YUV420 : 17 'YU12'</li>
<li> V4L2_PIX_FMT_Y10 : 18 'YU10'</li>
<li> V4L2_PIX_FMT_Y12 : 19 'YU12'</li>
<li> V4L2_PIX_FMT_GREY : 20 'GREY'</li>
<p></p>
The V4L2_PIX_FMT_H264(21) option is valid ONLY when using the <a href="#netcam_url" >netcam_url</a> option.
When V4L2_PIX_FMT_H264(21) is specified using the videodevice, Motion will change the v4l2_palette option to the
default of V4L2_PIX_FMT_YUV420 (17)
</ul>
<p></p>
@@ -2856,7 +2961,7 @@ cannot connect to a video stream such a mpeg, mpeg4, divx. The URL must return o
a rtsp stream, file or ftp. When getting a still image, make sure to validate that the camera is serving up
a actual raw JPG file and not a HTML page with an embedded JPG which is the current
standard.
When the netcam_url is defined the video4linux options above are ignored.
When the netcam_url is defined the videodevice options above are mostly ignored. The options <a href="#width" >netcam_url</a>
If the connection to a network camera is lost, Motion will reuse the last good image for
approx 30 seconds. After 30 seconds the image is replaced by a grey image with a text
telling that the signal is lost and when the connection was lost.
@@ -2870,61 +2975,88 @@ telling that the signal is lost and when the connection was lost.
<li> Range / Valid values: Max 4095 characters</li>
<li> Default: Not defined</li>
</ul>
<ul>
<p></p>
URL to use if you are using a network camera, size will be autodetected
Available prefixes to the URL:
<ul>
<li>http://</li>
<li>ftp:// </li>
<li>mjpg:// </li>
<li>rtsp:// </li>
<li>mjpeg:// </li>
<li>file:// </li>
<li>v4l2:// </li>
</ul>
<p></p>
<b>http://</b> This prefix uses the traditional http format and opens the netcam looking for a motion jpg image.
<b>http://</b>
<ul>
This prefix uses the traditional http format and opens the netcam looking for a motion jpg image.
</ul>
<p></p>
<b>ftp://</b> This prefix opens the ftp site and grabs a static image. The camera will be expected to periodically
replace that static image as it processes images.
<p></p>
<b>mjpg://</b> This prefix is experimental and when Motion sees this prefix it will replace the mjpg with http and
then process the network camera using the extremely experimental method of grabbing motion jpg images. The
author has not observed that this experimental option is in any way functional.
<p></p>
<b>rtsp://</b> This prefix is the standard for all modern network cameras. It is recommended that users search the
web or the camera manual for the exact connection string to use for their camera. Once a potential connection
string is found, it should be validated as being functional using a application such as ffplay or vlc. The
connection string that works for these applications is what should be specified for this option. When using
the rtsp format, Motion will ignore the netcam_keepalive and netcam_tolerant_check options.
<b>ftp://</b>
<ul>
This prefix opens the ftp site and grabs a static image. The camera will be expected to periodically
replace that static image as it processes images.
</ul>
<p></p>
<b>mjpeg://</b> This is another experimental prefix. The mjpeg is replaced with http by Motion internally. The mjpeg
option uses the ffmpeg libraries to retrieve images from the camera and forces the mjpeg format. This option
should be equivalent to using <code>ffplay -f mjpeg http://{yourip}</code>. In certain situations, this option
may result in better results than using the http protocol. Motion will ignore the netcam_keepalive and
netcam_tolerant_check options when this format is specified.
<b>mjpg://</b>
<ul>
This prefix is experimental and when Motion sees this prefix it will replace the mjpg with http and
then process the network camera using the extremely experimental method of grabbing motion jpg images.
<p></p>
The functionality of this option is unknown.
</ul>
<p></p>
<b>file://</b> This option allows for the processing of a static image. A process outside of Motion would be needed to
replace the image. A scenario for this would be processing a large number of previously saved images. The file
option would point to a single location such as <code>/home/user/test/currentimage.jpg</code> Then a bash script
running external to Motion would loop through all the images and copy them into <code>currentimage.jpg</code>.
Another situation would be when the ftp server is the same machine as what Motion is running on. In this situation,
rather than logging into the ftp server, this option can be used to point to the actual directory.
The author believes that while the static image processing option is possible, a preferred approach would be to
encode all the static images to a movie and then use ffmpeg to pipe the movie into a video loopback device.
<b>rtsp://</b>
<ul>
This prefix is the standard for all modern network cameras. It is recommended that users search the
web or the camera manual for the exact connection string to use for their camera.
<p></p>
Once a potential connection string is found, it should be validated as being functional using a
external application such as ffplay or vlc.
<p></p>
The connection string that works for these applications is what needs to be specified for this option.
<p></p>
When using the rtsp format, Motion will ignore the netcam_keepalive and netcam_tolerant_check options.
</ul>
<p></p>
<b>v4l2://</b> This option allows for an alternative method of using a v4l2 device that is not natively supported
by Motion. A sample format for the netcam_url would be <code>v4l2:///dev/video0</code> Internally, this
is equivalent to running the following from the command line <code>ffplay -f v4l2 /dev/video0</code>
Since this is not the preferred method of specifying a v4l2 device, many of the usual v4l2 controls such as
hue, brightness, palette, etc as well as most of the netcam options are ignored.
<b>mjpeg://</b>
<ul>
This is a experimental prefix. The mjpeg is replaced with http by Motion internally and forces the
use of the ffmpeg libraries and the mjpeg format.
<p></p>
This option is equivalent to using <code>ffplay -f mjpeg http://{yourip}</code>.
<p></p>
In certain situations, this option may result in better results than using the http protocol.
<p></p>
Motion will ignore the netcam_keepalive and netcam_tolerant_check options when this format is specified.
</ul>
<p></p>
When the netcam_url is defined the video4linux options are ignored.
<b>file://</b>
<ul>
This option allows for the processing of a static image. A process outside of Motion is required to replace the image.
<p></p>
A scenario for this would be processing a large number of previously saved images. The file
option would point to a single location such as <code>/home/user/test/currentimage.jpg</code> and a script
running external to Motion would loop through all the images and copy them into <code>currentimage.jpg</code>.
</ul>
<p></p>
<b>v4l2://</b>
<ul>
This option allows for an alternative method of using a v4l2 device that is not natively supported by Motion.
<p></p>
A sample format for the netcam_url would be <code>v4l2:///dev/video0</code> Internally, this
is equivalent to running the following from the command line <code>ffplay -f v4l2 /dev/video0</code>
<p></p>
Since this is not the preferred method of specifying a v4l2 device, many of the usual v4l2 controls such as
hue, brightness, etc as well as other netcam options are ignored.
The options <a href="#width">width</a>, <a href="#height">height</a> as well as two of
the <a href="#v4l2_palette">v4l2_palette</a> can be used. The two options
for <a href="#v4l2_palette">v4l2_palette</a> which can be used are option 8 (V4L2_PIX_FMT_MJPEG) and
option 21 (V4L2_PIX_FMT_H264). If any other option is selected for the <a href="#v4l2_palette">v4l2_palette</a>
Motion will revert to the camera default.
</ul>
<p></p>
</ul>
<h3><a name="netcam_userpass"></a> netcam_userpass </h3>
<p></p>
<ul>

32
netcam_rtsp.c
View File

@@ -87,15 +87,15 @@ static int rtsp_decode_video(AVPacket *packet, AVFrame *frame, AVCodecContext *c
retcd = avcodec_send_packet(ctx_codec, packet);
if (retcd < 0 && retcd != AVERROR_EOF){
av_strerror(retcd, errstr, sizeof(errstr));
MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO, "%s: Error decoding packet: %s",errstr);
MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO, "%s: Error sending packet: %s",errstr);
return -1;
}
}
retcd = avcodec_receive_frame(ctx_codec, frame);
if (retcd < 0 ){
if (retcd < 0) {
av_strerror(retcd, errstr, sizeof(errstr));
MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO, "%s: Error decoding packet: %s",errstr);
MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO, "%s: Error receiving packet: %s",errstr);
return -1;
}
return 0;
@@ -181,7 +181,7 @@ static int netcam_open_codec(netcam_context_ptr netcam){
AVCodec *decoder = NULL;
retcd = av_find_best_stream(netcam->rtsp->format_context, AVMEDIA_TYPE_VIDEO, -1, -1, NULL, 0);
if (retcd < 0) {
if ((retcd < 0) || (netcam->rtsp->interrupted == 1)){
av_strerror(retcd, errstr, sizeof(errstr));
MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO, "%s: Could not find stream in input!: %s",errstr);
return retcd;
@@ -220,7 +220,7 @@ static int netcam_open_codec(netcam_context_ptr netcam){
#endif
retcd = avcodec_open2(netcam->rtsp->codec_context, decoder, NULL);
if (retcd < 0) {
if ((retcd < 0) || (netcam->rtsp->interrupted == 1)){
av_strerror(retcd, errstr, sizeof(errstr));
MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO, "%s: Failed to open codec!: %s", errstr);
return retcd;
@@ -267,7 +267,7 @@ struct rtsp_context *rtsp_new_context(void){
* the read attempt.
*
* Returns:
* Failure -1(which triggers an interupt)
* Failure -1(which triggers an interrupt)
* Success 0(zero which indicates to let process continue)
*
*/
@@ -283,6 +283,7 @@ static int netcam_interrupt_rtsp(void *ctx){
}
if ((interrupttime.tv_sec - rtsp->startreadtime.tv_sec ) > 10){
MOTION_LOG(WRN, TYPE_NETCAM, NO_ERRNO, "%s: Camera timed out for %s",rtsp->path);
rtsp->interrupted = 1;
return 1;
} else{
return 0;
@@ -299,6 +300,7 @@ static int netcam_interrupt_rtsp(void *ctx){
}
if ((interrupttime.tv_sec - rtsp->startreadtime.tv_sec ) > 30){
MOTION_LOG(WRN, TYPE_NETCAM, NO_ERRNO, "%s: Camera timed out for %s",rtsp->path);
rtsp->interrupted = 1;
return 1;
} else{
return 0;
@@ -344,6 +346,7 @@ int netcam_read_rtsp_image(netcam_context_ptr netcam){
MOTION_LOG(ERR, TYPE_NETCAM, SHOW_ERRNO, "%s: gettimeofday");
}
netcam->rtsp->startreadtime = curtime;
netcam->rtsp->interrupted = 0;
netcam->rtsp->status = RTSP_READINGIMAGE;
while (size_decoded == 0 && av_read_frame(netcam->rtsp->format_context, &packet) >= 0) {
@@ -367,8 +370,8 @@ int netcam_read_rtsp_image(netcam_context_ptr netcam){
// at this point, we are finished with the packet
my_packet_unref(packet);
if (size_decoded == 0) {
// something went wrong, end of stream? Interupted?
if ((size_decoded == 0) || (netcam->rtsp->interrupted == 1)) {
// something went wrong, end of stream? interrupted?
netcam_rtsp_close_context(netcam);
return -1;
}
@@ -472,6 +475,7 @@ static int netcam_rtsp_open_context(netcam_context_ptr netcam){
netcam->rtsp->format_context->interrupt_callback.callback = netcam_interrupt_rtsp;
netcam->rtsp->format_context->interrupt_callback.opaque = netcam->rtsp;
netcam->rtsp->interrupted = 0;
if (gettimeofday(&netcam->rtsp->startreadtime, NULL) < 0) {
MOTION_LOG(ERR, TYPE_NETCAM, SHOW_ERRNO, "%s: gettimeofday");
}
@@ -496,7 +500,7 @@ static int netcam_rtsp_open_context(netcam_context_ptr netcam){
sprintf(optfmt, "%s","mjpeg");
av_dict_set(&opts, "input_format", optfmt, 0);
} else if (netcam->cnt->conf.v4l2_palette == 21){
sprintf(optfmt, "%s","H264");
sprintf(optfmt, "%s","h264");
av_dict_set(&opts, "input_format", optfmt, 0);
} else{
sprintf(optfmt, "%s","default");
@@ -508,8 +512,6 @@ static int netcam_rtsp_open_context(netcam_context_ptr netcam){
sprintf(optsize, "%dx%d",netcam->cnt->conf.width,netcam->cnt->conf.height);
av_dict_set(&opts, "video_size", optsize, 0);
av_dict_set(&opts, "max_analyze_duration", "100000", 0);
if (netcam->rtsp->status == RTSP_NOTCONNECTED){
MOTION_LOG(NTC, TYPE_NETCAM, NO_ERRNO, "%s: v4l2 input_format %s",optfmt);
MOTION_LOG(NTC, TYPE_NETCAM, NO_ERRNO, "%s: v4l2 framerate %s", optfps);
@@ -518,7 +520,7 @@ static int netcam_rtsp_open_context(netcam_context_ptr netcam){
}
retcd = avformat_open_input(&netcam->rtsp->format_context, netcam->rtsp->path, NULL, &opts);
if ((retcd < 0) || (netcam->rtsp->format_context == NULL)) {
if ((retcd < 0) || (netcam->rtsp->interrupted == 1)){
if (netcam->rtsp->status == RTSP_NOTCONNECTED){
av_strerror(retcd, errstr, sizeof(errstr));
MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO, "%s: unable to open input(%s): %s", netcam->rtsp->path,errstr);
@@ -531,7 +533,7 @@ static int netcam_rtsp_open_context(netcam_context_ptr netcam){
// fill out stream information
retcd = avformat_find_stream_info(netcam->rtsp->format_context, NULL);
if (retcd < 0) {
if ((retcd < 0) || (netcam->rtsp->interrupted == 1)){
if (netcam->rtsp->status == RTSP_NOTCONNECTED){
av_strerror(retcd, errstr, sizeof(errstr));
MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO, "%s: unable to find stream info: %s", errstr);
@@ -560,7 +562,7 @@ static int netcam_rtsp_open_context(netcam_context_ptr netcam){
MOTION_PTHREAD_SETNAME(curtname);
}
if (retcd < 0) {
if ((retcd < 0) || (netcam->rtsp->interrupted == 1)){
if (netcam->rtsp->status == RTSP_NOTCONNECTED){
av_strerror(retcd, errstr, sizeof(errstr));
MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO, "%s: unable to open codec context: %s", errstr);
@@ -592,7 +594,7 @@ static int netcam_rtsp_open_context(netcam_context_ptr netcam){
* Validate that the previous steps opened the camera
*/
retcd = netcam_read_rtsp_image(netcam);
if (retcd < 0) {
if ((retcd < 0) || (netcam->rtsp->interrupted == 1)){
if (netcam->rtsp->status == RTSP_NOTCONNECTED){
MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO, "%s: Failed to read first image");
}

1
netcam_rtsp.h
View File

@@ -23,6 +23,7 @@ struct rtsp_context {
char* path;
char* user;
char* pass;
int interrupted;
enum RTSP_STATUS status;
struct timeval startreadtime;
struct SwsContext* swsctx;

11
video_v4l2.c
View File

@@ -430,6 +430,11 @@ static int v4l2_set_pix_format(struct context *cnt, src_v4l2_t * vid_source,
/*
* Note that this array MUST exactly match the config file list.
* A higher index means better chance to be used
* Special note on the H264: It must be kept within this
* list to keep the numbering correct even though it is not a
* valid format for the v4l2 components. We edit conf option in
* the v4l2_start function so that it is impossible that this
* routine will ever get sent the H264.
*/
static const u32 supported_formats[] = {
V4L2_PIX_FMT_SN9C10X,
@@ -921,7 +926,6 @@ static int v4l2_capture(struct context *cnt, struct video_dev *viddev, unsigned
return 0;
case V4L2_PIX_FMT_YUV420:
case V4L2_PIX_FMT_H264:
memcpy(map, the_buffer->ptr, viddev->v4l_bufsize);
return 0;
@@ -1121,6 +1125,11 @@ int v4l2_start(struct context *cnt)
MOTION_LOG(ERR, TYPE_VIDEO, NO_ERRNO, "%s: config image height (%d) is not modulo 8", conf->height);
return -2;
}
// The H264(21) is not supported via this module so change it to yuv420(17)
if (conf->v4l2_palette == 21 ) {
MOTION_LOG(WRN, TYPE_VIDEO, NO_ERRNO, "%s: H264(21) format not supported via videodevice. Changing to default palette");
conf->v4l2_palette = 17;
}
width = conf->width;
height = conf->height;