diff options
| author | Edgard Lima <edgard.lima@indt.org.br> | 2006-11-17 14:54:01 +0000 |
|---|---|---|
| committer | Edgard Lima <edgard.lima@indt.org.br> | 2006-11-17 14:54:01 +0000 |
| commit | c729cbdbee633db5407c421baf6409d6ee0ef0d2 (patch) | |
| tree | e6d40c238b4e133c543d59b0a33f85b6d69b1a8f /sys | |
| parent | f441440a43196c4069985ca170c4a51c4cdcf4da (diff) | |
Fix capture_deinit.
Original commit message from CVS:
Fix capture_deinit.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/v4l2/v4l2src_calls.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/sys/v4l2/v4l2src_calls.c b/sys/v4l2/v4l2src_calls.c index 28aabef9..f1ee1957 100644 --- a/sys/v4l2/v4l2src_calls.c +++ b/sys/v4l2/v4l2src_calls.c @@ -537,8 +537,6 @@ gst_v4l2src_capture_start (GstV4l2Src * v4l2src) gint type = V4L2_BUF_TYPE_VIDEO_CAPTURE; GST_DEBUG_OBJECT (v4l2src, "starting the capturing"); - - GST_V4L2_CHECK_OPEN (v4l2src->v4l2object); GST_V4L2_CHECK_ACTIVE (v4l2src->v4l2object); v4l2src->quit = FALSE; @@ -574,8 +572,12 @@ gst_v4l2src_capture_stop (GstV4l2Src * v4l2src) GST_DEBUG_OBJECT (v4l2src, "stopping capturing"); - GST_V4L2_CHECK_OPEN (v4l2src->v4l2object); - GST_V4L2_CHECK_ACTIVE (v4l2src->v4l2object); + if (!GST_V4L2_IS_OPEN (v4l2src->v4l2object)) { + goto done; + } + if (!GST_V4L2_IS_ACTIVE (v4l2src->v4l2object)) { + goto done; + } if (v4l2src->breq.memory != 0) { /* we actually need to sync on all queued buffers but not @@ -584,6 +586,8 @@ gst_v4l2src_capture_stop (GstV4l2Src * v4l2src) goto streamoff_failed; } +done: + /* make an optional pending wait stop */ v4l2src->quit = TRUE; v4l2src->is_capturing = FALSE; @@ -629,8 +633,12 @@ gst_v4l2src_capture_deinit (GstV4l2Src * v4l2src) GST_DEBUG_OBJECT (v4l2src, "deinitting capture system"); - GST_V4L2_CHECK_OPEN (v4l2src->v4l2object); - GST_V4L2_CHECK_ACTIVE (v4l2src->v4l2object); + if (!GST_V4L2_IS_OPEN (v4l2src->v4l2object)) { + return TRUE; + } + if (!GST_V4L2_IS_ACTIVE (v4l2src->v4l2object)) { + return TRUE; + } if (v4l2src->pool) { /* free the buffers */ @@ -657,8 +665,8 @@ gst_v4l2src_capture_deinit (GstV4l2Src * v4l2src) * they get auto-dequeued. */ if (try_reinit) { - if (!gst_v4l2src_capture_start (v4l2src) || - !gst_v4l2src_capture_stop (v4l2src)) { + gst_v4l2src_capture_start (v4l2src); + if (!gst_v4l2src_capture_stop (v4l2src)) { GST_DEBUG_OBJECT (v4l2src, "failed reinit device"); return FALSE; } |