mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-22 08:17:01 +00:00
Code Issues 1 Projects Releases Wiki Activity

Fix capture_deinit.

Browse source 
Original commit message from CVS:
Fix capture_deinit.
This commit is contained in:
Edgard Lima 2006-11-17 14:54:01 +00:00
parent f441440a43
commit c729cbdbee
2 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2006-11-17 Edgard Lima <edgard.lima@indt.org.br>
* sys/v4l2/v4l2src_calls.c:
Fix capture_deinit.
2006-11-16 Tim-Philipp Müller <tim at centricular dot net> 2006-11-16 Tim-Philipp Müller <tim at centricular dot net>
* gst/matroska/matroska-mux.c: (gst_matroska_mux_class_init), * gst/matroska/matroska-mux.c: (gst_matroska_mux_class_init),

24
sys/v4l2/v4l2src_calls.c
View file

@ -537,8 +537,6 @@ gst_v4l2src_capture_start (GstV4l2Src * v4l2src)
gint type = V4L2_BUF_TYPE_VIDEO_CAPTURE; gint type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
GST_DEBUG_OBJECT (v4l2src, "starting the capturing"); GST_DEBUG_OBJECT (v4l2src, "starting the capturing");
GST_V4L2_CHECK_OPEN (v4l2src->v4l2object);
GST_V4L2_CHECK_ACTIVE (v4l2src->v4l2object); GST_V4L2_CHECK_ACTIVE (v4l2src->v4l2object);
v4l2src->quit = FALSE; v4l2src->quit = FALSE;
@ -574,8 +572,12 @@ gst_v4l2src_capture_stop (GstV4l2Src * v4l2src)
GST_DEBUG_OBJECT (v4l2src, "stopping capturing"); GST_DEBUG_OBJECT (v4l2src, "stopping capturing");
GST_V4L2_CHECK_OPEN (v4l2src->v4l2object); if (!GST_V4L2_IS_OPEN (v4l2src->v4l2object)) {
GST_V4L2_CHECK_ACTIVE (v4l2src->v4l2object); goto done;
}
if (!GST_V4L2_IS_ACTIVE (v4l2src->v4l2object)) {
goto done;
}
if (v4l2src->breq.memory != 0) { if (v4l2src->breq.memory != 0) {
/* we actually need to sync on all queued buffers but not /* we actually need to sync on all queued buffers but not
@ -584,6 +586,8 @@ gst_v4l2src_capture_stop (GstV4l2Src * v4l2src)
goto streamoff_failed; goto streamoff_failed;
} }
done:
/* make an optional pending wait stop */ /* make an optional pending wait stop */
v4l2src->quit = TRUE; v4l2src->quit = TRUE;
v4l2src->is_capturing = FALSE; v4l2src->is_capturing = FALSE;
@ -629,8 +633,12 @@ gst_v4l2src_capture_deinit (GstV4l2Src * v4l2src)
GST_DEBUG_OBJECT (v4l2src, "deinitting capture system"); GST_DEBUG_OBJECT (v4l2src, "deinitting capture system");
GST_V4L2_CHECK_OPEN (v4l2src->v4l2object); if (!GST_V4L2_IS_OPEN (v4l2src->v4l2object)) {
GST_V4L2_CHECK_ACTIVE (v4l2src->v4l2object); return TRUE;
}
if (!GST_V4L2_IS_ACTIVE (v4l2src->v4l2object)) {
return TRUE;
}
if (v4l2src->pool) { if (v4l2src->pool) {
/* free the buffers */ /* free the buffers */
@ -657,8 +665,8 @@ gst_v4l2src_capture_deinit (GstV4l2Src * v4l2src)
* they get auto-dequeued. * they get auto-dequeued.
*/ */
if (try_reinit) { if (try_reinit) {
if (!gst_v4l2src_capture_start (v4l2src) || gst_v4l2src_capture_start (v4l2src);
!gst_v4l2src_capture_stop (v4l2src)) { if (!gst_v4l2src_capture_stop (v4l2src)) {
GST_DEBUG_OBJECT (v4l2src, "failed reinit device"); GST_DEBUG_OBJECT (v4l2src, "failed reinit device");
return FALSE; return FALSE;
} }