+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>
* gst/matroska/matroska-mux.c: (gst_matroska_mux_class_init),
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;
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
goto streamoff_failed;
}
+done:
+
/* make an optional pending wait stop */
v4l2src->quit = TRUE;
v4l2src->is_capturing = FALSE;
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 */
* 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;
}