mirror/motion
1
0
Fork 0
mirror of https://github.com/Motion-Project/motion.git synced 2026-06-11 23:34:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

v4l2 via netcam revisions

Browse Source 
Closes #853
Closes #854
Closes #855
Closes #857
This commit is contained in:
Mr-DaveDev
2018-11-27 18:34:55 -07:00
committed by Mr-Dave
parent 7573d9e1e1
commit d8377cb5bc
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
motion_build.html
View File

@@ -442,7 +442,7 @@
<p></p>
<code><strong>sudo yum groupinstall 'Development Tools'</strong></code>
<p></p>
<code><strong>sudo yum install libjpeg-turbo libjpeg-turbo-devel gettext libmicrohttpd-dev</strong></code>
<code><strong>sudo yum install libjpeg-turbo libjpeg-turbo-devel gettext libmicrohttpd-devel</strong></code>
<p></p>
<code><strong>sudo yum install libzip-devel</strong></code>
<p></p>

14
motion_config.html
View File

@@ -4401,9 +4401,19 @@
<li> Default: off</li>
</ul>
<p></p>
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
When using a RTSP, RTMP, mjpeg and some V4l2 cameras, create movie files of the motion with the packets
obtained directly from the camera.
<p></p>
For mjpeg cameras, the url must be specified using the <code>mjpeg</code> prefix rather than
as <code>http</code>
<p></p>
For v4l2 cameras to use the movie_passthrough, they must be specified using the
<a href="#netcam_url">netcam_url</a> parameter and the <code>v4l2</code> prefix.
<u>Only</u> webcams that provide mjpeg (<a href="#v4l2_palette">v4l2_palette</a> option 8)
or H264 (<a href="#v4l2_palette">v4l2_palette</a> option 21) will work with the
<a href="#movie_passthrough">movie_passthrough</a>.
<p></p>
<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

6
netcam_rtsp.c
View File

@@ -82,9 +82,9 @@ static void netcam_rtsp_close_context(struct rtsp_context *rtsp_data){
if (rtsp_data->swsframe_in != NULL) my_frame_free(rtsp_data->swsframe_in);
if (rtsp_data->swsframe_out != NULL) my_frame_free(rtsp_data->swsframe_out);
if (rtsp_data->frame != NULL) my_frame_free(rtsp_data->frame);
if (rtsp_data->pktarray != NULL) netcam_rtsp_pktarray_free(rtsp_data);
if (rtsp_data->codec_context != NULL) my_avcodec_close(rtsp_data->codec_context);
if (rtsp_data->format_context != NULL) avformat_close_input(&rtsp_data->format_context);
if (rtsp_data->pktarray != NULL) netcam_rtsp_pktarray_free(rtsp_data);
if (rtsp_data->transfer_format != NULL) avformat_close_input(&rtsp_data->transfer_format);
netcam_rtsp_null_context(rtsp_data);
@@ -855,9 +855,11 @@ static void netcam_rtsp_set_v4l2(struct rtsp_context *rtsp_data){
sprintf(optfps, "%s","default");
sprintf(optsize, "%s","default");
}
} else {
sprintf(optfps, "%s","default");
sprintf(optsize, "%s","default");
}
if (rtsp_data->status == RTSP_NOTCONNECTED){
MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO
,_("%s: Requested v4l2_palette option: %d")